fix(map): simplify filters and restore style toggle behavior

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;{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,mapShowExternalOrganizations,mapShowEvents,mapEventColor,mapOrganizationColor,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';
 
@@ -160,6 +160,83 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['eventListDomId'] = [
     'sql' => ['type' => 'string', 'length' => 128, 'default' => ''],
 ];
 
+$GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'mapCenterMode';
+$GLOBALS['TL_DCA']['tl_module']['subpalettes']['mapCenterMode_custom'] = 'mapCenterLat,mapCenterLng,mapCenterZoom';
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapShowOrganizations'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowOrganizations'],
+    'exclude' => true,
+    'inputType' => 'checkbox',
+    'eval' => ['tl_class' => 'w50 m12'],
+    'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapShowExternalOrganizations'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'],
+    'exclude' => true,
+    'inputType' => 'checkbox',
+    'eval' => ['tl_class' => 'w50 m12'],
+    'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapShowEvents'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowEvents'],
+    'exclude' => true,
+    'inputType' => 'checkbox',
+    'eval' => ['tl_class' => 'w50 m12'],
+    'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapEventColor'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapEventColor'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['maxlength' => 7, 'rgxp' => 'hexcolor', 'colorpicker' => true, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'string', 'length' => 7, 'default' => '#BC5067'],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapOrganizationColor'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapOrganizationColor'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['maxlength' => 7, 'rgxp' => 'hexcolor', 'colorpicker' => true, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'string', 'length' => 7, 'default' => '#BC5067'],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterMode'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterMode'],
+    'exclude' => true,
+    'inputType' => 'select',
+    'options' => ['markers', 'custom'],
+    'reference' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'],
+    'eval' => ['submitOnChange' => true, 'mandatory' => true, 'tl_class' => 'clr w50', 'includeBlankOption' => false],
+    'sql' => ['type' => 'string', 'length' => 16, 'default' => 'markers'],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterLat'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterLat'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['maxlength' => 32, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'string', 'length' => 32, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterLng'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterLng'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['maxlength' => 32, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'string', 'length' => 32, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterZoom'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterZoom'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['rgxp' => 'digit', 'maxlength' => 2, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'smallint', 'unsigned' => true, 'default' => 12],
+];
+
 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

@@ -13,3 +13,16 @@ $GLOBALS['TL_LANG']['tl_module']['frontendArchiveId'] = ['ID des Newsarchivs', '
 $GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Eventlisten-ID (DOM)', 'Wählen Sie die ID der Eventliste, die durch das Event-Filter-Modul gefiltert werden soll.'];
 $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']['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']['mapEventColor'] = ['Event-Farbe (Kreise/Linien)', 'Farbe für Event-Cluster, Event-Punkte und Spiderfy-Verbindungslinien (Hex, z. B. #BC5067).'];
+$GLOBALS['TL_LANG']['tl_module']['mapOrganizationColor'] = ['Organisationsfarbe', 'Einheitliche Farbe für alle Organisations-Marker (Hex, z. B. #BC5067).'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterMode'] = ['Karten-Zentrierung', 'Wählen Sie, ob die Karte anhand der Marker oder mit festen Koordinaten zentriert werden soll.'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'] = [
+	'markers' => 'Anhand der Marker (alle Marker sichtbar)',
+	'custom' => 'Feste Geodaten + Zoom-Level',
+];
+$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).'];

contao/languages/en/tl_module.php

@@ -13,3 +13,16 @@ $GLOBALS['TL_LANG']['tl_module']['frontendArchiveId'] = ['News archive ID', 'Arc
 $GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Event list ID (DOM)', 'Select the event list ID that should be filtered by the event filter module.'];
 $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']['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']['mapEventColor'] = ['Event color (circles/lines)', 'Color for event clusters, event points and spiderfy connector lines (hex, e.g. #BC5067).'];
+$GLOBALS['TL_LANG']['tl_module']['mapOrganizationColor'] = ['Organization color', 'Unified color for all organization markers (hex, e.g. #BC5067).'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterMode'] = ['Map centering', 'Choose whether the map should center by markers or fixed coordinates.'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'] = [
+	'markers' => 'By markers (fit all visible markers)',
+	'custom' => 'Fixed coordinates + zoom level',
+];
+$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).'];

contao/templates/frontend/event_map.html.twig

@@ -1,12 +1,101 @@
+{% set tags = mapOrganizationTags|default([]) %}
+
+<section
+    id="{{ mapFilterWrapperId|e('html_attr') }}"
+    class="eventmanager-map-filter"
+    data-map-filter-wrapper="1"
+    role="region"
+    aria-label="Kartenfilter"
+>
+    <button
+        type="button"
+        class="eventmanager-map-filter__toggle is-expanded"
+        data-map-filter-toggle="1"
+        aria-expanded="true"
+        aria-controls="{{ mapFilterGroupId|e('html_attr') }}"
+    >
+        <span class="eventmanager-map-filter__toggle-label eventmanager-map-filter__toggle-label--expand">Filter einblenden</span>
+        <span class="eventmanager-map-filter__toggle-label eventmanager-map-filter__toggle-label--collapse">Filter ausblenden</span>
+    </button>
+
+    <div
+        id="{{ mapFilterGroupId|e('html_attr') }}"
+        class="eventmanager-map-filter__group"
+        role="group"
+        aria-label="Organisationstypen"
+    >
+        <button
+            type="button"
+            class="eventmanager-map-filter__tag is-active"
+            data-map-filter-action="all"
+            aria-pressed="true"
+        >Alle</button>
+
+        {% if tags is iterable and tags|length > 0 %}
+            {% for tag in tags %}
+                <button
+                    type="button"
+                    class="eventmanager-map-filter__tag"
+                    data-map-tag-filter="{{ tag.id|e('html_attr') }}"
+                    aria-pressed="false"
+                >{{ tag.label|e }}</button>
+            {% endfor %}
+        {% endif %}
+        <button
+            type="button"
+            class="eventmanager-map-filter__tag"
+            data-map-event-toggle="1"
+            aria-pressed="false"
+        >Veranstaltungen</button>
+
+        <button
+            type="button"
+            class="eventmanager-map-filter__tag"
+            data-map-style-mode="street"
+            aria-pressed="true"
+        >Straße</button>
+
+        <button
+            type="button"
+            class="eventmanager-map-filter__tag"
+            data-map-style-mode="satellite"
+            aria-pressed="false"
+        >Satellit</button>
+    </div>
+</section>
+
 <div
     id="{{ mapContainerId|e('html_attr') }}"
     class="eventmanager-map"
     data-eventmanager-map="1"
+    data-map-filter-wrapper-id="{{ mapFilterWrapperId|default('')|e('html_attr') }}"
     data-map-style="{{ mapStyleUrl|e('html_attr') }}"
     data-map-data-id="{{ mapDataElementId|e('html_attr') }}"
+    data-map-event-color="{{ mapEventColor|default('#BC5067')|e('html_attr') }}"
+    data-map-organization-color="{{ mapOrganizationColor|default('#BC5067')|e('html_attr') }}"
+    data-map-center-mode="{{ mapCenterMode|default('markers')|e('html_attr') }}"
+    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') }}"
 ></div>
 
 <style>
+    .eventmanager-map-filter {
+        display: grid;
+        gap: .5rem;
+        margin-bottom: .75rem;
+    }
+
+    .eventmanager-map-filter__group {
+        display: flex;
+        flex-wrap: wrap;
+        gap: .5rem;
+    }
+
+    .eventmanager-map-filter__tag[aria-pressed="true"] {
+        font-weight: 600;
+    }
+
     .eventmanager-map {
         width: 100%;
         min-height: 420px;
@@ -14,4 +103,4 @@
 </style>
 
 <script type="application/json" id="{{ mapDataElementId|e('html_attr') }}">{{ mapItemsJson|raw }}</script>
-<script type="module" src="{{ asset('bundles/eventmanager/assets/map-module.js') }}"></script>
+<script type="module" src="/bundles/mummertmediaeventmanager/assets/map-module.js?v=20260226"></script>

src/Controller/Frontend/EventMapController.php

@@ -16,6 +16,8 @@ use Symfony\Component\HttpFoundation\Response;
 class EventMapController extends AbstractFrontendModuleController
 {
     private const MAP_STYLE_URL = 'https://maps.mummert.media/metadaten/world-light.json';
+    private const DEFAULT_CENTER_MODE = 'markers';
+    private const DEFAULT_EVENT_COLOR = '#BC5067';
 
     public function __construct(
         private readonly MapModuleDataProvider $mapModuleDataProvider,
@@ -26,15 +28,69 @@ class EventMapController extends AbstractFrontendModuleController
     {
         $containerId = sprintf('eventmanager-map-%d', (int) ($model->id ?? 0));
         $dataElementId = sprintf('%s-data', $containerId);
+        $filterWrapperId = sprintf('%s-filter', $containerId);
+        $filterGroupId = sprintf('%s-filter-group', $containerId);
+        $showOrganizations = '1' === (string) ($model->mapShowOrganizations ?? '');
+        $showExternalOrganizations = '1' === (string) ($model->mapShowExternalOrganizations ?? '');
+        $showEvents = '1' === (string) ($model->mapShowEvents ?? '');
+        $centerMode = (string) ($model->mapCenterMode ?? self::DEFAULT_CENTER_MODE);
+        $eventColor = $this->normalizeHexColor((string) ($model->mapEventColor ?? self::DEFAULT_EVENT_COLOR));
+        $organizationColor = $this->normalizeHexColor((string) ($model->mapOrganizationColor ?? $eventColor), $eventColor);
+
+        if (!in_array($centerMode, ['markers', 'custom'], true)) {
+            $centerMode = self::DEFAULT_CENTER_MODE;
+        }
 
         $template->set('mapContainerId', $containerId);
         $template->set('mapDataElementId', $dataElementId);
+        $template->set('mapFilterWrapperId', $filterWrapperId);
+        $template->set('mapFilterGroupId', $filterGroupId);
         $template->set('mapStyleUrl', self::MAP_STYLE_URL);
+        $template->set('mapCenterMode', $centerMode);
+        $template->set('mapEventColor', $eventColor);
+        $template->set('mapOrganizationColor', $organizationColor);
+        $template->set('mapCenterLat', trim((string) ($model->mapCenterLat ?? '')));
+        $template->set('mapCenterLng', trim((string) ($model->mapCenterLng ?? '')));
+        $template->set('mapCenterZoom', (int) ($model->mapCenterZoom ?? 12));
         $template->set('mapItemsJson', json_encode(
-            $this->mapModuleDataProvider->getMapItems(),
+            $this->mapModuleDataProvider->getMapItems($showOrganizations, $showEvents, $showExternalOrganizations),
             \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());
 
         return $template->getResponse();
     }
+
+    private function normalizeHexColor(string $value, string $fallback = self::DEFAULT_EVENT_COLOR): string
+    {
+        $normalized = strtoupper(trim($value));
+
+        if (preg_match('/^#[0-9A-F]{6}$/', $normalized)) {
+            return $normalized;
+        }
+
+        if (preg_match('/^[0-9A-F]{6}$/', $normalized)) {
+            return '#'.$normalized;
+        }
+
+        if (preg_match('/^#[0-9A-F]{3}$/', $normalized)) {
+            return sprintf(
+                '#%1$s%1$s%2$s%2$s%3$s%3$s',
+                $normalized[1],
+                $normalized[2],
+                $normalized[3],
+            );
+        }
+
+        if (preg_match('/^[0-9A-F]{3}$/', $normalized)) {
+            return sprintf(
+                '#%1$s%1$s%2$s%2$s%3$s%3$s',
+                $normalized[0],
+                $normalized[1],
+                $normalized[2],
+            );
+        }
+
+        return $fallback;
+    }
 }

src/Service/MapModuleDataProvider.php

@@ -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 {