Map: satellite hybrid overlays for labels and roads

contao/dca/tl_module.php

@@ -9,7 +9,7 @@ use Contao\StringUtil;
 $GLOBALS['TL_DCA']['tl_module']['palettes']['member_organizations'] = '{title_legend},name,headline,type;{eventmanager_legend},editPage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['member_events'] = '{title_legend},name,headline,type;{eventmanager_legend},editPage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['event_filter'] = '{title_legend},name,headline,type;{eventmanager_legend},cal_calendar,eventListDomId;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
-$GLOBALS['TL_DCA']['tl_module']['palettes']['eventmanager_map'] = '{title_legend},name,headline,type;{eventmanager_legend},mapShowOrganizations,organizationTypeTags,mapShowExternalOrganizations,mapShowEvents,mapInitialDisplay,mapEventColor,mapOrganizationColor,mapCenterMode;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['eventmanager_map'] = '{title_legend},name,headline,type;{eventmanager_legend},mapShowOrganizations,mapOrganizationListPage,organizationTypeTags,mapShowExternalOrganizations,mapShowEvents,mapInitialDisplay,mapEventColor,mapOrganizationColor,mapPitch,mapCenterMode;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['organization_edit'] = '{title_legend},name,headline,type;{eventmanager_legend},listPage,logoFolder,organizationTypeTags;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['event_edit'] = '{title_legend},name,headline,type;{eventmanager_legend},listPage,eventFolder,termsPage,frontendAuthorId,frontendArchiveId,eventTypeTags;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 
@@ -74,15 +74,33 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['organizationTypeTags'] = [
     'exclude' => true,
     'inputType' => 'checkbox',
     'options_callback' => static function () {
+        $database = Database::getInstance();
+        $labelExpression = $database->fieldExists('title', 'tl_tags')
+            ? "COALESCE(NULLIF(t.title, ''), t.tag)"
+            : 't.tag';
+
         $rows = Database::getInstance()
-            ->prepare('SELECT DISTINCT t.id, t.tag FROM tl_tags t LEFT JOIN tl_tags_rel r ON r.tag_id=t.id AND r.ptable=? AND r.field=? ORDER BY t.tag ASC')
+            ->prepare(sprintf(
+                'SELECT DISTINCT t.id, %1$s AS label
+                 FROM tl_tags_rel r
+                 INNER JOIN tl_tags t ON t.id=r.tag_id
+                 WHERE r.ptable=? AND r.field=?
+                 ORDER BY label ASC',
+                $labelExpression,
+            ))
             ->execute('tl_organization', 'tags')
             ->fetchAllAssoc();
 
         $options = [];
 
         foreach ($rows as $row) {
-            $options[(int) $row['id']] = (string) $row['tag'];
+            $label = trim((string) ($row['label'] ?? ''));
+
+            if ('' === $label) {
+                continue;
+            }
+
+            $options[(int) $row['id']] = $label;
         }
 
         return $options;
@@ -173,6 +191,14 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['mapShowOrganizations'] = [
     'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
 ];
 
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapOrganizationListPage'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapOrganizationListPage'],
+    'exclude' => true,
+    'inputType' => 'pageTree',
+    'eval' => ['fieldType' => 'radio', 'mandatory' => false, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'integer', 'unsigned' => true, 'default' => 0],
+];
+
 $GLOBALS['TL_DCA']['tl_module']['fields']['mapShowExternalOrganizations'] = [
     'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'],
     'exclude' => true,
