From cd753d7265575b61c8de59719fbbe840e7ebb66d Mon Sep 17 00:00:00 2001 From: Igor Yakutovich Date: Fri, 20 Jan 2017 20:20:02 +0300 Subject: [PATCH 1/2] - removed unused region param from google reverse geocoding - added support for other optional parameters --- lib/geocoder/googlegeocoder.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/geocoder/googlegeocoder.js b/lib/geocoder/googlegeocoder.js index 99638344..6a1945e0 100644 --- 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); From 8b7c7cfc4a2351a729c6a232bdaa29cb3f73deb7 Mon Sep 17 00:00:00 2001 From: Igor Yakutovich Date: Fri, 20 Jan 2017 20:21:16 +0300 Subject: [PATCH 2/2] fixed tests for google reverse geocoding --- test/geocoder/googlegeocoder.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/test/geocoder/googlegeocoder.js b/test/geocoder/googlegeocoder.js index 559e9c53..55b10a19 100644 --- 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(); });