Map tags: load live organization tags and sanitize selections

2026-02-26 22:00:12 +01:00
parent 1a4811cb02
commit 51a92ea45e
3 changed files with 57 additions and 8 deletions
@@ -44,6 +44,14 @@ 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));
        $initialDisplay = (string) ($model->mapInitialDisplay ?? self::DEFAULT_INITIAL_DISPLAY);
        $initialOrganizationTagId = (int) ($model->mapInitialOrganizationTagId ?? 0);
        $centerMode = (string) ($model->mapCenterMode ?? self::DEFAULT_CENTER_MODE);