From 53b5f7289eba591784c0b0b0e4b4f3d1f9a220e2 Mon Sep 17 00:00:00 2001 From: Luca Haid Date: Wed, 2 Apr 2025 09:37:24 +0200 Subject: [PATCH] added fcps to preorder map --- Layout/default/Preorder/Index.php | 16 ++++++++++++++++ application/Preorder/PreorderController.php | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php index 6c5b315ae..f1a8d9a40 100644 --- a/Layout/default/Preorder/Index.php +++ b/Layout/default/Preorder/Index.php @@ -854,6 +854,8 @@ $pagination_entity_name = "Vorbestellungen"; }); + //fetch fcps and show on map + getFCPs(preorderMap); // calculate center position mapCenterPos = GetCenterFromDegrees(all_coords); @@ -862,6 +864,20 @@ $pagination_entity_name = "Vorbestellungen"; return true; } + async function getFCPs(map) { + var fcp = await $.get("", { + do: "getFCPsForCampaign", + campaign_id: "id?>" + }); + + if(fcp.status == "OK") { + fcp.result.forEach((fcp) => { + var icon = L.MakiMarkers.icon({icon: "viewpoint", color: "yellow", size: "m"}); + var marker = L.marker([fcp.lat, fcp.lng], {icon: icon}).addTo(map); + }); + } + } + function centerMap() { preorderMap.setView(mapCenterPos, 12); } diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php index 50b4fb026..309428100 100644 --- a/application/Preorder/PreorderController.php +++ b/application/Preorder/PreorderController.php @@ -1094,7 +1094,7 @@ class PreorderController extends mfBaseController { if (!$campaign->id) return []; return array_map( - fn($fcp) => ["id" => $fcp->name ?? null, "text" => $fcp->name ?? null], + fn($fcp) => ["id" => $fcp->name ?? null, "text" => $fcp->name ?? null, 'lat' => $fcp->gps_lat ?? null, 'lng' => $fcp->gps_long ?? null], ADBRimoFcp::getAll(["netzgebiet_id" => $campaign->network->adb_netzgebiet_id]) ?? [] ); }