Merge pull request #206 from yktv4/optional-params-support-google-rev…

…erse-geocoding Optional params support google reverse geocoding
nchaulet · Jan 24, 2017 · f476184 · f476184
2 parents 5484a64 + 8b7c7cf
commit f476184
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/lib/geocoder/googlegeocoder.js b/lib/geocoder/googlegeocoder.js
@@ -270,8 +270,12 @@ GoogleGeocoder.prototype._reverse = function (query, callback) {
     params.language = query.language;
   }
 
-  if (query.region) {
-    params.region = query.region;
+  if (query.result_type) {
+    params.result_type = query.result_type;
+  }
+
+  if (query.location_type) {
+    params.location_type = query.location_type;
   }
 
   this._signedRequest(this._endpoint, params);

diff --git a/test/geocoder/googlegeocoder.js b/test/geocoder/googlegeocoder.js
@@ -571,18 +571,25 @@ describe('GoogleGeocoder', function() {
       });
     });
 
-    it('Should accept `language` and `region` as options', function() {
+    it('Should accept `language`, `result_type` and `location_type` as options', function() {
       var mock = sinon.mock(mockedHttpAdapter);
       mock.expects('get').withArgs('https://maps.googleapis.com/maps/api/geocode/json', {
         latlng: "40.714232,-73.9612889",
         language: "ru-RU",
-        region: ".de",
-        sensor: false
+        sensor: false,
+        result_type: 'country',
+        location_type: 'ROOFTOP',
       }).once().returns({then: function() {}});
 
-      var googleAdapter = new GoogleGeocoder(mockedHttpAdapter, { language: 'fr', region: '.ru' });
+      var googleAdapter = new GoogleGeocoder(mockedHttpAdapter);
 
-      googleAdapter.reverse({ lat:40.714232, lon:-73.9612889, language: 'ru-RU', region: '.de' });
+      googleAdapter.reverse({
+        lat: 40.714232,
+        lon: -73.9612889,
+        language: 'ru-RU',
+        result_type: 'country',
+        location_type: 'ROOFTOP',
+      });
 
       mock.verify();
     });