X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4254a1f2910d993aed343ea963c59e8ac9ca52c2..HEAD:/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 95cb29ab8..729618f2d 100644
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@ -1,76 +1,79 @@
-function GraphHopperEngine(id, vehicleParam) {
-  var GH_INSTR_MAP = {
-    "-3": 6, // sharp left
-    "-2": 7, // left
-    "-1": 8, // slight left
-    0: 0, // straight
-    1: 1, // slight right
-    2: 2, // right
-    3: 3, // sharp right
-    4: -1, // finish reached
-    5: -1, // via reached
-    6: 11 // roundabout
-  };
+(function () {
+  function GraphHopperEngine(id, vehicleType) {
+    const GH_INSTR_MAP = {
+      "-3": 7, // sharp left
+      "-2": 6, // left
+      "-1": 5, // slight left
+      "0": 0, // straight
+      "1": 1, // slight right
+      "2": 2, // right
+      "3": 3, // sharp right
+      "4": 14, // finish reached
+      "5": 14, // via reached
+      "6": 10, // roundabout
+      "-7": 19, // keep left
+      "7": 18, // keep right
+      "-98": 4, // unknown direction u-turn
+      "-8": 4, // left u-turn
+      "8": 4 // right u-turn
+    };
 
-  return {
-    id: id,
-    creditline: '<a href="https://graphhopper.com/" target="_blank">Graphhopper</a>',
-    draggable: false,
+    function _processDirections(path) {
+      const line = L.PolylineUtil.decode(path.points);
 
-    getRoute: function (points, callback) {
-      // 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;
-      }
-
-      return $.ajax({
-        url: url,
-        dataType: 'jsonp',
-        success: function (data) {
-          if (!data.paths || data.paths.length === 0)
-            return callback(true);
+      const steps = path.instructions.map(function (instr, i) {
+        const num = `<b>${i + 1}.</b> `;
+        const lineseg = line
+          .slice(instr.interval[0], instr.interval[1] + 1)
+          .map(([lat, lng]) => ({ lat, lng }));
+        return [
+          lineseg[0],
+          GH_INSTR_MAP[instr.sign],
+          num + instr.text,
+          instr.distance,
+          lineseg
+        ]; // TODO does graphhopper map instructions onto line indices?
+      });
+      steps.at(-1)[1] = 14;
 
-          var path = data.paths[0];
-          var line = L.PolylineUtil.decode(path.points);
+      return {
+        line: line,
+        steps: steps,
+        distance: path.distance,
+        time: path.time / 1000,
+        ascend: path.ascend,
+        descend: path.descend
+      };
+    }
 
-          var steps = [];
-          var len = path.instructions.length;
-          for (var i = 0; i < len; i++) {
-            var instr = path.instructions[i];
-            var instrCode = (i === len - 1) ? 15 : GH_INSTR_MAP[instr.sign];
-            var instrText = "<b>" + (i + 1) + ".</b> ";
-            instrText += instr.text;
-            var latLng = line[instr.interval[0]];
-            var distInMeter = instr.distance;
-            steps.push([
-              {lat: latLng.lat, lng: latLng.lng},
-              instrCode,
-              instrText,
-              distInMeter,
-              []
-            ]); // TODO does graphhopper map instructions onto line indices?
-          }
+    return {
+      id: id,
+      creditline: "<a href=\"https://www.graphhopper.com/\" target=\"_blank\">GraphHopper</a>",
+      draggable: false,
 
-          callback(null, {
-            line: line,
-            steps: steps,
-            distance: path.distance,
-            time: path.time / 1000
+      getRoute: function (points, signal) {
+        // GraphHopper Directions API documentation
+        // https://graphhopper.com/api/1/docs/routing/
+        const query = new URLSearchParams({
+          vehicle: vehicleType,
+          locale: I18n.currentLocale(),
+          key: "LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn",
+          elevation: false,
+          instructions: true,
+          turn_costs: vehicleType === "car"
+        });
+        points.forEach(p => query.append("point", p.lat + "," + p.lng));
+        return fetch(OSM.GRAPHHOPPER_URL + "?" + query, { signal })
+          .then(response => response.json())
+          .then(({ paths }) => {
+            if (!paths || paths.length === 0) throw new Error();
+            return _processDirections(paths[0]);
           });
-        }
-      });
-    }
-  };
-}
+      }
+    };
+  }
 
-OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), true);
-OSM.Directions.addEngine(new GraphHopperEngine("graphhopper_foot", "vehicle=foot"), true);
+  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);
+}());