Map: pitch option, marker ordering and event popup improvements

This commit is contained in:
Jürgen Mummert
2026-02-26 21:32:20 +01:00
parent ba321fdc23
commit fc2508af22
7 changed files with 130 additions and 18 deletions
@@ -47,6 +47,7 @@ class EventMapController extends AbstractFrontendModuleController
$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,6 +78,7 @@ 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),
\JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_APOS | \JSON_HEX_QUOT | \JSON_UNESCAPED_UNICODE | \JSON_THROW_ON_ERROR,
@@ -118,4 +120,23 @@ 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;
}
}