google-distance-matrix - npm Package Compare versions

Comparing version 0.0.2 to 0.0.3

index.js

 'use strict';
 
 var request = require('request'),
-    qs      = require('qs');
+  debug = require('debug')("google:dm"),
+  qs = require('qs-google-signature');
 
 var GOOGLE_DISTANCE_API_URL = 'https://maps.googleapis.com/maps/api/distancematrix/json?',
-    SEPARATOR = '|',
+  SEPARATOR = '|',
 
-// free api key
-    GOOGLE_API_KEY = process.env.GOOGLE_API_KEY || null,
+  // free api key
+  GOOGLE_API_KEY = process.env.GOOGLE_API_KEY || null,
 
-// maps for business users key
-    GOOGLE_CLIENT_KEY = process.env.GOOGLE_BUSINESS_CLIENT_KEY || null,
-    GOOGLE_SIGNATURE_KEY = process.env.GOOGLE_SIGNATURE_KEY || null;
+  // maps for business users key
+  GOOGLE_CLIENT_KEY = process.env.GOOGLE_BUSINESS_CLIENT_KEY || null,
+  GOOGLE_SIGNATURE_KEY = process.env.GOOGLE_SIGNATURE_KEY || null;
 
 
-var GoogleDistanceMatrix = function () {
-    this.options = {
-        origins: null,
-        destinations: null,
-        mode: 'driving',
-        units: 'metric',
-        language: 'en',
-        avoid: null
-    }
-    if (GOOGLE_CLIENT_KEY && GOOGLE_SIGNATURE_KEY) {
-        this.options.client = GOOGLE_CLIENT_KEY;
-        this.options.signature = GOOGLE_SIGNATURE_KEY;
-    } else {
-        this.options.key = GOOGLE_API_KEY;
-    }
+var GoogleDistanceMatrix = function() {
+  this.options = {
+    origins: null,
+    destinations: null,
+    mode: 'driving',
+    units: 'metric',
+    language: 'en',
+    avoid: null
+  }
+  if (GOOGLE_CLIENT_KEY && GOOGLE_SIGNATURE_KEY) {
+    debug("Using Business Client/Key pair", GOOGLE_CLIENT_KEY, GOOGLE_SIGNATURE_KEY)
+    this.options.client = GOOGLE_CLIENT_KEY;
+    this.options.signature = GOOGLE_SIGNATURE_KEY;
+  } else {
+    debug("Using simple API Key", GOOGLE_API_KEY)
+    this.options.key = GOOGLE_API_KEY;
+  }
 };
 
-function formatLocations (locations) {
-    return locations.join(SEPARATOR);
+function formatLocations(locations) {
+  return locations.join(SEPARATOR);
 }
 
-function makeRequest (options, callback) {
-    var requestURL = GOOGLE_DISTANCE_API_URL + qs.stringify(options);
-    request(requestURL, function(err, response, data) {
-        if (err || response.statusCode != 200) {
-            return callback(new Error('Google API request error: ' + data));
-        }
-        callback(null, JSON.parse(data));
-    })
+function makeRequest(options, callback) {
+  debug("request options", options)
+  var requestURL = GOOGLE_DISTANCE_API_URL + qs.stringify(options, GOOGLE_DISTANCE_API_URL);
+  debug("requestURL", requestURL)
+  request(requestURL, function(err, response, data) {
+    if (err || response.statusCode != 200) {
+      return callback(new Error('Google API request error: ' + data));
+    }
+    callback(null, JSON.parse(data));
+  })
 }
 
-GoogleDistanceMatrix.prototype.matrix = function (args, cb) {
+GoogleDistanceMatrix.prototype.matrix = function(args, cb) {
 
-    // validate arguments
+  // validate arguments
 
-    if (arguments.length < 3) {
-        throw new Error('Invalid number of arguments');
-    }
-    var callback = arguments[arguments.length - 1];
-    if (typeof callback != 'function') {
-        throw new Error('Missing callback function');
-    }
+  if (arguments.length < 3) {
+    throw new Error('Invalid number of arguments');
+  }
+  var callback = arguments[arguments.length - 1];
+  if (typeof callback != 'function') {
+    throw new Error('Missing callback function');
+  }
 
-    // format arguments
+  // format arguments
 
-    this.options.origins = formatLocations(arguments[0]);
-    this.options.destinations = formatLocations(arguments[1]);
+  this.options.origins = formatLocations(arguments[0]);
+  this.options.destinations = formatLocations(arguments[1]);
 
-    // makes a request to google api
+  // makes a request to google api
 
-    makeRequest(this.options, function(err, data) {
-        if (err) {
-            return callback(err);
-        }
-        return callback(null, data);
-    });
+  makeRequest(this.options, function(err, data) {
+    if (err) {
+      return callback(err);
+    }
+    return callback(null, data);
+  });
 
 }
 
-GoogleDistanceMatrix.prototype.mode = function (mode) {
-    if (mode != 'driving' && mode != 'walking' && mode != 'bicycling') {
-        throw new Error('Invalid mode: ' + mode);
-    }
-    this.options.mode = mode;
+GoogleDistanceMatrix.prototype.mode = function(mode) {
+  if (mode != 'driving' && mode != 'walking' && mode != 'bicycling') {
+    throw new Error('Invalid mode: ' + mode);
+  }
+  this.options.mode = mode;
 }
 
-GoogleDistanceMatrix.prototype.language = function (language) {
-    this.options.language = language;
+GoogleDistanceMatrix.prototype.language = function(language) {
+  this.options.language = language;
 }
 
-GoogleDistanceMatrix.prototype.avoid = function (avoid) {
-    if (avoid != 'tolls' && avoid != 'highways' && avoid != 'ferries') {
-        throw new Error('Invalid restriction: ' + avoid);
-    }
-    this.options.avoid = avoid;
+GoogleDistanceMatrix.prototype.avoid = function(avoid) {
+  if (avoid != 'tolls' && avoid != 'highways' && avoid != 'ferries') {
+    throw new Error('Invalid restriction: ' + avoid);
+  }
+  this.options.avoid = avoid;
 }
 
-GoogleDistanceMatrix.prototype.units = function (units) {
-    if (units != 'metric' && units != 'imperial') {
-        throw new Error('Invalid units: ' + units);
-    }
-    this.options.units = units;
+GoogleDistanceMatrix.prototype.units = function(units) {
+  if (units != 'metric' && units != 'imperial') {
+    throw new Error('Invalid units: ' + units);
+  }
+  this.options.units = units;
 }
 
-GoogleDistanceMatrix.prototype.departure_time = function (departure_time) {
-    this.options.departure_time = departure_time;
+GoogleDistanceMatrix.prototype.departure_time = function(departure_time) {
+  this.options.departure_time = departure_time;
 }
 
-GoogleDistanceMatrix.prototype.key = function (key) {
-    delete this.options.client;
-    delete this.options.signature;
-    this.options.key = key;
+GoogleDistanceMatrix.prototype.key = function(key) {
+  delete this.options.client;
+  delete this.options.signature;
+  this.options.key = key;
 }
 
-GoogleDistanceMatrix.prototype.client = function (client) {
-    delete this.options.key;
-    this.options.client = client;
+GoogleDistanceMatrix.prototype.client = function(client) {
+  delete this.options.key;
+  this.options.client = client;
 }
 
-GoogleDistanceMatrix.prototype.signature = function (signature) {
-    delete this.options.key;
-    this.options.signature = signature;
+GoogleDistanceMatrix.prototype.signature = function(signature) {
+  delete this.options.key;
+  this.options.signature = signature;
 }
 
 module.exports = new GoogleDistanceMatrix();
-
-
-
-
-

package.json

 {
   "name": "google-distance-matrix",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "A Node.js wrapper for Google Maps Distance Matrix API",
@@ -29,5 +29,6 @@ "main": "index.js",
   "dependencies": {
-    "qs": "^0.6.6",
+    "debug": "^2.1.0",
+    "qs-google-signature": "^1.1.1",
     "request": "^2.36.0"
   }
 }

No alert changes

Improved metrics

Lines of code

129

increased by4.03%

Worsened metrics

Total package byte prevSize

11332

decreased by-0.78%

Dependency count

3

increased by50%

Dependency changes

• + Addeddebug@^2.1.0

• + Addedqs-google-signature@^1.1.1

• + Addedclone@0.1.19(transitive)

• + Addeddebug@2.6.9(transitive)

• + Addedms@2.0.0(transitive)

• + Addedqs@2.4.2(transitive)

• + Addedqs-google-signature@1.2.0(transitive)

• - Removedqs@^0.6.6

• - Removedqs@0.6.6(transitive)