@@ -204,15 +230,33 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['mapInitialOrganizationTagId'] = [
     'exclude' => true,
     'inputType' => 'select',
     'options_callback' => static function (): array {
-        $rows = Database::getInstance()
+        $database = Database::getInstance();
-            ->prepare('SELECT DISTINCT t.id, t.tag FROM tl_tags t LEFT JOIN tl_tags_rel r ON r.tag_id=t.id AND r.ptable=? AND r.field=? ORDER BY t.tag ASC')
+        $labelExpression = $database->fieldExists('title', 'tl_tags')
+            ? "COALESCE(NULLIF(t.title, ''), t.tag)"
+            : 't.tag';
+
+        $rows = $database
+            ->prepare(sprintf(
+                'SELECT DISTINCT t.id, %1$s AS label
+                 FROM tl_tags_rel r
+                 INNER JOIN tl_tags t ON t.id=r.tag_id
+                 WHERE r.ptable=? AND r.field=?
+                 ORDER BY label ASC',
+                $labelExpression,
+            ))
             ->execute('tl_organization', 'tags')
             ->fetchAllAssoc();
 
         $options = [];
 
         foreach ($rows as $row) {
-            $options[(int) $row['id']] = (string) $row['tag'];
+            $label = trim((string) ($row['label'] ?? ''));
+
+            if ('' === $label) {
+                continue;
+            }
+
+            $options[(int) $row['id']] = $label;
         }
 
         return $options;
@@ -271,6 +315,14 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterZoom'] = [
     'sql' => ['type' => 'smallint', 'unsigned' => true, 'default' => 12],
 ];
 
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapPitch'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapPitch'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['rgxp' => 'digit', 'maxlength' => 2, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'smallint', 'unsigned' => true, 'default' => 0],
+];
+
 if (isset($GLOBALS['TL_DCA']['tl_module']['fields']['list_layout'])) {
     $GLOBALS['TL_DCA']['tl_module']['fields']['list_layout']['options_callback'] = static function (): array {
         $options = Controller::getTemplateGroup('list_');

contao/languages/de/tl_module.php

@@ -14,6 +14,7 @@ $GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Eventlisten-ID (DOM)', 'W
 $GLOBALS['TL_LANG']['tl_module']['organizationTypeTags'] = ['Anzuzeigende Organisationstypen', 'Optional: Begrenzen Sie die im Frontend anzeigbaren Organisationstyp-Tags. Leer = alle.'];
 $GLOBALS['TL_LANG']['tl_module']['eventTypeTags'] = ['Anzuzeigende Veranstaltungstypen', 'Optional: Begrenzen Sie die im Frontend anzeigbaren Veranstaltungstyp-Tags. Leer = alle.'];
 $GLOBALS['TL_LANG']['tl_module']['mapShowOrganizations'] = ['Organisationen anzeigen', 'Wenn aktiviert, werden Organisations-Marker auf der Karte dargestellt.'];
+$GLOBALS['TL_LANG']['tl_module']['mapOrganizationListPage'] = ['Seite für Organisationsliste', 'Optional: Seite, auf der die Organisationsliste liegt. Wird für den Link „mehr Infos“ im Organisations-Popup verwendet.'];
 $GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'] = ['Externe Organisationen anzeigen', 'Wenn aktiviert, werden externe Organisationen (isExternal=1) zusätzlich auf der Karte dargestellt. Standard: nein.'];
 $GLOBALS['TL_LANG']['tl_module']['mapShowEvents'] = ['Veranstaltungen anzeigen', 'Wenn aktiviert, werden Event- (inkl. Orts-) Marker auf der Karte dargestellt.'];
 $GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay'] = ['Initiale Anzeige', 'Definiert, welche Marker beim Laden der Karte initial angezeigt werden.'];
@@ -33,3 +34,4 @@ $GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'] = [
 $GLOBALS['TL_LANG']['tl_module']['mapCenterLat'] = ['Breitengrad (Center)', 'Breitengrad für die feste Kartenzentrierung, z. B. 51.0538'];
 $GLOBALS['TL_LANG']['tl_module']['mapCenterLng'] = ['Längengrad (Center)', 'Längengrad für die feste Kartenzentrierung, z. B. 13.3080'];
 $GLOBALS['TL_LANG']['tl_module']['mapCenterZoom'] = ['Zoom-Level (Center)', 'Zoom-Level für die feste Kartenzentrierung (z. B. 12).'];
+$GLOBALS['TL_LANG']['tl_module']['mapPitch'] = ['Pitch (Neigung)', 'Kartenneigung in Grad (0-85). Standard bei leerer Angabe: 0.'];

contao/languages/en/tl_module.php

@@ -14,6 +14,7 @@ $GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Event list ID (DOM)', 'Se
 $GLOBALS['TL_LANG']['tl_module']['organizationTypeTags'] = ['Displayed organization types', 'Optional: Limit which organization type tags can be selected in the frontend. Empty = all.'];
 $GLOBALS['TL_LANG']['tl_module']['eventTypeTags'] = ['Displayed event types', 'Optional: Limit which event type tags can be selected in the frontend. Empty = all.'];
 $GLOBALS['TL_LANG']['tl_module']['mapShowOrganizations'] = ['Show organizations', 'If enabled, organization markers are rendered on the map.'];
+$GLOBALS['TL_LANG']['tl_module']['mapOrganizationListPage'] = ['Organization list page', 'Optional: page containing the organization list. Used for the "more info" link in organization popups.'];
 $GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'] = ['Show external organizations', 'If enabled, external organizations (isExternal=1) are additionally rendered on the map. Default: no.'];
 $GLOBALS['TL_LANG']['tl_module']['mapShowEvents'] = ['Show events', 'If enabled, event markers (including related locations) are rendered on the map.'];
 $GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay'] = ['Initial display', 'Defines which markers are initially shown when the map is loaded.'];
@@ -33,3 +34,4 @@ $GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'] = [
 $GLOBALS['TL_LANG']['tl_module']['mapCenterLat'] = ['Center latitude', 'Latitude for fixed map centering, e.g. 51.0538'];
 $GLOBALS['TL_LANG']['tl_module']['mapCenterLng'] = ['Center longitude', 'Longitude for fixed map centering, e.g. 13.3080'];
 $GLOBALS['TL_LANG']['tl_module']['mapCenterZoom'] = ['Center zoom level', 'Zoom level for fixed map centering (e.g. 12).'];
+$GLOBALS['TL_LANG']['tl_module']['mapPitch'] = ['Pitch', 'Map pitch in degrees (0-85). Default when empty: 0.'];

contao/templates/frontend/event_map.html.twig

@@ -81,6 +81,7 @@
     data-map-center-lat="{{ mapCenterLat|default('')|e('html_attr') }}"
     data-map-center-lng="{{ mapCenterLng|default('')|e('html_attr') }}"
     data-map-center-zoom="{{ mapCenterZoom|default(12)|e('html_attr') }}"
+    data-map-pitch="{{ mapPitch|default(0)|e('html_attr') }}"
 ></div>
 
 <style>
@@ -104,7 +105,11 @@
         width: 100%;
         min-height: 420px;
     }
+
+    .maplibregl-popup {
+        z-index: 2147483647;
+    }
 </style>
 
 <script type="application/json" id="{{ mapDataElementId|e('html_attr') }}">{{ mapItemsJson|raw }}</script>
-<script type="module" src="/bundles/mummertmediaeventmanager/assets/map-module.js?v=20260226g"></script>
+<script type="module" src="/bundles/mummertmediaeventmanager/assets/map-module.js?v=20260227a"></script>

public/assets/map-module.js

@@ -15,6 +15,12 @@ const EVENT_UNCLUSTERED_LAYER_ID = 'eventmanager-events-unclustered';
 const SATELLITE_SOURCE_ID = 'eventmanager-satellite-source';
 const SATELLITE_LAYER_ID = 'eventmanager-satellite-layer';
 const SATELLITE_TILE_URL = 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}';
