From 50d58eae082e099b952925be3337d1fbc6072e7f Mon Sep 17 00:00:00 2001
From: Jeffrey Smith <jsmith@gasbuddy.com>
Date: Wed, 13 Feb 2019 10:14:51 -0500
Subject: [PATCH 1/3] Add support for no_annotations to open cage provider

---
 lib/geocoder/opencagegeocoder.js       |  4 +++
 test/geocoder/opencagegeocoder.test.js | 40 +++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/lib/geocoder/opencagegeocoder.js b/lib/geocoder/opencagegeocoder.js
index 029bc5ef..4f398089 100644
--- a/lib/geocoder/opencagegeocoder.js
+++ b/lib/geocoder/opencagegeocoder.js
@@ -155,6 +155,10 @@ OpenCageGeocoder.prototype._getCommonParams = function () {
     params.language = this.options.language;
   }
 
+  if (typeof this.options.noAnnotations !== 'undefined') {
+    params.no_annotations = this.options.noAnnotations;
+  }
+
   return params;
 };
 
diff --git a/test/geocoder/opencagegeocoder.test.js b/test/geocoder/opencagegeocoder.test.js
index 09835760..52d0003d 100644
--- a/test/geocoder/opencagegeocoder.test.js
+++ b/test/geocoder/opencagegeocoder.test.js
@@ -68,6 +68,25 @@
 
             });
 
+            test('Should make a request with no_annotations option', () => {
+
+                var mock = sinon.mock(mockedHttpAdapter);
+                mock.expects('get').withArgs('http://api.opencagedata.com/geocode/v1/json', {
+                    key: 'API_KEY',
+                    q: '1 champs élysée Paris',
+                    no_annotations: 1,
+                }).once().returns({then: function (err,result) {}});
+
+                var ocgAdapter = new OpenCageGeocoder(mockedHttpAdapter, 'API_KEY', {
+                    noAnnotations: 1
+                });
+
+                ocgAdapter.geocode('1 champs élysée Paris');
+
+                mock.verify();
+
+            });
+
             test(
                 'Should call httpAdapter get method with components if called with object',
                 () => {
@@ -215,10 +234,29 @@
                     done();
                 });
             });
-
         });
 
         describe('#reverse' , () => {
+
+            test('Should make a request with no_annotations option', () => {
+
+                var mock = sinon.mock(mockedHttpAdapter);
+                mock.expects('get').withArgs('http://api.opencagedata.com/geocode/v1/json', {
+                    key: 'API_KEY',
+                    q: '13.3826786867678 52.51921145',
+                    no_annotations: 1,
+                }).once().returns({then: function (err,result) {}});
+
+                var ocgAdapter = new OpenCageGeocoder(mockedHttpAdapter, 'API_KEY', {
+                    noAnnotations: 1
+                });
+
+                ocgAdapter.reverse({lat:13.3826786867678, lon:52.51921145});
+
+                mock.verify();
+
+            });
+
             test('Should return geocoded address', done => {
                 var mock = sinon.mock(mockedHttpAdapter);
                 mock.expects('get').once().callsArgWith(2, false, {

From 1f9486d7b01f98d95cab3e6fbeb824054e07956b Mon Sep 17 00:00:00 2001
From: Jeffrey Smith <jsmith@gasbuddy.com>
Date: Wed, 13 Feb 2019 10:22:40 -0500
Subject: [PATCH 2/3] Update mapquest expectation to https

---
 test/geocoder/mapquestgeocoder.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/geocoder/mapquestgeocoder.test.js b/test/geocoder/mapquestgeocoder.test.js
index 923ad200..4b783b82 100644
--- a/test/geocoder/mapquestgeocoder.test.js
+++ b/test/geocoder/mapquestgeocoder.test.js
@@ -60,7 +60,7 @@
 
                 var mock = sinon.mock(mockedHttpAdapter);
                 mock.expects('get').withArgs(
-                    'http://www.mapquestapi.com/geocoding/v1/address',
+                    'https://www.mapquestapi.com/geocoding/v1/address',
                     { key: "API_KEY", location: "test" }
                 ).once().returns({then: function() {}});
 

From ea11dca4cfad579b7effc7b8632487848d57de3e Mon Sep 17 00:00:00 2001
From: Jeffrey Smith <jsmith@gasbuddy.com>
Date: Wed, 13 Feb 2019 10:23:07 -0500
Subject: [PATCH 3/3] Fix virtual earth geocoder linting issue

---
 lib/geocoder/virtualearth.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/geocoder/virtualearth.js b/lib/geocoder/virtualearth.js
index 9f705c99..1fc427e4 100644
--- a/lib/geocoder/virtualearth.js
+++ b/lib/geocoder/virtualearth.js
@@ -63,7 +63,7 @@ VirtualEarthGeocoder.prototype._reverse = function(value, callback) {
     key: this.options.apiKey
   };
 
-  var endpoint = this._endpoint + "/" + value.lat + "," + value.lon;
+  var endpoint = this._endpoint + '/' + value.lat + ',' + value.lon;
 
   this.httpAdapter.get(endpoint, params, function(err, result) {
     if (err) {