Merge pull request #255 from MatTheCat/master

Use OpenStreetMap pedestrian tag for street name if road tag is not available
geocoder-php · Aug 8, 2013 · f8ad593 · f8ad593
2 parents 5c71f1b + a32abc8
commit f8ad593
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Geocoder/Provider/OpenStreetMapsProvider.php b/src/Geocoder/Provider/OpenStreetMapsProvider.php
@@ -77,7 +77,7 @@ public function getGeocodedData($address)
                 'county'       => $this->getNodeValue($place->getElementsByTagName('county')),
                 'region'       => $this->getNodeValue($place->getElementsByTagName('state')),
                 'streetNumber' => $this->getNodeValue($place->getElementsByTagName('house_number')),
-                'streetName'   => $this->getNodeValue($place->getElementsByTagName('road')),
+                'streetName'   => $this->getNodeValue($place->getElementsByTagName('road')) ?: $this->getNodeValue($place->getElementsByTagName('pedestrian')),
                 'city'         => $this->getNodeValue($place->getElementsByTagName('city')),
                 'cityDistrict' => $this->getNodeValue($place->getElementsByTagName('suburb')),
                 'country'      => $this->getNodeValue($place->getElementsByTagName('country')),
@@ -116,7 +116,7 @@ public function getReversedData(array $coordinates)
             'county'       => $this->getNodeValue($addressParts->getElementsByTagName('county')),
             'region'       => $this->getNodeValue($addressParts->getElementsByTagName('state')),
             'streetNumber' => $this->getNodeValue($addressParts->getElementsByTagName('house_number')),
-            'streetName'   => $this->getNodeValue($addressParts->getElementsByTagName('road')),
+            'streetName'   => $this->getNodeValue($addressParts->getElementsByTagName('road')) ?: $this->getNodeValue($addressParts->getElementsByTagName('pedestrian')),
             'city'         => $this->getNodeValue($addressParts->getElementsByTagName('city')),
             'cityDistrict' => $this->getNodeValue($addressParts->getElementsByTagName('suburb')),
             'country'      => $this->getNodeValue($addressParts->getElementsByTagName('country')),

diff --git a/tests/Geocoder/Tests/Provider/OpenStreetMapsProviderTest.php b/tests/Geocoder/Tests/Provider/OpenStreetMapsProviderTest.php
@@ -496,4 +496,12 @@ public function testGetReversedDataWithCoordinatesGetsError()
         $provider = new OpenStreetMapsProvider($this->getMockAdapterReturns($errorXml));
         $provider->getReversedData(array('-80.000000', '-170.000000'));
     }
+
+    public function testGetNodeStreetName()
+    {
+        $provider = new OpenStreetMapsProvider(new \Geocoder\HttpAdapter\CurlHttpAdapter(), 'fr_FR');
+        $results  = $provider->getReversedData(array(48.86, 2.35));
+
+        $this->assertEquals('Rue Quincampoix', $results[0]['streetName']);
+    }
 }