Implement multiple providers

mikebronner · mikebronner · commit 492630242b9f · 2016-09-30T22:09:16.000-07:00
Fixes #47
diff --git a/config/geocoder.php b/config/geocoder.php
@@ -2,6 +2,7 @@
 
 use Ivory\HttpAdapter\CurlHttpAdapter;
 use Ivory\HttpAdapter\Guzzle6HttpAdapter;
+use Geocoder\Provider\Chain;
 use Geocoder\Provider\BingMaps;
 use Geocoder\Provider\FreeGeoIp;
 use Geocoder\Provider\GoogleMaps;
@@ -20,17 +21,25 @@
     // Providers get called in the chain order given here.
     // The first one to return a result will be used.
     'providers' => [
+        Chain::class => [
+            GoogleMaps::class => [
+                'de-DE',
+                'Wien, Österreich',
+                true,
+                env('GOOGLE_MAPS_API_KEY'),
+            ],
+            BingMaps::class => [
+                'en-US',
+                env('BING_MAPS_API_KEY'),
+            ],
+            FreeGeoIp::class  => [],
+        ],
         GoogleMaps::class => [
             'de-DE',
             'Wien, Österreich',
             true,
             env('GOOGLE_MAPS_API_KEY'),
         ],
-        BingMaps::class => [
-            'en-US',
-            env('BING_MAPS_API_KEY'),
-        ],
-        FreeGeoIp::class  => [],
     ],
     // 'adapter'  => CurlHttpAdapter::class,
     'adapter'  => Guzzle6HttpAdapter::class,
diff --git a/src/GeocoderServiceProvider.php b/src/GeocoderServiceProvider.php
@@ -13,6 +13,7 @@
 
 use Geocoder\ProviderAggregator;
 use Geocoder\Provider\Chain;
+use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
 use ReflectionClass;
 
@@ -50,26 +51,32 @@ public function register()
             return new $adapter;
         });
 
-        $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);
-
-                    return $reflection->newInstanceArgs($arguments);
-                });
-
-            return new Chain($providers->toArray());
-        });
-
         $this->app->singleton('geocoder', function ($app) {
             $geocoder = new ProviderAggregator();
-            $geocoder->registerProvider($app['geocoder.chain']);
+            $geocoder->registerProviders(
+                $this->getProviders(collect(config('geocoder.providers')))
+            );
 
             return $geocoder;
         });
     }
 
+    private function getProviders(Collection $providers)
+    {
+        $providers = $providers->map(function ($arguments, $provider) {
+            $arguments = $this->prepArguments($arguments, $provider);
+            $reflection = new ReflectionClass($provider);
+
+            if ($provider === 'Geocoder\Provider\Chain') {
+                return $reflection->newInstance($arguments);
+            }
+
+            return $reflection->newInstanceArgs($arguments);
+        });
+
+        return $providers->toArray();
+    }
+
     private function prepArguments(array $arguments, $provider)
     {
         $specificAdapter = $this->providerRequiresSpecificAdapter($provider);
@@ -81,11 +88,17 @@ private function prepArguments(array $arguments, $provider)
         }
 
         if ($this->providerRequiresAdapter($provider)) {
-            array_unshift($arguments, $this->app['geocoder.adapter']);
+            array_unshift($arguments, app('geocoder.adapter'));
 
             return $arguments;
         }
 
+        if ($provider === 'Geocoder\Provider\Chain') {
+            return $this->getProviders(
+                collect(config('geocoder.providers.Geocoder\Provider\Chain'))
+            );
+        }
+
         return $arguments;
     }
 
diff --git a/tests/Laravel5_3/Providers/GeocoderServiceProviderTest.php b/tests/Laravel5_3/Providers/GeocoderServiceProviderTest.php
@@ -7,6 +7,7 @@ class GeocoderServiceProviderTest extends TestCase
     public function testItResolvesAGivenAddress()
     {
         $result = app('geocoder')
+            ->using('chain')
             ->geocode('1600 Pennsylvania Ave., Washington, DC USA')
             ->all();
         $this->assertEquals('1600', $result[0]->getStreetNumber());
@@ -44,4 +45,17 @@ public function testItCanUseMaxMindBinaryWithoutProvider()
         $this->assertEquals('Washington', $result[0]->getLocality());
         $this->assertEquals('20003', $result[0]->getPostalCode());
     }
+
+    public function testItCanUseASpecificProvider()
+    {
+        // dd(config('geocoder.providers'));
+        $result = app('geocoder')
+            ->using('google_maps')
+            ->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());
+    }
 }
