Merge remote-tracking branch 'upstream/master' into routing-merge

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

diff --git a/app/assets/javascripts/index/directions_engines/graphhopper.js b/app/assets/javascripts/index/directions_engines/graphhopper.js
index d6e52070c742ac7b1e6c4f2f0e8454a0f984bed3..11d70efc55666ae4369c9519370c57bfe17abc93 100644 (file)
--- a/app/assets/javascripts/index/directions_engines/graphhopper.js
+++ b/app/assets/javascripts/index/directions_engines/graphhopper.js
@@ -1,4 +1,4 @@
-function GraphHopperEngine(vehicleName, vehicleParam) {
+function GraphHopperEngine(id, vehicleParam) {

   var GH_INSTR_MAP = {
     "-3": 6, // sharp left
     "-2": 7, // left
   var GH_INSTR_MAP = {
     "-3": 6, // sharp left
     "-2": 7, // left


@@ -12,26 +12,24 @@ function GraphHopperEngine(vehicleName, vehicleParam) {
   };
 
   return {
   };
 
   return {

-    name: "javascripts.directions.engines.graphhopper_" + vehicleName.toLowerCase(),
+    id: id,

     creditline: '<a href="http://graphhopper.com/" target="_blank">Graphhopper</a>',
     draggable: false,
 
     creditline: '<a href="http://graphhopper.com/" target="_blank">Graphhopper</a>',
     draggable: false,
 

-    getRoute: function (isFinal, points, callback) {
+    getRoute: function (points, callback) {

       // documentation
       // https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
       var url = "http://graphhopper.com/api/1/route?"
         + vehicleParam
         + "&locale=" + I18n.currentLocale()
         + "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn"
       // documentation
       // https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
       var url = "http://graphhopper.com/api/1/route?"
         + vehicleParam
         + "&locale=" + I18n.currentLocale()
         + "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn"

-        + "&type=jsonp";
+        + "&type=jsonp"
+        + "&instructions=true";

 
       for (var i = 0; i < points.length; i++) {
         url += "&point=" + points[i].lat + ',' + points[i].lng;
       }
 
 
       for (var i = 0; i < points.length; i++) {
         url += "&point=" + points[i].lat + ',' + points[i].lng;
       }
 

-      if (isFinal)
-        url += "&instructions=true";
-

       $.ajax({
         url: url,
         dataType: 'jsonp',
       $.ajax({
         url: url,
         dataType: 'jsonp',


@@ -72,5 +70,5 @@ function GraphHopperEngine(vehicleName, vehicleParam) {
   };
 }
 
   };
 }
 

-OSM.Directions.addEngine(GraphHopperEngine("Bicycle", "vehicle=bike"), false);
-OSM.Directions.addEngine(GraphHopperEngine("Foot", "vehicle=foot"), false);
+OSM.Directions.addEngine(GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), false);
+OSM.Directions.addEngine(GraphHopperEngine("graphhopper_foot", "vehicle=foot"), false);