Merge pull request #329 from toin0u/patch-mapquest

Patch MapQuest provider

Author: willdurand

src/Geocoder/Provider/MapQuestProvider.php

@@ -144,16 +144,22 @@ protected function executeQuery($query)
         $results = array();
 
         foreach ($locations as $location) {
-            $results[] = array_merge($this->getDefaults(), array(
-                'latitude'      => $location['latLng']['lat'],
-                'longitude'     => $location['latLng']['lng'],
-                'streetName'    => $location['street'] ?: null,
-                'city'          => $location['adminArea5'] ?: null,
-                'zipcode'       => $location['postalCode'] ?: null,
-                'county'        => $location['adminArea4'] ?: null,
-                'region'        => $location['adminArea3'] ?: null,
-                'country'       => $location['adminArea1'] ?: null,
-            ));
+            if ($location['street'] || $location['postalCode'] || $location['adminArea5'] || $location['adminArea4'] || $location['adminArea3'] || $location['adminArea1']) {
+                $results[] = array_merge($this->getDefaults(), array(
+                    'latitude'      => $location['latLng']['lat'],
+                    'longitude'     => $location['latLng']['lng'],
+                    'streetName'    => $location['street'] ?: null,
+                    'city'          => $location['adminArea5'] ?: null,
+                    'zipcode'       => $location['postalCode'] ?: null,
+                    'county'        => $location['adminArea4'] ?: null,
+                    'region'        => $location['adminArea3'] ?: null,
+                    'country'       => $location['adminArea1'] ?: null,
+                ));
+            }
+        }
+
+        if (empty($results)) {
+            throw new NoResultException(sprintf('Could not find results for given query: %s', $query));
         }
 
         return $results;

tests/Geocoder/Tests/Provider/MapQuestProviderTest.php

@@ -36,6 +36,18 @@ public function testGetGeocodedDataWithAddressGetsNullContent()
         $provider->getGeocodedData('10 avenue Gambetta, Paris, France');
     }
 
+    /**
+     * @expectedException \Geocoder\Exception\NoResultException
+     * @expectedExceptionMessage Could not find results for given query: http://open.mapquestapi.com/geocoding/v1/reverse?key=api_key&lat=123.000000&lng=456.000000
+     */
+    public function testGetNotRelevantData()
+    {
+        $json = '{"results":[{"locations":[{"street":"","postalCode":"","adminArea5":"","adminArea4":"","adminArea3":"","adminArea1":""}]}]}';
+
+        $provider = new MapQuestProvider($this->getMockAdapterReturns($json), 'api_key');
+        $provider->getReversedData(array(123, 456));
+    }
+
     public function testGetGeocodedDataWithRealAddress()
     {
         if (!isset($_SERVER['MAPQUEST_API_KEY'])) {