Use double quotes consistently in javascript code

[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 267b1b4a6af09919423899e2eee921ee39ce978f..83f266accc9d1b1b59af0d4dd8fb2e9322fbf908 100644 (file)
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -14,25 +14,25 @@ function GraphHopperEngine(id, vehicleType) {
 
   return {
     id: id,
 
   return {
     id: id,

-    creditline: '<a href="https://graphhopper.com/" target="_blank">Graphhopper</a>',
+    creditline: "<a href=\"https://www.graphhopper.com/\" target=\"_blank\">Graphhopper</a>",

     draggable: false,
 
     getRoute: function (points, callback) {
       // GraphHopper Directions API documentation
     draggable: false,
 
     getRoute: function (points, callback) {
       // GraphHopper Directions API documentation

-      // https://github.com/graphhopper/directions-api/blob/master/docs-routing.md
+      // https://graphhopper.com/api/1/docs/routing/

       return $.ajax({
       return $.ajax({

-        url: document.location.protocol + OSM.GRAPHHOPPER_URL,
+        url: OSM.GRAPHHOPPER_URL,

         data: {
           vehicle: vehicleType,
           locale: I18n.currentLocale(),
           key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",
         data: {
           vehicle: vehicleType,
           locale: I18n.currentLocale(),
           key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",

-          type: "jsonp",
+          "ch.disable": vehicleType === "car",

           elevation: false,
           instructions: true,
           point: points.map(function (p) { return p.lat + "," + p.lng; })
         },
         traditional: true,
           elevation: false,
           instructions: true,
           point: points.map(function (p) { return p.lat + "," + p.lng; })
         },
         traditional: true,

-        dataType: "jsonp",
+        dataType: "json",

         success: function (data) {
           if (!data.paths || data.paths.length === 0)
             return callback(true);
         success: function (data) {
           if (!data.paths || data.paths.length === 0)
             return callback(true);


@@ -54,7 +54,7 @@ function GraphHopperEngine(id, vehicleType) {
               lineseg.push({lat: line[j][0], lng: line[j][1]});
             }
             steps.push([
               lineseg.push({lat: line[j][0], lng: line[j][1]});
             }
             steps.push([

-              {lat: latLng.lat, lng: latLng.lng},
+              {lat: latLng[0], lng: latLng[1]},

               instrCode,
               instrText,
               distInMeter,
               instrCode,
               instrText,
               distInMeter,


@@ -66,7 +66,9 @@ function GraphHopperEngine(id, vehicleType) {
             line: line,
             steps: steps,
             distance: path.distance,
             line: line,
             steps: steps,
             distance: path.distance,

-            time: path.time / 1000
+            time: path.time / 1000,
+            ascend: path.ascend,
+            descend: path.descend

           });
         },
         error: function () {
           });
         },
         error: function () {


@@ -77,5 +79,6 @@ function GraphHopperEngine(id, vehicleType) {
   };
 }
 
   };
 }
 

+OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_car", "car"), true);

 OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_bicycle", "bike"), true);
 OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_foot", "foot"), true);
 OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_bicycle", "bike"), true);
 OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_foot", "foot"), true);