+const SATELLITE_LABELS_SOURCE_ID = 'eventmanager-satellite-labels-source';
+const SATELLITE_LABELS_LAYER_ID = 'eventmanager-satellite-labels-layer';
+const SATELLITE_LABELS_TILE_URL = 'https://services.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}';
+const SATELLITE_ROADS_SOURCE_ID = 'eventmanager-satellite-roads-source';
+const SATELLITE_ROADS_LAYER_ID = 'eventmanager-satellite-roads-layer';
+const SATELLITE_ROADS_TILE_URL = 'https://services.arcgisonline.com/ArcGIS/rest/services/Reference/World_Transportation/MapServer/tile/{z}/{y}/{x}';
 const SATELLITE_ATTRIBUTION = '© Esri, Maxar';
 
 let dependenciesPromise = null;
@@ -118,6 +124,21 @@ const escapeHtml = (value) => {
         .replace(/'/g, ''');
 };
 
+const decodeHtmlEntities = (value) => {
+    const stringValue = String(value ?? '');
+
+    if ('undefined' === typeof document || !document.createElement) {
+        return stringValue;
+    }
+
+    const textarea = document.createElement('textarea');
+    textarea.innerHTML = stringValue;
+
+    return textarea.value;
+};
+
+const sanitizeDisplayText = (value) => escapeHtml(decodeHtmlEntities(value));
+
 const parseItems = (container) => {
     const dataElementId = container.dataset.mapDataId || '';
 
@@ -297,6 +318,44 @@ const ensureSatelliteLayer = (map) => {
             'raster-saturation': 0,
         },
     }, beforeId);
