From 9cee47b80a68cb12303360dacda7e492ea371c36 Mon Sep 17 00:00:00 2001 From: Kouril42 Date: Wed, 22 Feb 2023 19:12:42 +0100 Subject: [PATCH] Add floorName to get_floor --- src/Controller/MapApiController.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Controller/MapApiController.php b/src/Controller/MapApiController.php index 2fb7683..f130314 100644 --- a/src/Controller/MapApiController.php +++ b/src/Controller/MapApiController.php @@ -94,22 +94,23 @@ class MapApiController extends AbstractController $jsonPlaces = array(); if ($representation == 'Cylinder' || $representation == 'PolySurface'){ foreach ($places as $place){ - $connectedFloors = new ArrayCollection(); - $connectedFloors[] = $floor->getId(); + $connectedFloors = array(); + $seen = new ArrayCollection(); + $seen[] = $floor->getId(); foreach ($place->getConnectedPlaces() as $cp) { foreach ($cp->getFloors() as $cf) { - if (!$connectedFloors->contains($cf->getId())){ + if (!$seen->contains($cf->getId())){ $connectedFloors[] = array('id' => $cf->getId(), 'name' => $cf->getName()); + $seen[] = $cf->getId(); } } } - $connectedFloors->removeElement($floor->getId()); $jsonPlaces[] = array( 'id' => $place->getId(), 'names' => $place->getJoinedNames(), 'type' => $place->getType(), 'surface' => $place->getTwoDRepresentation($representation, $floor->getAltitude()), - 'connectedFloors' => $connectedFloors->toArray() #$rep->getFloorsIdConnectedToPlaceID($place->getId()) // Will be added later + 'connectedFloors' => $connectedFloors #$rep->getFloorsIdConnectedToPlaceID($place->getId()) // Will be added later ); } }