Merge pull request #46 from Nyholm/geocodio

Nyholm · web-flow · commit bb39c8f87ec7 · 2016-10-13T17:40:05.000+02:00
Street number on Geocodio
diff --git a/src/Geocoder/Provider/GeocodioProvider.php b/src/Geocoder/Provider/GeocodioProvider.php
@@ -126,7 +126,19 @@ protected function executeQuery($query)
 
                 $coordinates = $location['location'];
                 $address = $location['address_components'];
-                $street = $address['street'] ?: null;
+
+                //Geocodio does not always return a street, number, or suffix
+                if (!isset($address['street']) && isset($json['input']['address_components']['street'])) {
+                    //Sometimes Geocodio returns parsed information in the input
+                    $addressInput = $json['input']['address_components'];
+                    $address['street'] = $addressInput['street'];
+                    $address['number'] = $addressInput['number'];
+                    $address['suffix'] = $addressInput['suffix'];
+                } elseif (!isset($address['street'])) {
+                    $address['street'] = '';
+                    $address['number'] = ''; // No Street = No Number
+                    $address['suffix'] = '';
+                }
 
                 if (!empty($address['suffix'])) {
                     $address['street'] .= ' ' . $address['suffix'];
diff --git a/tests/Geocoder/Tests/Provider/GeocodioProviderTest.php b/tests/Geocoder/Tests/Provider/GeocodioProviderTest.php
@@ -73,6 +73,63 @@ public function testGetGeocodedDataWithRealAddress()
         $this->assertNull($result['timezone']);
     }
 
+    public function testGetGeocodedDataWithRealAddressThatDoesNotReturnStreet()
+    {
+        $api_key = $this->getApiKey('GEOCODIO_API_KEY');
+
+        if ($api_key === false) {
+            $this->markTestSkipped(self::MISSING_API_KEY);
+        }
+
+        $provider = new GeocodioProvider($this->getAdapter(), $api_key);
+        //Geocodio currently incorrectly parses this address, but Geocodio does know of the bug
+        $results  = $provider->getGeocodedData('386 Branam Rd Old Fort TN 37362');
+
+        $this->assertInternalType('array', $results);
+
+        $result = $results[0];
+        $this->assertEquals(35.049196999999999, $result['latitude'], '', 0.01);
+        $this->assertEquals(-84.735365999999999, $result['longitude'], '', 0.01);
+        $this->assertNull($result['bounds']);
+        $this->assertEquals('386', $result['streetNumber']);
+        $this->assertEquals('Branam Rd Old Ft', $result['streetName']); // Testing bad parsing
+        $this->assertEquals(37362, $result['zipcode']);
+        $this->assertEquals('Oldfort', $result['city']);
+        $this->assertNull($result['county']);
+        $this->assertEquals('TN', $result['region']);
+        $this->assertEquals('US', $result['country']);
+        $this->assertNull($result['countryCode']);
+        $this->assertNull($result['timezone']);
+    }
+
+    public function testGetGeocodedDataWithRealAddressWithoutStreet()
+    {
+        $api_key = $this->getApiKey('GEOCODIO_API_KEY');
+
+        if ($api_key === false) {
+            $this->markTestSkipped(self::MISSING_API_KEY);
+        }
+
+        $provider = new GeocodioProvider($this->getAdapter(), $api_key);
+        $results  = $provider->getGeocodedData('Old Fort TN 37362');
+
+        $this->assertInternalType('array', $results);
+
+        $result = $results[0];
+        $this->assertEquals(35.049196999999999, $result['latitude'], '', 0.01);
+        $this->assertEquals(-84.735365999999999, $result['longitude'], '', 0.01);
+        $this->assertNull($result['bounds']);
+        $this->assertEquals('', $result['streetNumber']);
+        $this->assertEquals('', $result['streetName']);
+        $this->assertEquals(37362, $result['zipcode']);
+        $this->assertEquals('Oldfort', $result['city']);
+        $this->assertNull($result['county']);
+        $this->assertEquals('TN', $result['region']);
+        $this->assertEquals('US', $result['country']);
+        $this->assertNull($result['countryCode']);
+        $this->assertNull($result['timezone']);
+    }
+
     /**
      * @expectedException \Geocoder\Exception\NoResult
      */
