Updated mapquest provider to have api key functionality

fillerwriter · fillerwriter · commit a8d3a0e69edc · 2013-11-01T16:34:08.000-04:00
diff --git a/dist/geocoder.js b/dist/geocoder.js
diff --git a/example/mapquest.html b/example/mapquest.html
@@ -5,7 +5,7 @@
     <script src="../dist/geocoder.js"></script>
     <script>
       var mapQuestGeocoder = new GeocoderJS.createGeocoder('mapquest');
-      mapQuestGeocoder.geocode('Washington, DC', function(result) {
+      mapQuestGeocoder.geocode('1600 Pennsylvania Avenue NW, Washington, DC 20500', function(result) {
         console.log(result);
       });
 
diff --git a/spec/runner.html b/spec/runner.html
@@ -28,8 +28,6 @@
   
   <script src="../src/providers/GoogleAPIProvider.js"></script>
   
-  <script src="../src/providers/GoogleProvider.js"></script>
-  
   <script src="../src/providers/MapquestProvider.js"></script>
   
   <script src="GeoJSONDumper.spec.js"></script>
@@ -40,8 +38,6 @@
   
   <script src="providers/GoogleAPIProvider.spec.js"></script>
   
-  <script src="providers/GoogleProvider.spec.js"></script>
-  
   <script src="providers/MapquestProvider.spec.js"></script>
   
   <script src="providers/ProviderBase.spec.js"></script>
diff --git a/src/GeocoderProviderFactory.js b/src/GeocoderProviderFactory.js
@@ -28,10 +28,10 @@ if (typeof GeocoderJS === "undefined" && typeof require === "function") {
 
     switch (options.provider) {
       case 'google':
-        provider = new GeocoderJS.GoogleAPIProvider();
+        provider = new GeocoderJS.GoogleAPIProvider(options);
         break;
       case 'mapquest':
-        provider = new GeocoderJS.MapquestProvider();
+        provider = new GeocoderJS.MapquestProvider(options);
         break;
     }
 
diff --git a/src/providers/MapquestProvider.js b/src/providers/MapquestProvider.js
@@ -15,7 +15,9 @@ if (typeof GeocoderJS === "undefined" && typeof require === "function") {
       };
 
       for (var i in defaults) {
-        options[i] = defaults[i];
+        if (options[i] === undefined) {
+          options[i] = defaults[i];
+        }
       }
 
       this.apiKey = options.apiKey;
@@ -42,10 +44,12 @@ if (typeof GeocoderJS === "undefined" && typeof require === "function") {
     GeocoderJS.MapquestProvider.prototype.executeRequest = function(params, callback) {
       var req = new XMLHttpRequest(),
       requestUrl = 'http://open.mapquestapi.com/geocoding/v1/address?outFormat=json&location=' + encodeURIComponent(params.location);
-      console.log(requestUrl);
+
+      if (this.apiKey) {
+        requestUrl += '&key=' + this.apiKey;
+      }
 
       req.onload = function () {
-        console.log(this);
         if (this.status != 200) {
           console.log("Received HTTP status code " + this.status + " when attempting geocoding request.");
           return callback(null);
