Implement fix for specialized providers

Fixes #24

Author: mikebronner

config/geocoder.php

@@ -1,9 +1,11 @@
 <?php
 
 use Ivory\HttpAdapter\CurlHttpAdapter;
+use Ivory\HttpAdapter\Guzzle6HttpAdapter;
 use Geocoder\Provider\BingMaps;
 use Geocoder\Provider\FreeGeoIp;
 use Geocoder\Provider\GoogleMaps;
+use Geocoder\Provider\MaxMindBinary;
 
 /**
  * This file is part of the GeocoderLaravel library.
@@ -18,12 +20,18 @@
     // Providers get called in the chain order given here.
     // The first one to return a result will be used.
     'providers' => [
-        GoogleMaps::class => null,
+        GoogleMaps::class => [
+            'de-DE',
+            'Wien, Österreich',
+            true,
+            env('GOOGLE_MAPS_API_KEY'),
+        ],
         BingMaps::class => [
             'en-US',
             env('BING_MAPS_API_KEY'),
         ],
-        FreeGeoIp::class  => null,
+        FreeGeoIp::class  => [],
     ],
-    'adapter'  => CurlHttpAdapter::class,
+    // 'adapter'  => CurlHttpAdapter::class,
+    'adapter'  => Guzzle6HttpAdapter::class,
 ];

src/GeocoderServiceProvider.php

@@ -53,14 +53,10 @@ public function register()
         $this->app->singleton('geocoder.chain', function ($app) {
             $providers = collect(config('geocoder.providers'))
                 ->map(function ($arguments, $provider) {
+                    $arguments = $this->prepArguments($arguments, $provider);
                     $reflection = new ReflectionClass($provider);
 
-                    if (is_array($arguments)) {
-                        array_unshift($arguments, $this->app['geocoder.adapter']);
-                        return $reflection->newInstanceArgs($arguments);
-                    }
-
-                    return $reflection->newInstance($this->app['geocoder.adapter']);
+                    return $reflection->newInstanceArgs($arguments);
                 });
 
             return new Chain($providers->toArray());
@@ -74,6 +70,60 @@ public function register()
         });
     }
 
+    private function prepArguments(array $arguments, $provider)
+    {
+        $specificAdapter = $this->providerRequiresSpecificAdapter($provider);
+
+        if ($specificAdapter) {
+            array_unshift($arguments, $specificAdapter);
+
+            return $arguments;
+        }
+
+        if ($this->providerRequiresAdapter($provider)) {
+            array_unshift($arguments, $this->app['geocoder.adapter']);
+
+            return $arguments;
+        }
+
+        return $arguments;
+    }
+
+    private function providerRequiresSpecificAdapter($provider)
+    {
+        $specificAdapters = collect([
+            'Geocoder\Provider\GeoIP2' => 'Geocoder\Adapter\GeoIP2Adapter',
+        ]);
+
+        return $specificAdapters->get($provider);
+    }
+
+    private function providerRequiresAdapter($provider)
+    {
+        $providersRequiringAdapter = collect([
+            'Geocoder\Provider\ArcGISOnline',
+            'Geocoder\Provider\BingMaps',
+            'Geocoder\Provider\FreeGeoIp',
+            'Geocoder\Provider\GeoIPs',
+            'Geocoder\Provider\Geonames',
+            'Geocoder\Provider\GeoPlugin',
+            'Geocoder\Provider\GoogleMaps',
+            'Geocoder\Provider\GoogleMapsBusiness',
+            'Geocoder\Provider\HostIp',
+            'Geocoder\Provider\IpInfoDb',
+            'Geocoder\Provider\MapQuest',
+            'Geocoder\Provider\MaxMind',
+            'Geocoder\Provider\Nominatim',
+            'Geocoder\Provider\OpenCage',
+            'Geocoder\Provider\OpenStreetMap',
+            'Geocoder\Provider\Provider',
+            'Geocoder\Provider\TomTom',
+            'Geocoder\Provider\Yandex',
+        ]);
+
+        return $providersRequiringAdapter->contains($provider);
+    }
+
     /**
      * Get the services provided by the provider.
      *

tests/Laravel5_3/Providers/GeocoderServiceProviderTest.php

@@ -22,4 +22,26 @@ public function testItResolvesAGivenIPAddress()
             ->all();
         $this->assertEquals('US', $result[0]->getCountry()->getCode());
     }
+
+    public function testItResolvesAGivenAddressWithUmlauts()
+    {
+        $result = app('geocoder')
+            ->geocode('Obere Donaustrasse 22, Wien, Österreich')
+            ->all();
+        $this->assertEquals('22', $result[0]->getStreetNumber());
+        $this->assertEquals('Obere Donaustraße', $result[0]->getStreetName());
+        $this->assertEquals('Wien', $result[0]->getLocality());
+        $this->assertEquals('1020', $result[0]->getPostalCode());
+    }
+
+    public function testItCanUseMaxMindBinaryWithoutProvider()
+    {
+        $result = app('geocoder')
+            ->geocode('1600 Pennsylvania Ave., Washington, DC USA')
+            ->all();
+        $this->assertEquals('1600', $result[0]->getStreetNumber());
+        $this->assertEquals('Pennsylvania Avenue Southeast', $result[0]->getStreetName());
+        $this->assertEquals('Washington', $result[0]->getLocality());
+        $this->assertEquals('20003', $result[0]->getPostalCode());
+    }
 }