+
+    map.addSource(SATELLITE_ROADS_SOURCE_ID, {
+        type: 'raster',
+        tiles: [SATELLITE_ROADS_TILE_URL],
+        tileSize: 256,
+        attribution: SATELLITE_ATTRIBUTION,
+    });
+
+    map.addLayer({
+        id: SATELLITE_ROADS_LAYER_ID,
+        type: 'raster',
+        source: SATELLITE_ROADS_SOURCE_ID,
+        layout: {
+            visibility: 'none',
+        },
+        paint: {
+            'raster-opacity': 1,
+        },
+    }, beforeId);
+
+    map.addSource(SATELLITE_LABELS_SOURCE_ID, {
+        type: 'raster',
+        tiles: [SATELLITE_LABELS_TILE_URL],
+        tileSize: 256,
+        attribution: SATELLITE_ATTRIBUTION,
+    });
+
+    map.addLayer({
+        id: SATELLITE_LABELS_LAYER_ID,
+        type: 'raster',
+        source: SATELLITE_LABELS_SOURCE_ID,
+        layout: {
+            visibility: 'none',
+        },
+        paint: {
+            'raster-opacity': 1,
+        },
+    }, beforeId);
 };
 
 const setSatelliteMode = (map, enabled) => {
@@ -310,7 +369,16 @@ const setSatelliteMode = (map, enabled) => {
         return;
     }
 
+    const hybridOverlayLayerIds = [SATELLITE_ROADS_LAYER_ID, SATELLITE_LABELS_LAYER_ID];
+
     map.setLayoutProperty(SATELLITE_LAYER_ID, 'visibility', enabled ? 'visible' : 'none');
+    hybridOverlayLayerIds.forEach((layerId) => {
+        if (map.getLayer(layerId)) {
+            map.setLayoutProperty(layerId, 'visibility', enabled ? 'visible' : 'none');
+            map.setPaintProperty(layerId, 'raster-opacity-transition', { duration: EVENT_FADE_DURATION_MS, delay: 0 });
+            map.setPaintProperty(layerId, 'raster-opacity', enabled ? 1 : 0);
+        }
+    });
     map.setPaintProperty(SATELLITE_LAYER_ID, 'raster-opacity-transition', { duration: EVENT_FADE_DURATION_MS, delay: 0 });
     map.setPaintProperty(SATELLITE_LAYER_ID, 'raster-brightness-min-transition', { duration: EVENT_FADE_DURATION_MS, delay: 0 });
     map.setPaintProperty(SATELLITE_LAYER_ID, 'raster-brightness-max-transition', { duration: EVENT_FADE_DURATION_MS, delay: 0 });
@@ -406,17 +474,38 @@ const ensureMarkerImage = (map, color, prefix = 'eventmanager-marker', options =
 
 const popupHtmlFor = (item) => {
     if (item.type === 'event') {
-        const locationTitle = escapeHtml(item.extra.locationTitle || '');
+        const title = sanitizeDisplayText(item.title || '');
-        const startDate = escapeHtml(item.extra.startDate || '');
+        const locationTitle = sanitizeDisplayText(item.extra.locationTitle || '');
+        const startDate = sanitizeDisplayText(item.extra.startDate || '');
+        const detailUrl = String(item.extra.detailUrl || '').trim();
+        const hasDetailUrl = /^(https?:\/\/|\/)/i.test(detailUrl);
+        const detailLink = hasDetailUrl
+            ? `<div><a href="${escapeHtml(detailUrl)}">mehr Infos</a></div>`
+            : '';
 
         return [
-            `<strong>${escapeHtml(item.title)}</strong>`,
+            `<strong>${title}</strong>`,
             locationTitle ? `<div>${locationTitle}</div>` : '',
             startDate ? `<div>${startDate}</div>` : '',
+            detailLink,
         ].join('');
     }
 
-    return `<strong>${escapeHtml(item.title)}</strong>`;
+    if (item.type === 'organisation') {
+        const title = sanitizeDisplayText(item.title || '');
+        const detailUrl = String(item.extra?.detailUrl || '').trim();
+        const hasDetailUrl = /^(https?:\/\/|\/)/i.test(detailUrl);
+        const detailLink = hasDetailUrl
+            ? `<div><a href="${escapeHtml(detailUrl)}">mehr Infos</a></div>`
+            : '';
+
+        return [
+            `<strong>${title}</strong>`,
+            detailLink,
+        ].join('');
+    }
+
+    return `<strong>${sanitizeDisplayText(item.title)}</strong>`;
 };
 
 const toFeature = (item) => ({
@@ -432,6 +521,7 @@ const toFeature = (item) => ({
         markerTagIds: Array.isArray(item.extra?.organizationTagIds) ? item.extra.organizationTagIds : [],
         markerTagLabels: Array.isArray(item.extra?.organizationTagLabels) ? item.extra.organizationTagLabels : [],
         title: item.title,
+        latitude: item.latitude,
         popupHtml: popupHtmlFor(item),
     },
 });
@@ -445,7 +535,9 @@ const initOrganizationMarkers = (map, organizationItems, organizationColor) => {
         };
     }
 
-    const markerEntries = organizationItems.map((item) => {
+    const sortedOrganizationItems = [...organizationItems].sort((firstItem, secondItem) => secondItem.latitude - firstItem.latitude);
+
+    const markerEntries = sortedOrganizationItems.map((item) => {
         const popupHtml = popupHtmlFor(item);
         const marker = new maplibregl.Marker(organizationColor ? { color: organizationColor } : undefined)
             .setLngLat([item.longitude, item.latitude]);
@@ -456,6 +548,12 @@ const initOrganizationMarkers = (map, organizationItems, organizationColor) => {
 
         marker.addTo(map);
 
+        const markerElement = marker.getElement();
+
+        if (markerElement) {
+            markerElement.style.zIndex = String(Math.round((90 - item.latitude) * 1000));
+        }
+
         return {
             marker,
             tagIds: normalizeTagIds(item.extra?.organizationTagIds),
@@ -776,6 +874,7 @@ const initLocationLayers = (map, locationItems, markerImageId) => {
             'icon-anchor': 'bottom',
             'icon-allow-overlap': true,
             'icon-ignore-placement': true,
+            'symbol-sort-key': ['*', -1, ['to-number', ['get', 'latitude'], 0]],
         },
         paint: {
             'icon-opacity': 1,
@@ -915,6 +1014,7 @@ const initEventLayers = (map, eventItems, eventColor, markerImageId, clusterMark
             'icon-anchor': 'bottom',
             'icon-allow-overlap': true,
             'icon-ignore-placement': true,
+            'symbol-sort-key': ['*', -1, ['to-number', ['get', 'latitude'], 0]],
         },
         paint: {
             'icon-opacity': 1,
@@ -1132,8 +1232,12 @@ const initSingleMap = (container) => {
     const customLat = parseCoordinate(container.dataset.mapCenterLat);
     const customLng = parseCoordinate(container.dataset.mapCenterLng);
     const customZoom = Number(container.dataset.mapCenterZoom);
+    const customPitch = Number(container.dataset.mapPitch);
     const eventColor = normalizeHexColor(container.dataset.mapEventColor, DEFAULT_EVENT_COLOR);
     const hasCustomCenter = null !== customLat && null !== customLng;
+    const initialPitch = Number.isFinite(customPitch)
+        ? Math.max(0, Math.min(85, customPitch))
+        : 0;
 
     let initialCenter = DEFAULT_CENTER;
     let initialZoom = DEFAULT_ZOOM;
@@ -1165,7 +1269,7 @@ const initSingleMap = (container) => {
                 container,
                 style,
                 zoom: initialZoom,
-                pitch: 0,
+                pitch: initialPitch,
                 bearing: 0,
                 center: initialCenter,
                 transformRequest: (url, resourceType) => {
@@ -1227,9 +1331,15 @@ const initSingleMap = (container) => {
             map.on('load', async () => {
                 applyDefaultProjection(map);
 
-                const organizationItems = items.filter((item) => item.type === 'organisation');
+                const organizationItems = items
-                const locationItems = items.filter((item) => item.type === 'location');
+                    .filter((item) => item.type === 'organisation')
-                const eventItems = items.filter((item) => item.type === 'event');
+                    .sort((firstItem, secondItem) => secondItem.latitude - firstItem.latitude);
+                const locationItems = items
+                    .filter((item) => item.type === 'location')
+                    .sort((firstItem, secondItem) => secondItem.latitude - firstItem.latitude);
+                const eventItems = items
+                    .filter((item) => item.type === 'event')
+                    .sort((firstItem, secondItem) => secondItem.latitude - firstItem.latitude);
                 const allCoordinates = items.map((item) => [item.longitude, item.latitude]);
                 const organizationColor = normalizeHexColor(
                     container.dataset.mapOrganizationColor,

src/Controller/Frontend/EventMapController.php

@@ -8,6 +8,7 @@ use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController
 use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;
 use Contao\CoreBundle\Twig\FragmentTemplate;
 use Contao\ModuleModel;
+use Contao\PageModel;
 use Contao\StringUtil;
 use MummertMedia\EventManagerBundle\Service\MapModuleDataProvider;
 use Symfony\Component\HttpFoundation\Request;
@@ -44,9 +45,20 @@ class EventMapController extends AbstractFrontendModuleController
             array_map('intval', StringUtil::deserialize($model->organizationTypeTags ?? null, true)),
             static fn (int $tagId): bool => $tagId > 0,
         )));
+        $availableOrganizationTags = $this->mapModuleDataProvider->getOrganizationTags();
+        $availableOrganizationTagIds = array_map(
+            static fn (array $tag): int => (int) ($tag['id'] ?? 0),
+            $availableOrganizationTags,
+        );
+        $selectedOrganizationTagIds = [] === $selectedOrganizationTagIds
+            ? []
+            : array_values(array_intersect($selectedOrganizationTagIds, $availableOrganizationTagIds));
+        $organizationListPageId = (int) ($model->mapOrganizationListPage ?? 0);
+        $organizationListBaseUrl = $this->buildOrganizationListBaseUrl($organizationListPageId, $request);
         $initialDisplay = (string) ($model->mapInitialDisplay ?? self::DEFAULT_INITIAL_DISPLAY);
         $initialOrganizationTagId = (int) ($model->mapInitialOrganizationTagId ?? 0);
         $centerMode = (string) ($model->mapCenterMode ?? self::DEFAULT_CENTER_MODE);
+        $mapPitch = $this->normalizePitch($model->mapPitch ?? 0);
         $eventColor = $this->normalizeHexColor((string) ($model->mapEventColor ?? self::DEFAULT_EVENT_COLOR));
         $organizationColor = $this->normalizeHexColor((string) ($model->mapOrganizationColor ?? $eventColor), $eventColor);
 
@@ -77,8 +89,9 @@ class EventMapController extends AbstractFrontendModuleController
         $template->set('mapCenterLat', trim((string) ($model->mapCenterLat ?? '')));
         $template->set('mapCenterLng', trim((string) ($model->mapCenterLng ?? '')));
         $template->set('mapCenterZoom', (int) ($model->mapCenterZoom ?? 12));
+        $template->set('mapPitch', $mapPitch);
         $template->set('mapItemsJson', json_encode(
-            $this->mapModuleDataProvider->getMapItems($showOrganizations, $showEvents, $showExternalOrganizations, $selectedOrganizationTagIds),
+            $this->mapModuleDataProvider->getMapItems($showOrganizations, $showEvents, $showExternalOrganizations, $selectedOrganizationTagIds, $organizationListBaseUrl),
             \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_APOS | \JSON_HEX_QUOT | \JSON_UNESCAPED_UNICODE | \JSON_THROW_ON_ERROR,
         ));
         $template->set('mapOrganizationTags', $this->mapModuleDataProvider->getOrganizationTags($selectedOrganizationTagIds));
@@ -118,4 +131,48 @@ class EventMapController extends AbstractFrontendModuleController
 
         return $fallback;
     }
+
+    private function normalizePitch(mixed $value): int
+    {
+        if (!is_scalar($value)) {
+            return 0;
+        }
+
+        $parsedPitch = (int) round((float) str_replace(',', '.', (string) $value));
+
+        if ($parsedPitch < 0) {
+            return 0;
+        }
+
+        if ($parsedPitch > 85) {
+            return 85;
+        }
+
+        return $parsedPitch;
+    }
+
+    private function buildOrganizationListBaseUrl(int $pageId, Request $request): string
+    {
+        if ($pageId <= 0) {
+            return '';
+        }
+
+        $pageModel = PageModel::findById($pageId);
+
+        if (null === $pageModel) {
+            return '';
+        }
+
+        $frontendUrl = trim((string) $pageModel->getFrontendUrl());
+
+        if ('' === $frontendUrl) {
+            return '';
+        }
+
+        if (preg_match('#^https?://#i', $frontendUrl)) {
+            return $frontendUrl;
+        }
+
+        return rtrim($request->getSchemeAndHttpHost(), '/').'/'.ltrim($frontendUrl, '/');
+    }
 }

src/Service/MapModuleDataProvider.php

@@ -4,12 +4,15 @@ declare(strict_types=1);
 
 namespace MummertMedia\EventManagerBundle\Service;
 
-use Contao\Config;
+use Contao\CalendarEventsModel;
-use Contao\Date;
+use Contao\CoreBundle\Framework\ContaoFramework;
+use Contao\CoreBundle\Routing\ContentUrlGenerator;
 use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Query\QueryBuilder;
+use Symfony\Component\Routing\Exception\ExceptionInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 class MapModuleDataProvider
 {
@@ -20,13 +23,15 @@ class MapModuleDataProvider
 
     public function __construct(
         private readonly Connection $connection,
+        private readonly ContaoFramework $framework,
+        private readonly ContentUrlGenerator $urlGenerator,
     ) {
     }
 
     /**
         * @return list<array{type:string,markerType:string,id:int,title:string,latitude:float,longitude:float,extra:array<string,mixed>}>
      */
-    public function getMapItems(bool $includeOrganizations = true, bool $includeEvents = true, bool $includeExternalOrganizations = false, array $selectedOrganizationTagIds = []): array
+    public function getMapItems(bool $includeOrganizations = true, bool $includeEvents = true, bool $includeExternalOrganizations = false, array $selectedOrganizationTagIds = [], string $organizationListBaseUrl = ''): array
     {
         if (!$includeOrganizations && !$includeEvents) {
             return [];
@@ -97,6 +102,7 @@ class MapModuleDataProvider
                     'extra' => [
                         'organizationTagIds' => $tagData['ids'],
                         'organizationTagLabels' => $tagData['labels'],
+                        'detailUrl' => $this->buildOrganizationDetailUrl($organizationListBaseUrl, $id),
                     ],
                 ];
             }
@@ -126,7 +132,12 @@ class MapModuleDataProvider
                     'longitude' => $coords['longitude'],
                     'extra' => [
                         'locationTitle' => trim((string) ($row['location_title'] ?? '')),
-                        'startDate' => $this->formatStartDate((int) ($row['startDate'] ?? 0)),
+                        'startDate' => $this->formatStartDateTime(
+                            (int) ($row['startDate'] ?? 0),
+                            (string) ($row['addTime'] ?? ''),
+                            (int) ($row['startTime'] ?? 0),
+                        ),
+                        'detailUrl' => $this->resolveEventDetailUrl($id),
                     ],
                 ];
             }
@@ -140,7 +151,7 @@ class MapModuleDataProvider
      */
     public function getOrganizationTags(array $selectedTagIds = []): array
     {
-        if (!$this->tableExists('tl_tags')) {
+        if (!$this->tableExists('tl_tags') || !$this->tableExists('tl_tags_rel')) {
             return [];
         }
 
@@ -158,8 +169,13 @@ class MapModuleDataProvider
 
         $qb = $this->connection->createQueryBuilder();
         $qb
-            ->select('t.id', sprintf('t.%s AS label', $labelColumn))
+            ->select('DISTINCT t.id', sprintf('t.%s AS label', $labelColumn))
-            ->from('tl_tags', 't')
+            ->from('tl_tags_rel', 'r')
+            ->innerJoin('r', 'tl_tags', 't', 't.id = r.tag_id')
+            ->andWhere('r.ptable = :organization_ptable')
+            ->andWhere('(r.field = :organization_field OR r.field IS NULL OR r.field = \'\')')
+            ->setParameter('organization_ptable', 'tl_organization')
+            ->setParameter('organization_field', 'tags')
             ->orderBy(sprintf('t.%s', $labelColumn), 'ASC');
 
         if ([] !== $selectedTagIds) {
@@ -206,23 +222,36 @@ class MapModuleDataProvider
             return [];
         }
 
+        $tagColumns = $this->getColumnMap('tl_tags');
+        $tagLabelColumn = isset($tagColumns['title']) ? 'title' : (isset($tagColumns['tag']) ? 'tag' : null);
+
+        if (null === $tagLabelColumn) {
+            return [];
+        }
+
         $rows = $this->connection->executeQuery(
-            'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
+            sprintf(
+                'SELECT r.pid AS organization_id, r.tag_id, t.%s 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',
+                $tagLabelColumn,
+            ),
             ['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
+                sprintf(
+                    'SELECT r.pid AS organization_id, r.tag_id, t.%s 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',
+                    $tagLabelColumn,
+                ),
                 ['tl_organization', $organizationIds],
                 [ParameterType::STRING, ArrayParameterType::INTEGER],
             )->fetchAllAssociative();
@@ -236,14 +265,17 @@ class MapModuleDataProvider
             $tagId = (int) ($row['tag_id'] ?? 0);
             $label = trim((string) ($row['label'] ?? ''));
 
-            if ($organizationId <= 0 || $tagId <= 0 || '' === $label || isset($seen[$organizationId][$tagId])) {
+            if ($organizationId <= 0 || $tagId <= 0 || isset($seen[$organizationId][$tagId])) {
                 continue;
             }
 
             $seen[$organizationId][$tagId] = true;
             $map[$organizationId]['ids'][] = (string) $tagId;
+
+            if ('' !== $label) {
                 $map[$organizationId]['labels'][] = $label;
             }
+        }
 
         foreach ($map as $organizationId => $tagData) {
             $map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
@@ -351,6 +383,8 @@ class MapModuleDataProvider
                 'e.id AS event_id',
                 'e.title AS event_title',
                 'e.startDate',
+                'e.addTime',
+                'e.startTime',
                 'l.title AS location_title',
                 sprintf('l.%s AS latitude', $locationGeoColumns['latitude']),
                 sprintf('l.%s AS longitude', $locationGeoColumns['longitude'])
@@ -429,15 +463,53 @@ class MapModuleDataProvider
         ];
     }
 
-    private function formatStartDate(int $timestamp): string
+    private function formatStartDateTime(int $startDate, string $addTime, int $startTime): string
     {
-        if ($timestamp <= 0) {
+        if ($startDate <= 0) {
             return '';
         }
 
-        $format = (string) Config::get('dateFormat');
+        $formattedDate = date('d.m.Y', $startDate);
 
-        return Date::parse('' !== $format ? $format : 'd.m.Y', $timestamp);
+        if ('1' !== $addTime || $startTime <= 0) {
+            return $formattedDate;
+        }
+
+        return sprintf('%s %s Uhr', $formattedDate, date('H:i', $startTime));
+    }
+
+    private function resolveEventDetailUrl(int $eventId): string
+    {
+        if ($eventId <= 0) {
+            return '';
+        }
+
+        $eventModel = $this->framework
+            ->getAdapter(CalendarEventsModel::class)
+            ->findById($eventId);
+
+        if (null === $eventModel) {
+            return '';
+        }
+
+        try {
+            return (string) $this->urlGenerator->generate($eventModel, [], UrlGeneratorInterface::ABSOLUTE_PATH);
+        } catch (ExceptionInterface) {
+            return '';
+        }
+    }
+
+    private function buildOrganizationDetailUrl(string $baseUrl, int $organizationId): string
+    {
+        $normalizedBaseUrl = trim($baseUrl);
+
+        if ('' === $normalizedBaseUrl || $organizationId <= 0) {
+            return '';
+        }
+
+        $separator = str_contains($normalizedBaseUrl, '?') ? '&' : '?';
+
+        return sprintf('%s%sshow=%d', $normalizedBaseUrl, $separator, $organizationId);
     }
 
     /**