Fix Gpx dumper for adminLevels

giosh94mhz · giosh94mhz · commit 9366ff15d95a · 2015-02-11T09:44:55.000+01:00
diff --git a/src/Geocoder/Dumper/Gpx.php b/src/Geocoder/Dumper/Gpx.php
@@ -69,20 +69,22 @@ public function dump(Address $address)
      */
     protected function formatName(Address $address)
     {
-        $name  = '';
+        $name  = [];
         $array = $address->toArray();
-        $attrs = array('streetNumber', 'streetName', 'postalCode', 'locality', 'county', 'region', 'country');
+        $attrs = [
+            ['streetNumber'],
+            ['streetName'],
+            ['postalCode'],
+            ['locality'],
+            ['adminLevels', 2, 'name'],
+            ['adminLevels', 1, 'name'],
+            ['country'],
+        ];
 
         foreach ($attrs as $attr) {
-            if (isset($array[$attr]) && !empty($array[$attr])) {
-                $name .= sprintf('%s, ', $array[$attr]);
-            }
+            $name[] = \igorw\get_in($array, $attr);
         }
 
-        if (strlen($name) > 1) {
-            $name = substr($name, 0, strlen($name) - 2);
-        }
-
-        return $name;
+        return implode(', ', array_filter($name));
     }
 }
diff --git a/tests/Geocoder/Tests/Dumper/GpxTest.php b/tests/Geocoder/Tests/Dumper/GpxTest.php
@@ -120,10 +120,15 @@ public function testDumpWithName()
             'east'  => 2.388911);
 
         $address = $this->createAddress([
-            'latitude'  => 48.8631507,
-            'longitude' => 2.3889114,
-            'bounds'    => $bounds,
-            'locality'      => 'Paris',
+            'latitude'     => 48.8631507,
+            'longitude'    => 2.3889114,
+            'bounds'       => $bounds,
+            'locality'     => 'Paris',
+            'streetName'   => 'Avenue Gambetta',
+            'streetNumber' => '10',
+            'subLocality'  => '20e Arrondissement',
+            'adminLevels'  => [['level' => 1, 'name' => 'Ile-de-France']],
+            'country'      => 'France'
         ]);
 
         $expected = sprintf(<<<GPX
@@ -136,7 +141,7 @@ public function testDumpWithName()
     xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
     <bounds minlat="%01.6f" minlon="%01.6f" maxlat="%01.6f" maxlon="%01.6f"/>
     <wpt lat="%01.7f" lon="%01.7f">
-        <name><![CDATA[Paris]]></name>
+        <name><![CDATA[10, Avenue Gambetta, Paris, Ile-de-France, France]]></name>
         <type><![CDATA[Address]]></type>
     </wpt>
 </gpx>
