Allow to use additional libraries for google maps : places, etc...

tuping · Apr 10, 2017 · 9f1ac2d · 9f1ac2d
1 parent dbe7880
commit 9f1ac2d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -40,6 +40,14 @@
                     </depends>
                 </field>
 
+                <field id="provider_google_libraries" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Google API Libraries</label>
+                    <depends>
+                        <field id="provider">google</field>
+                    </depends>
+                    <comment>Comma separated list of Google libraries to use. They must be enabled for your API Key. Eg: geometry, places</comment>
+                </field>
+
                 <field id="provider_osm_direction_url_template" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Directions Url</label>
                     <depends>

diff --git a/etc/config.xml b/etc/config.xml
@@ -25,6 +25,7 @@
                 <provider_osm_direction_url_template>http://www.openstreetmap.org/directions?route={{depend has_origin}}{{var orig_latitude}},{{var orig_longitude}}{{/depend}};{{var dest_latitude}},{{var dest_longitude}}</provider_osm_direction_url_template>
 
                 <provider_google_type>roadmap</provider_google_type>
+                <provider_google_libraries>geometry</provider_google_libraries>
                 <provider_google_direction_url_template>https://www.google.com/maps/dir/{{depend has_origin}}{{var orig_latitude}},{{var orig_longitude}}{{/depend}}/{{var dest_latitude}},{{var dest_longitude}}</provider_google_direction_url_template>
             </map>
 

diff --git a/view/frontend/web/js/geocoder-provider/google.js b/view/frontend/web/js/geocoder-provider/google.js
@@ -11,8 +11,9 @@ define(['jquery', 'leaflet'], function ($, L) {
         var apiKey = config['api_key'];
         var country = config['country'] || 'FR';
         var locale = config['locale'] || 'fr_FR';
+        var libraries = config['libraries'] || 'geometry';
 
-        return '//maps.google.com/maps/api/js?key=' + apiKey + '&libraries=geometry&language=' + locale + '&country=' + country;
+        return '//maps.google.com/maps/api/js?key=' + apiKey + '&libraries=' + libraries + '&language=' + locale + '&country=' + country;
     }
 
     /**

diff --git a/view/frontend/web/js/map-provider/google-maps.js b/view/frontend/web/js/map-provider/google-maps.js
@@ -17,8 +17,9 @@ define([
         var apiKey = config['api_key'];
         var country = config['country'] || 'FR';
         var locale = config['locale'] || 'fr_FR';
+        var libraries = config['libraries'] || 'geometry';
 
-        return '//maps.google.com/maps/api/js?key=' + apiKey + '&libraries=geometry&language=' + locale + '&country=' + country;
+        return '//maps.google.com/maps/api/js?key=' + apiKey + '&libraries=' + libraries + '&language=' + locale + '&country=' + country;
     }
 
     function addGoogleMapsLayer(map, type) {