mummert/eventmanager-bundle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(map): add organization color scheme and improve map controls

Browse Source
This commit is contained in:
Jürgen Mummert
2026-02-25 21:02:33 +01:00
parent 68e991c053
commit 40aaa747d9
8 changed files with 1475 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Service/MapModuleDataProvider.php
+308 -78
View File
@@ -6,7 +6,9 @@ namespace MummertMedia\EventManagerBundle\Service;
use Contao\Config;
use Contao\Date;
use Doctrine\DBAL\ArrayParameterType;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\ParameterType;
use Doctrine\DBAL\Query\QueryBuilder;
class MapModuleDataProvider
@@ -22,113 +24,295 @@ class MapModuleDataProvider
}
/**
* @return list<array{type:string,id:int,title:string,latitude:float,longitude:float,extra:array<string,mixed>}>
* @return list<array{type:string,markerType:string,id:int,title:string,latitude:float,longitude:float,extra:array<string,mixed>}>
*/
public function getMapItems(): array
public function getMapItems(bool $includeOrganizations = true, bool $includeEvents = true, bool $includeExternalOrganizations = false): array
{
if (!$includeOrganizations && !$includeEvents) {
return [];
}
$locationTable = $this->resolveExistingTable(['tl_location']);
$organizationTable = $this->resolveExistingTable(['tl_organization', 'tl_organisation']);
$locationGeoColumns = null !== $locationTable ? $this->resolveGeoColumns($locationTable) : null;
if (null === $locationTable) {
if (null === $locationTable || null === $locationGeoColumns) {
return [];
}
$items = [];
$seen = [];
$organizationRows = $includeOrganizations
? $this->fetchOrganizationRows($organizationTable, $locationTable, $locationGeoColumns, $includeExternalOrganizations)
: [];
$organizationTagMap = $this->fetchOrganizationTagMap(array_values(array_unique(array_map(
static fn (array $row): int => (int) ($row['id'] ?? 0),
$organizationRows,
))));
foreach ($this->fetchOrganizationRows($organizationTable) as $row) {
$id = (int) ($row['id'] ?? 0);
if ($includeOrganizations) {
foreach ($organizationRows as $row) {
$id = (int) ($row['id'] ?? 0);
if ($id <= 0 || isset($seen['organisation'][$id])) {
continue;
if ($id <= 0 || isset($seen['organisation'][$id])) {
continue;
}
$locationId = (int) ($row['location_id'] ?? 0);
if ($locationId > 0) {
$coords = $this->extractCoordinates($row['location_latitude'] ?? null, $row['location_longitude'] ?? null);
if (null === $coords) {
continue;
}
} else {
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
}
if (null === $coords) {
continue;
}
$seen['organisation'][$id] = true;
$tagData = $organizationTagMap[$id] ?? ['ids' => [], 'labels' => []];
$items[] = [
'type' => 'organisation',
'markerType' => $this->buildOrganizationMarkerType($tagData['ids']),
'id' => $id,
'title' => trim((string) ($row['title'] ?? '')),
'latitude' => $coords['latitude'],
'longitude' => $coords['longitude'],
'extra' => [
'organizationTagIds' => $tagData['ids'],
'organizationTagLabels' => $tagData['labels'],
],
];
}
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
if (null === $coords) {
continue;
}
$seen['organisation'][$id] = true;
$items[] = [
'type' => 'organisation',
'id' => $id,
'title' => trim((string) ($row['title'] ?? '')),
'latitude' => $coords['latitude'],
'longitude' => $coords['longitude'],
'extra' => [],
];
}
foreach ($this->fetchLocationRows($locationTable) as $row) {
$id = (int) ($row['id'] ?? 0);
if ($includeEvents) {
foreach ($this->fetchLocationRows($locationTable, $locationGeoColumns) as $row) {
$id = (int) ($row['id'] ?? 0);
if ($id <= 0 || isset($seen['location'][$id])) {
continue;
if ($id <= 0 || isset($seen['location'][$id])) {
continue;
}
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
if (null === $coords) {
continue;
}
$seen['location'][$id] = true;
$items[] = [
'type' => 'location',
'markerType' => 'location',
'id' => $id,
'title' => trim((string) ($row['title'] ?? '')),
'latitude' => $coords['latitude'],
'longitude' => $coords['longitude'],
'extra' => [],
];
}
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
foreach ($this->fetchEventRows($locationTable, $locationGeoColumns) as $row) {
$id = (int) ($row['event_id'] ?? 0);
if (null === $coords) {
continue;
if ($id <= 0 || isset($seen['event'][$id])) {
continue;
}
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
if (null === $coords) {
continue;
}
$seen['event'][$id] = true;
$items[] = [
'type' => 'event',
'markerType' => 'event',
'id' => $id,
'title' => trim((string) ($row['event_title'] ?? '')),
'latitude' => $coords['latitude'],
'longitude' => $coords['longitude'],
'extra' => [
'locationTitle' => trim((string) ($row['location_title'] ?? '')),
'startDate' => $this->formatStartDate((int) ($row['startDate'] ?? 0)),
],
];
}
$seen['location'][$id] = true;
$items[] = [
'type' => 'location',
'id' => $id,
'title' => trim((string) ($row['title'] ?? '')),
'latitude' => $coords['latitude'],
'longitude' => $coords['longitude'],
'extra' => [],
];
}
foreach ($this->fetchEventRows($locationTable) as $row) {
$id = (int) ($row['event_id'] ?? 0);
if ($id <= 0 || isset($seen['event'][$id])) {
continue;
}
$coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
if (null === $coords) {
continue;
}
$seen['event'][$id] = true;
$items[] = [
'type' => 'event',
'id' => $id,
'title' => trim((string) ($row['event_title'] ?? '')),
'latitude' => $coords['latitude'],
'longitude' => $coords['longitude'],
'extra' => [
'locationTitle' => trim((string) ($row['location_title'] ?? '')),
'startDate' => $this->formatStartDate((int) ($row['startDate'] ?? 0)),
],
];
}
return $items;
}
/**
* @return list<array<string,mixed>>
* @return list<array{id:int,label:string}>
*/
private function fetchOrganizationRows(?string $table): array
public function getOrganizationTags(): array
{
if (null === $table) {
if (!$this->tableExists('tl_tags')) {
return [];
}
$columns = $this->getColumnMap('tl_tags');
$labelColumn = isset($columns['title']) ? 'title' : (isset($columns['tag']) ? 'tag' : null);
if (null === $labelColumn) {
return [];
}
$qb = $this->connection->createQueryBuilder();
$qb
->select('o.id', 'o.title', 'o.latitude', 'o.longitude')
->select('t.id', sprintf('t.%s AS label', $labelColumn))
->from('tl_tags', 't')
->orderBy(sprintf('t.%s', $labelColumn), 'ASC');
if (isset($columns['invisible'])) {
$qb->andWhere("(t.invisible IS NULL OR t.invisible = '' OR t.invisible = '0')");
}
$rows = $qb->executeQuery()->fetchAllAssociative();
$tags = [];
$seen = [];
foreach ($rows as $row) {
$id = (int) ($row['id'] ?? 0);
$label = trim((string) ($row['label'] ?? ''));
if ($id <= 0 || '' === $label || isset($seen[$id])) {
continue;
}
$seen[$id] = true;
$tags[] = [
'id' => $id,
'label' => $label,
];
}
return $tags;
}
/**
* @param list<int> $organizationIds
* @return array<int, array{ids: list<string>, labels: list<string>}>
*/
private function fetchOrganizationTagMap(array $organizationIds): array
{
$organizationIds = array_values(array_unique(array_filter($organizationIds, static fn (int $id): bool => $id > 0)));
if ([] === $organizationIds || !$this->tableExists('tl_tags_rel') || !$this->tableExists('tl_tags')) {
return [];
}
$rows = $this->connection->executeQuery(
'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
FROM tl_tags_rel r
INNER JOIN tl_tags t ON t.id = r.tag_id
WHERE r.ptable = ? AND r.field = ? AND r.pid IN (?)
ORDER BY r.pid ASC, r.tag_id ASC',
['tl_organization', 'tags', $organizationIds],
[ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER],
)->fetchAllAssociative();
if ([] === $rows) {
$rows = $this->connection->executeQuery(
'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
FROM tl_tags_rel r
INNER JOIN tl_tags t ON t.id = r.tag_id
WHERE r.ptable = ? AND r.pid IN (?)
ORDER BY r.pid ASC, r.tag_id ASC',
['tl_organization', $organizationIds],
[ParameterType::STRING, ArrayParameterType::INTEGER],
)->fetchAllAssociative();
}
$map = [];
$seen = [];
foreach ($rows as $row) {
$organizationId = (int) ($row['organization_id'] ?? 0);
$tagId = (int) ($row['tag_id'] ?? 0);
$label = trim((string) ($row['label'] ?? ''));
if ($organizationId <= 0 || $tagId <= 0 || '' === $label || isset($seen[$organizationId][$tagId])) {
continue;
}
$seen[$organizationId][$tagId] = true;
$map[$organizationId]['ids'][] = (string) $tagId;
$map[$organizationId]['labels'][] = $label;
}
foreach ($map as $organizationId => $tagData) {
$map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
$map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
}
return $map;
}
/**
* @param list<string> $tagIds
*/
private function buildOrganizationMarkerType(array $tagIds): string
{
$firstTagId = (string) ($tagIds[0] ?? '');
if ('' !== $firstTagId && ctype_digit($firstTagId) && (int) $firstTagId > 0) {
return sprintf('organisation-tag-%d', (int) $firstTagId);
}
return 'organisation';
}
/**
* @return list<array<string,mixed>>
*/
private function fetchOrganizationRows(?string $table, string $locationTable, array $locationGeoColumns, bool $includeExternalOrganizations): array
{
if (null === $table) {
return [];
}
$organizationGeoColumns = $this->resolveGeoColumns($table);
$organizationColumns = $this->getColumnMap($table);
$hasLocationReference = isset($organizationColumns['location_id']);
if (null === $organizationGeoColumns && !$hasLocationReference) {
return [];
}
$qb = $this->connection->createQueryBuilder();
$qb
->select('o.id', 'o.title')
->from($table, 'o')
->orderBy('o.id', 'ASC');
if (null !== $organizationGeoColumns) {
$qb
->addSelect(sprintf('o.%s AS latitude', $organizationGeoColumns['latitude']))
->addSelect(sprintf('o.%s AS longitude', $organizationGeoColumns['longitude']));
}
if ($hasLocationReference) {
$qb
->addSelect('o.location_id')
->leftJoin('o', $locationTable, 'ol', 'ol.id = o.location_id')
->addSelect(sprintf('ol.%s AS location_latitude', $locationGeoColumns['latitude']))
->addSelect(sprintf('ol.%s AS location_longitude', $locationGeoColumns['longitude']));
$this->applyPublicationConstraints($qb, 'ol', $locationTable);
}
if (!$includeExternalOrganizations && isset($organizationColumns['isexternal'])) {
$qb->andWhere("(o.isExternal IS NULL OR o.isExternal = '' OR o.isExternal = '0')");
}
$this->applyPublicationConstraints($qb, 'o', $table);
return $qb->executeQuery()->fetchAllAssociative();
@@ -137,11 +321,13 @@ class MapModuleDataProvider
/**
* @return list<array<string,mixed>>
*/
private function fetchLocationRows(string $locationTable): array
private function fetchLocationRows(string $locationTable, array $locationGeoColumns): array
{
$qb = $this->connection->createQueryBuilder();
$qb
->select('l.id', 'l.title', 'l.latitude', 'l.longitude')
->select('l.id', 'l.title')
->addSelect(sprintf('l.%s AS latitude', $locationGeoColumns['latitude']))
->addSelect(sprintf('l.%s AS longitude', $locationGeoColumns['longitude']))
->from($locationTable, 'l')
->orderBy('l.id', 'ASC');
@@ -153,12 +339,15 @@ class MapModuleDataProvider
/**
* @return list<array<string,mixed>>
*/
private function fetchEventRows(string $locationTable): array
private function fetchEventRows(string $locationTable, array $locationGeoColumns): array
{
if (!$this->tableExists('tl_calendar_events')) {
return [];
}
$eventColumns = $this->getColumnMap('tl_calendar_events');
$today = strtotime('today');
$qb = $this->connection->createQueryBuilder();
$qb
->select(
@@ -166,14 +355,20 @@ class MapModuleDataProvider
'e.title AS event_title',
'e.startDate',
'l.title AS location_title',
'l.latitude',
'l.longitude'
sprintf('l.%s AS latitude', $locationGeoColumns['latitude']),
sprintf('l.%s AS longitude', $locationGeoColumns['longitude'])
)
->from('tl_calendar_events', 'e')
->innerJoin('e', $locationTable, 'l', 'l.id = e.location_id')
->andWhere('e.location_id > 0')
->orderBy('e.id', 'ASC');
if (isset($eventColumns['startdate'])) {
$qb
->andWhere('e.startDate >= :event_start_date_from')
->setParameter('event_start_date_from', $today);
}
$this->applyPublicationConstraints($qb, 'e', 'tl_calendar_events');
$this->applyPublicationConstraints($qb, 'l', $locationTable);
@@ -220,9 +415,20 @@ class MapModuleDataProvider
return null;
}
$latitudeFloat = (float) $lat;
$longitudeFloat = (float) $lng;
if (
($latitudeFloat < -90.0 || $latitudeFloat > 90.0)
|| ($longitudeFloat < -180.0 || $longitudeFloat > 180.0)
|| (0.0 === $latitudeFloat && 0.0 === $longitudeFloat)
) {
return null;
}
return [
'latitude' => (float) $lat,
'longitude' => (float) $lng,
'latitude' => $latitudeFloat,
'longitude' => $longitudeFloat,
];
}
@@ -251,6 +457,30 @@ class MapModuleDataProvider
return null;
}
/**
* @return array{latitude:string,longitude:string}|null
*/
private function resolveGeoColumns(string $table): ?array
{
$columns = $this->getColumnMap($table);
if (isset($columns['latitude'], $columns['longitude'])) {
return [
'latitude' => 'latitude',
'longitude' => 'longitude',
];
}
if (isset($columns['lat'], $columns['lng'])) {
return [
'latitude' => 'lat',
'longitude' => 'lng',
];
}
return null;
}
private function tableExists(string $table): bool
{
try {