Re add OSM ID for Addis Ababa, now filtering out those with subareas

OpenPlaceGuide · Nov 11, 2023 · f0d2dd6 · f0d2dd6
1 parent c1eec51
commit f0d2dd6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
@@ -133,15 +133,14 @@ public function typePage(string $areaSlug, string $typeSlug)
      */
     public function area(string $slug)
     {
-        $types = $this->repository->listTypes($slug);
+        $types = $this->repository->listTypes();
 
         $area = $this->repository->getAreaInfo($slug);
 
         return view('page.area')
             ->with('area', $area)
             ->with('types', $types)
             ->with('color', $area->color);
-
     }
 
     /**
@@ -150,7 +149,7 @@ public function area(string $slug)
      */
     private function fetchOsmInfo(array $places): array
     {
-        return (new Overpass())->fetchOsmInfo($places, Repository::getInstance()->listAreas());
+        return (new Overpass())->fetchOsmInfo($places, Repository::getInstance()->listLeafAreas());
     }
 
     public function tripleZoomMap($lat, $lon, Request $request)

diff --git a/app/Models/Area.php b/app/Models/Area.php
@@ -16,7 +16,8 @@ public function __construct(
         readonly public string $slug,
         readonly public array $names,
         readonly public array $descriptions,
-        readonly public string $color
+        readonly public string $color,
+        readonly public array $subAreas
     )
     {
 

diff --git a/app/Services/Overpass.php b/app/Services/Overpass.php
@@ -134,7 +134,7 @@ protected function buildQuery(string $objectQuerys, array $areas = null): string
   (
     $areasQuery
   );
-  out ids 1;
+  out ids;
 );
 OVERPASS;
 

diff --git a/app/Services/Repository.php b/app/Services/Repository.php
@@ -94,7 +94,7 @@ public function getAreaInfo(string $areaSlug, bool $canEnrich = true)
         $yamlSource = file_get_contents($this->getAreaFileName($areaSlug));
 
         $parsed = Yaml::parse($yamlSource);
-        $osmId = isset($parsed['osm']) ? new OsmId($parsed['osm']['type'], $parsed['osm']['id'], ) : null;
+        $osmId = isset($parsed['osm']) ? new OsmId($parsed['osm']['type'], $parsed['osm']['id']) : null;
 
         if ($canEnrich && $osmId !== null) {
             $area = $this->resolveArea($osmId->getAreaId());
@@ -104,7 +104,7 @@ public function getAreaInfo(string $areaSlug, bool $canEnrich = true)
             }
         }
 
-        return new Area($this, $osmId, $areaSlug, $parsed['name'] ?? [], $parsed['description'] ?? [], $parsed['color'] ?? 'gray');
+        return new Area($this, $osmId, $areaSlug, $parsed['name'] ?? [], $parsed['description'] ?? [], $parsed['color'] ?? 'gray', $parsed['sub_areas'] ?? []);
     }
 
     public function listTypes(): array
@@ -196,6 +196,14 @@ public function listAreas()
         });
     }
 
+    public function listLeafAreas()
+    {
+        $leafAreas = array_filter($this->listAreas(), function(Area $area) {
+            return count($area->subAreas) === 0;
+        });
+        return $leafAreas;
+    }
+
     private function listAreasUncached()
     {
         $areaFiles = glob($this->getAreaFileName('*'));

diff --git a/resources/views/page/place.blade.php b/resources/views/page/place.blade.php
@@ -62,7 +62,7 @@
                 <section id="{{ $branch->idInfo->getKey() }}">
                     <h3>{{ Fallback::field($branch->tags, 'name') }}</h3>
                     <strong>{{ ucfirst(Fallback::resolve($type->name)) }}</strong>
-                    @if($branch->area)
+                    @if($branch->area !== null)
                         in <strong><a href="<?php echo $branch->area->getUrl() ?>">{{ $branch->area->getFullName() }}</a></strong>
                     @endif
                     <img class="shadow-lg"

diff --git a/tests/Services/OverpassTest.php b/tests/Services/OverpassTest.php
@@ -31,7 +31,7 @@ public function testOsmInfoMany()
     {
         $place1 = new OsmId('node', 3959878839);
         $place2 = new OsmId('way', 798092378);
-        $osmInfo = $this->getInstance()->fetchOsmInfo([ $place1, $place2 ], Repository::getInstance()->listAreas());
+        $osmInfo = $this->getInstance()->fetchOsmInfo([ $place1, $place2 ], Repository::getInstance()->listLeafAreas());
 
         self::assertInstanceOf(OsmInfo::class, $osmInfo[0]);
         self::assertEquals('Zemen Bank', $osmInfo[0]->tags->name);