From 7d0423dbfb465f8a6503f9d226b200d5a683519c Mon Sep 17 00:00:00 2001 From: nisanthsojan Date: Fri, 26 Sep 2014 10:42:48 +0530 Subject: [PATCH 1/2] api key added option to give api key --- providers/google.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/providers/google.js b/providers/google.js index 0e2347a..c595d91 100644 --- a/providers/google.js +++ b/providers/google.js @@ -1,12 +1,17 @@ var request = require("request"); -var _ = require('underscore'); +var _ = require("underscore"); exports.geocode = function ( providerOpts, loc, cbk, opts ) { - var options = _.extend({sensor: false, address: loc}, opts || {}); + var proto = "http:", + options = _.extend({sensor: false, address: loc}, opts || {}); + + if(_.has(options,"key"){ + proto = "https:"; + } request({ - uri:"http://maps.googleapis.com/maps/api/geocode/json", + uri:proto+"//maps.googleapis.com/maps/api/geocode/json", qs:options }, function(err,resp,body) { if (err) return cbk(err); @@ -16,14 +21,19 @@ exports.geocode = function ( providerOpts, loc, cbk, opts ) { exports.reverseGeocode = function ( providerOpts, lat, lng, cbk, opts ) { - var options = _.extend({sensor: false, latlng: lat + ',' + lng}, opts || {}); + var proto = "http:", + options = _.extend({sensor: false, latlng: lat + ',' + lng}, opts || {}); + + if(_.has(options,"key"){ + proto = "https:"; + } request({ - uri:"http://maps.googleapis.com/maps/api/geocode/json", + uri:proto+"//maps.googleapis.com/maps/api/geocode/json", qs:options }, function(err,resp,body) { if (err) return cbk(err); cbk(null,JSON.parse(body)); }); -}; \ No newline at end of file +}; From b48d7d86e044b56f06480304ad122092b1994bf6 Mon Sep 17 00:00:00 2001 From: nisanthsojan Date: Fri, 26 Sep 2014 10:54:28 +0530 Subject: [PATCH 2/2] added close bracket added close bracket --- providers/google.js | 64 ++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/providers/google.js b/providers/google.js index c595d91..2e221e4 100644 --- a/providers/google.js +++ b/providers/google.js @@ -1,39 +1,39 @@ var request = require("request"); var _ = require("underscore"); -exports.geocode = function ( providerOpts, loc, cbk, opts ) { - - var proto = "http:", - options = _.extend({sensor: false, address: loc}, opts || {}); - - if(_.has(options,"key"){ - proto = "https:"; - } - - request({ - uri:proto+"//maps.googleapis.com/maps/api/geocode/json", - qs:options - }, function(err,resp,body) { - if (err) return cbk(err); - cbk(null,JSON.parse(body)); - }); +exports.geocode = function (providerOpts, loc, cbk, opts) { + + var proto = "http:", + options = _.extend({sensor: false, address: loc}, opts || {}); + + if (_.has(options, "key")) { + proto = "https:"; + } + + request({ + uri: proto + "//maps.googleapis.com/maps/api/geocode/json", + qs: options + }, function (err, resp, body) { + if (err) return cbk(err); + cbk(null, JSON.parse(body)); + }); }; -exports.reverseGeocode = function ( providerOpts, lat, lng, cbk, opts ) { - - var proto = "http:", - options = _.extend({sensor: false, latlng: lat + ',' + lng}, opts || {}); - - if(_.has(options,"key"){ - proto = "https:"; - } - - request({ - uri:proto+"//maps.googleapis.com/maps/api/geocode/json", - qs:options - }, function(err,resp,body) { - if (err) return cbk(err); - cbk(null,JSON.parse(body)); - }); +exports.reverseGeocode = function (providerOpts, lat, lng, cbk, opts) { + + var proto = "http:", + options = _.extend({sensor: false, latlng: lat + ',' + lng}, opts || {}); + + if (_.has(options, "key")) { + proto = "https:"; + } + + request({ + uri: proto + "//maps.googleapis.com/maps/api/geocode/json", + qs: options + }, function (err, resp, body) { + if (err) return cbk(err); + cbk(null, JSON.parse(body)); + }); };