GraphHopper directions updates

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

diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index/directions/graphhopper.js
index 8d01bcd169dd06c691faf849f9d3e2ab1aab260a..deefe151755a89186b8b04e17bb66c23137bb07f 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -8,7 +8,8 @@ function GraphHopperEngine(id, vehicleParam) {
     2: 2, // right
     3: 3, // sharp right
     4: -1, // finish reached
-    5: -1 // via reached
+    5: -1, // via reached
+    6: 11 // roundabout
   };
 
   return {
@@ -17,14 +18,15 @@ function GraphHopperEngine(id, vehicleParam) {
     draggable: false,
 
     getRoute: function (points, callback) {
-      // documentation
-      // https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
-      var url = "https://graphhopper.com/api/1/route?"
-        + vehicleParam
-        + "&locale=" + I18n.currentLocale()
-        + "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn"
-        + "&type=jsonp"
-        + "&instructions=true";
+      // GraphHopper Directions API documentation
+      // https://github.com/graphhopper/directions-api/blob/master/docs-routing.md
+      var url = document.location.protocol + "//graphhopper.com/api/1/route?" +
+          vehicleParam +
+          "&locale=" + I18n.currentLocale() +
+          "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn" +
+          "&type=jsonp" +
+          "&elevation=false" +
+          "&instructions=true";
 
       for (var i = 0; i < points.length; i++) {
         url += "&point=" + points[i].lat + ',' + points[i].lng;
@@ -34,7 +36,7 @@ function GraphHopperEngine(id, vehicleParam) {
         url: url,
         dataType: 'jsonp',
         success: function (data) {
-          if (!data.paths || data.paths.length == 0)
+          if (!data.paths || data.paths.length === 0)
             return callback(true);
 
           var path = data.paths[0];
@@ -70,5 +72,5 @@ function GraphHopperEngine(id, vehicleParam) {
   };
 }
 
-OSM.Directions.addEngine(GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), false);
-OSM.Directions.addEngine(GraphHopperEngine("graphhopper_foot", "vehicle=foot"), false);
+OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), true);
+OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_foot", "vehicle=foot"), true);