Merge pull request #268 from bitecodes/master

add GoogleMapsPlacesFactory

Author: norkunas

ProviderFactory/GoogleMapsPlacesFactory.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the BazingaGeocoderBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
+namespace Bazinga\GeocoderBundle\ProviderFactory;
+
+use Geocoder\Provider\GoogleMapsPlaces\GoogleMapsPlaces;
+use Geocoder\Provider\Provider;
+use Http\Discovery\HttpClientDiscovery;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+final class GoogleMapsPlacesFactory extends AbstractFactory
+{
+    protected static $dependencies = [
+        ['requiredClass' => GoogleMapsPlaces::class, 'packageName' => 'geocoder-php/google-maps-places-provider'],
+    ];
+
+    protected function getProvider(array $config): Provider
+    {
+        $httplug = $config['httplug_client'] ?: HttpClientDiscovery::find();
+
+        return new GoogleMapsPlaces($httplug, $config['api_key']);
+    }
+
+    protected static function configureOptionResolver(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'httplug_client' => null,
+        ]);
+
+        $resolver->setAllowedTypes('httplug_client', ['object', 'null']);
+        $resolver->setRequired(['api_key']);
+        $resolver->setAllowedTypes('api_key', ['string']);
+    }
+}

Resources/doc/services.md

@@ -21,6 +21,7 @@ Here is a list of all provider factories and their options.
 | `Bazinga\GeocoderBundle\ProviderFactory\GeonamesFactory` | httplug_client, username
 | `Bazinga\GeocoderBundle\ProviderFactory\GeoPluginFactory` | httplug_client
 | `Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsFactory` | httplug_client, api_key, region
+| `Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsPlacesFactory` | httplug_client, api_key
 | `Bazinga\GeocoderBundle\ProviderFactory\HereFactory` | httplug_client, app_id, app_code, use_cit
 | `Bazinga\GeocoderBundle\ProviderFactory\HostIpFactory` | httplug_client
 | `Bazinga\GeocoderBundle\ProviderFactory\IpInfoFactory` | httplug_client

Tests/Functional/ProviderFactoryTest.php

@@ -24,6 +24,7 @@
 use Geocoder\Provider\Geonames\Geonames;
 use Geocoder\Provider\GeoPlugin\GeoPlugin;
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
+use Geocoder\Provider\GoogleMapsPlaces\GoogleMapsPlaces;
 use Geocoder\Provider\Here\Here;
 use Geocoder\Provider\HostIp\HostIp;
 use Geocoder\Provider\IpInfo\IpInfo;
@@ -72,6 +73,7 @@ public function getProviders()
             [Geonames::class, ['acme']],
             [GeoPlugin::class, ['empty']],
             [GoogleMaps::class, ['empty']],
+            [GoogleMapsPlaces::class, ['acme']],
             [Here::class, ['acme']],
             [HostIp::class, ['empty']],
             [IpInfo::class, ['acme']],

Tests/Functional/config/provider/googlemapsplaces.yml

@@ -0,0 +1,8 @@
+bazinga_geocoder:
+  profiling:
+    enabled: false
+  providers:
+    acme:
+      factory: Bazinga\GeocoderBundle\ProviderFactory\GoogleMapsPlacesFactory
+      options:
+        api_key: 'bar'

composer.json

@@ -24,7 +24,6 @@
     "doctrine/orm": "~2.3",
     "fzaninotto/faker": "^1.8",
     "geocoder-php/algolia-places-provider": "^0.1.1",
-    "geocoder-php/mapbox-provider": "^1.0",
     "geocoder-php/arcgis-online-provider": "^4.0",
     "geocoder-php/bing-maps-provider": "^4.0",
     "geocoder-php/cache-provider": "^4.0",
@@ -34,12 +33,14 @@
     "geocoder-php/geoip2-provider": "^4.0",
     "geocoder-php/geoips-provider": "^4.0",
     "geocoder-php/geonames-provider": "^4.0",
+    "geocoder-php/google-maps-places-provider": "^1.0",
     "geocoder-php/google-maps-provider": "^4.0",
     "geocoder-php/here-provider": "^0.2",
     "geocoder-php/host-ip-provider": "^4.0",
     "geocoder-php/ip-info-db-provider": "^4.0",
     "geocoder-php/ip-info-provider": "^0.1",
     "geocoder-php/ipstack-provider": "^0.1",
+    "geocoder-php/mapbox-provider": "^1.0",
     "geocoder-php/mapquest-provider": "^4.0",
     "geocoder-php/mapzen-provider": "^4.0",
     "geocoder-php/maxmind-binary-provider": "^4.0",