Move routing API endpoint addresses to config file

[rails.git] / app / assets / javascripts / index / directions / mapzen.js

diff --git a/app/assets/javascripts/index/directions/mapzen.js b/app/assets/javascripts/index/directions/mapzen.js
index 3c2aaff8ce18f14fec04e5a0b94cdd101e4b46c4..348cb99c99c58367b7611f3b4b318ec5c02f5afe 100644 (file)
--- a/app/assets/javascripts/index/directions/mapzen.js
+++ b/app/assets/javascripts/index/directions/mapzen.js
@@ -28,7 +28,7 @@ function MapzenEngine(id, costing) {
     1,  // kMerge = 25;
     11, // kRoundaboutEnter = 26;
     12, // kRoundaboutExit = 27;
     1,  // kMerge = 25;
     11, // kRoundaboutEnter = 26;
     12, // kRoundaboutExit = 27;

-    1,  // kFerryEnter = 28;
+    18, // kFerryEnter = 28;

     1   // kFerryExit = 29;
   ];
 
     1   // kFerryExit = 29;
   ];
 


@@ -39,7 +39,7 @@ function MapzenEngine(id, costing) {
 
     getRoute: function (points, callback) {
       return $.ajax({
 
     getRoute: function (points, callback) {
       return $.ajax({

-        url: document.location.protocol + "//valhalla.mapzen.com/route",
+        url: document.location.protocol + OSM.MAPZEN_VALHALLA_URL,

         data: {
           api_key: OSM.MAPZEN_VALHALLA_KEY,
           json: JSON.stringify({
         data: {
           api_key: OSM.MAPZEN_VALHALLA_KEY,
           json: JSON.stringify({


@@ -87,12 +87,15 @@ function MapzenEngine(id, costing) {
             callback(false, {
               line: line,
               steps: steps,
             callback(false, {
               line: line,
               steps: steps,

-              distance: distance,
+              distance: distance * 1000,

               time: time
             });
           } else {
             callback(true);
           }
               time: time
             });
           } else {
             callback(true);
           }

+        },
+        error: function () {
+          callback(true);

         }
       });
     }
         }
       });
     }