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

feat(map): allow backend-selected organization tags

Browse Source
This commit is contained in:
Jürgen Mummert
2026-02-26 18:36:35 +01:00
parent 621ce8dc8b
commit fb58c50f18
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Service/MapModuleDataProvider.php
+24 -2
View File
@@ -26,12 +26,17 @@ class MapModuleDataProvider
/**
* @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
public function getMapItems(bool $includeOrganizations = true, bool $includeEvents = true, bool $includeExternalOrganizations = false, array $selectedOrganizationTagIds = []): array
{
if (!$includeOrganizations && !$includeEvents) {
return [];
}
$selectedOrganizationTagIds = array_values(array_unique(array_map(
static fn (int|string $tagId): string => (string) (int) $tagId,
array_filter($selectedOrganizationTagIds, static fn (int|string $tagId): bool => (int) $tagId > 0),
)));
$locationTable = $this->resolveExistingTable(['tl_location']);
$organizationTable = $this->resolveExistingTable(['tl_organization', 'tl_organisation']);
$locationGeoColumns = null !== $locationTable ? $this->resolveGeoColumns($locationTable) : null;
@@ -76,6 +81,12 @@ class MapModuleDataProvider
$seen['organisation'][$id] = true;
$tagData = $organizationTagMap[$id] ?? ['ids' => [], 'labels' => []];
if ([] !== $selectedOrganizationTagIds
&& [] === array_intersect($selectedOrganizationTagIds, $tagData['ids'] ?? [])) {
continue;
}
$items[] = [
'type' => 'organisation',
'markerType' => $this->buildOrganizationMarkerType($tagData['ids']),
@@ -152,12 +163,17 @@ class MapModuleDataProvider
/**
* @return list<array{id:int,label:string}>
*/
public function getOrganizationTags(): array
public function getOrganizationTags(array $selectedTagIds = []): array
{
if (!$this->tableExists('tl_tags')) {
return [];
}
$selectedTagIds = array_values(array_unique(array_filter(
array_map('intval', $selectedTagIds),
static fn (int $tagId): bool => $tagId > 0,
)));
$columns = $this->getColumnMap('tl_tags');
$labelColumn = isset($columns['title']) ? 'title' : (isset($columns['tag']) ? 'tag' : null);
@@ -171,6 +187,12 @@ class MapModuleDataProvider
->from('tl_tags', 't')
->orderBy(sprintf('t.%s', $labelColumn), 'ASC');
if ([] !== $selectedTagIds) {
$qb
->andWhere('t.id IN (:selectedTagIds)')
->setParameter('selectedTagIds', $selectedTagIds, ArrayParameterType::INTEGER);
}
if (isset($columns['invisible'])) {
$qb->andWhere("(t.invisible IS NULL OR t.invisible = '' OR t.invisible = '0')");
}