]> git.openstreetmap.org Git - rails.git/blobdiff - app/assets/javascripts/index/directions/fossgis.js
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'upstream/pull/2500'
[rails.git] / app / assets / javascripts / index / directions / fossgis.js
diff --git a/app/assets/javascripts/index/directions/fossgis.js b/app/assets/javascripts/index/directions/fossgis.js
index 1d6e1f82cb7300a022fcf667935655ee6ffd05b1..8e5e8e621d6d8b194e9ecc7f254c43287cb077ab 100644 (file)
--- a/app/assets/javascripts/index/directions/fossgis.js
+++ b/app/assets/javascripts/index/directions/fossgis.js
@@ -6,89 +6,89 @@ function FOSSGISEngine(id, vehicleType) {
 
   return {
     id: id,
 
   return {
     id: id,
-    creditline: '<a href="https://routing.openstreetmap.de/about.html" target="_blank">FOSSGIS Routing Service</a>',
+    creditline: "<a href=\"https://routing.openstreetmap.de/about.html\" target=\"_blank\">FOSSGIS Routing Service</a>",
     draggable: true,
 
     draggable: true,
 
-    _transformSteps: function(input_steps, line) {
+    _transformSteps: function (input_steps, line) {
       var INSTRUCTION_TEMPLATE = {
       var INSTRUCTION_TEMPLATE = {
-        'continue': 'javascripts.directions.instructions.continue',
-        'merge right': 'javascripts.directions.instructions.merge_right',
-        'merge left': 'javascripts.directions.instructions.merge_left',
-        'off ramp right': 'javascripts.directions.instructions.offramp_right',
-        'off ramp left': 'javascripts.directions.instructions.offramp_left',
-        'on ramp right': 'javascripts.directions.instructions.onramp_right',
-        'on ramp left': 'javascripts.directions.instructions.onramp_left',
-        'fork right': 'javascripts.directions.instructions.fork_right',
-        'fork left': 'javascripts.directions.instructions.fork_left',
-        'end of road right': 'javascripts.directions.instructions.endofroad_right',
-        'end of road left': 'javascripts.directions.instructions.endofroad_left',
-        'turn straight': 'javascripts.directions.instructions.continue',
-        'turn slight right': 'javascripts.directions.instructions.slight_right',
-        'turn right': 'javascripts.directions.instructions.turn_right',
-        'turn sharp right': 'javascripts.directions.instructions.sharp_right',
-        'turn uturn': 'javascripts.directions.instructions.uturn',
-        'turn sharp left': 'javascripts.directions.instructions.sharp_left',
-        'turn left': 'javascripts.directions.instructions.turn_left',
-        'turn slight left': 'javascripts.directions.instructions.slight_left',
-        'roundabout': 'javascripts.directions.instructions.roundabout',
-        'rotary': 'javascripts.directions.instructions.roundabout',
-        'exit roundabout': 'javascripts.directions.instructions.exit_roundabout',
-        'exit rotary': 'javascripts.directions.instructions.exit_roundabout',
-        'depart': 'javascripts.directions.instructions.start',
-        'arrive': 'javascripts.directions.instructions.destination',
+        "continue": "javascripts.directions.instructions.continue",
+        "merge right": "javascripts.directions.instructions.merge_right",
+        "merge left": "javascripts.directions.instructions.merge_left",
+        "off ramp right": "javascripts.directions.instructions.offramp_right",
+        "off ramp left": "javascripts.directions.instructions.offramp_left",
+        "on ramp right": "javascripts.directions.instructions.onramp_right",
+        "on ramp left": "javascripts.directions.instructions.onramp_left",
+        "fork right": "javascripts.directions.instructions.fork_right",
+        "fork left": "javascripts.directions.instructions.fork_left",
+        "end of road right": "javascripts.directions.instructions.endofroad_right",
+        "end of road left": "javascripts.directions.instructions.endofroad_left",
+        "turn straight": "javascripts.directions.instructions.continue",
+        "turn slight right": "javascripts.directions.instructions.slight_right",
+        "turn right": "javascripts.directions.instructions.turn_right",
+        "turn sharp right": "javascripts.directions.instructions.sharp_right",
+        "turn uturn": "javascripts.directions.instructions.uturn",
+        "turn sharp left": "javascripts.directions.instructions.sharp_left",
+        "turn left": "javascripts.directions.instructions.turn_left",
+        "turn slight left": "javascripts.directions.instructions.slight_left",
+        "roundabout": "javascripts.directions.instructions.roundabout",
+        "rotary": "javascripts.directions.instructions.roundabout",
+        "exit roundabout": "javascripts.directions.instructions.exit_roundabout",
+        "exit rotary": "javascripts.directions.instructions.exit_roundabout",
+        "depart": "javascripts.directions.instructions.start",
+        "arrive": "javascripts.directions.instructions.destination"
       };
       var ICON_MAP = {
       };
       var ICON_MAP = {
-        'continue': 0,
-        'merge right': 21,
-        'merge left': 20,
-        'off ramp right': 24,
-        'off ramp left': 25,
-        'on ramp right': 2,
-        'on ramp left': 6,
-        'fork right': 18,
-        'fork left': 19,
-        'end of road right': 22,
-        'end of road left': 23,
-        'turn straight': 0,
-        'turn slight right': 1,
-        'turn right': 2,
-        'turn sharp right': 3,
-        'turn uturn': 4,
-        'turn slight left': 5,
-        'turn left': 6,
-        'turn sharp left': 7,
-        'roundabout': 10,
-        'rotary': 10,
-        'exit roundabout': 10,
-        'exit rotary': 10,
-        'depart': 8,
-        'arrive': 14
+        "continue": 0,
+        "merge right": 21,
+        "merge left": 20,
+        "off ramp right": 24,
+        "off ramp left": 25,
+        "on ramp right": 2,
+        "on ramp left": 6,
+        "fork right": 18,
+        "fork left": 19,
+        "end of road right": 22,
+        "end of road left": 23,
+        "turn straight": 0,
+        "turn slight right": 1,
+        "turn right": 2,
+        "turn sharp right": 3,
+        "turn uturn": 4,
+        "turn slight left": 5,
+        "turn left": 6,
+        "turn sharp left": 7,
+        "roundabout": 10,
+        "rotary": 10,
+        "exit roundabout": 10,
+        "exit rotary": 10,
+        "depart": 8,
+        "arrive": 14
       };
       };
-      var numToWord = function(num) {
-        return ["first", "second", "third", "fourth", "fifth", "sixth", "seventh", "eighth", "ninth", "tenth"][num-1];
+      var numToWord = function (num) {
+        return ["first", "second", "third", "fourth", "fifth", "sixth", "seventh", "eighth", "ninth", "tenth"][num - 1];
       };
       };
-      var transformed_steps = input_steps.map(function(step, idx) {
+      var transformed_steps = input_steps.map(function (step, idx) {
         var maneuver_id;
 
         // special case handling
         switch (step.maneuver.type) {
         var maneuver_id;
 
         // special case handling
         switch (step.maneuver.type) {
-          case 'on ramp':
-          case 'off ramp':
-          case 'merge':
-          case 'end of road':
-          case 'fork':
-            maneuver_id = step.maneuver.type + ' ' + (step.maneuver.modifier.indexOf('left') >= 0 ? 'left' : 'right');
+          case "on ramp":
+          case "off ramp":
+          case "merge":
+          case "end of road":
+          case "fork":
+            maneuver_id = step.maneuver.type + " " + (step.maneuver.modifier.indexOf("left") >= 0 ? "left" : "right");
             break;
             break;
-          case 'depart':
-          case 'arrive':
-          case 'roundabout':
-          case 'rotary':
-          case 'exit roundabout':
-          case 'exit rotary':
+          case "depart":
+          case "arrive":
+          case "roundabout":
+          case "rotary":
+          case "exit roundabout":
+          case "exit rotary":
             maneuver_id = step.maneuver.type;
             break;
             maneuver_id = step.maneuver.type;
             break;
-          case 'roundabout turn':
-          case 'turn':
+          case "roundabout turn":
+          case "turn":
             maneuver_id = "turn " + step.maneuver.modifier;
             break;
           // for unknown types the fallback is turn
             maneuver_id = "turn " + step.maneuver.modifier;
             break;
           // for unknown types the fallback is turn
@@ -99,7 +99,7 @@ function FOSSGISEngine(id, vehicleType) {
         var template = INSTRUCTION_TEMPLATE[maneuver_id];
 
         // convert lat,lng pairs to LatLng objects
         var template = INSTRUCTION_TEMPLATE[maneuver_id];
 
         // convert lat,lng pairs to LatLng objects
-        var step_geometry = L.PolylineUtil.decode(step.geometry, { precision: 5 }).map(function(a) { return L.latLng(a); });
+        var step_geometry = L.PolylineUtil.decode(step.geometry, { precision: 5 }).map(function (a) { return L.latLng(a); });
         // append step_geometry on line
         Array.prototype.push.apply(line, step_geometry);
 
         // append step_geometry on line
         Array.prototype.push.apply(line, step_geometry);
 
@@ -115,7 +115,7 @@ function FOSSGISEngine(id, vehicleType) {
         } else if (step.ref) {
           name = "<b>" + step.ref + "</b>";
         } else {
         } else if (step.ref) {
           name = "<b>" + step.ref + "</b>";
         } else {
-          name = I18n.t('javascripts.directions.instructions.unnamed');
+          name = I18n.t("javascripts.directions.instructions.unnamed");
           namedRoad = false;
         }
 
           namedRoad = false;
         }
 
@@ -124,12 +124,12 @@ function FOSSGISEngine(id, vehicleType) {
         } else if (step.maneuver.type.match(/^(rotary|roundabout)$/)) {
           if (step.maneuver.exit) {
             if (step.maneuver.exit <= 10) {
         } else if (step.maneuver.type.match(/^(rotary|roundabout)$/)) {
           if (step.maneuver.exit) {
             if (step.maneuver.exit <= 10) {
-              instText += I18n.t(template + '_with_exit_ordinal', { exit: I18n.t('javascripts.directions.instructions.exit_counts.' + numToWord(step.maneuver.exit)), name: name });
+              instText += I18n.t(template + "_with_exit_ordinal", { exit: I18n.t("javascripts.directions.instructions.exit_counts." + numToWord(step.maneuver.exit)), name: name });
             } else {
             } else {
-              instText += I18n.t(template + '_with_exit', { exit: step.maneuver.exit, name: name });
+              instText += I18n.t(template + "_with_exit", { exit: step.maneuver.exit, name: name });
             }
           } else {
             }
           } else {
-            instText += I18n.t(template + '_without_exit', { name: name });
+            instText += I18n.t(template + "_without_exit", { name: name });
           }
         } else if (step.maneuver.type.match(/^(on ramp|off ramp)$/)) {
           var params = {};
           }
         } else if (step.maneuver.type.match(/^(on ramp|off ramp)$/)) {
           var params = {};
@@ -141,7 +141,7 @@ function FOSSGISEngine(id, vehicleType) {
           }
           instText += I18n.t(template, params);
         } else {
           }
           instText += I18n.t(template, params);
         } else {
-          instText += I18n.t(template + '_without_exit', { name: name });
+          instText += I18n.t(template + "_without_exit", { name: name });
         }
         return [[step.maneuver.location[1], step.maneuver.location[0]], ICON_MAP[maneuver_id], instText, step.distance, step_geometry];
       });
         }
         return [[step.maneuver.location[1], step.maneuver.location[0]], ICON_MAP[maneuver_id], instText, step.distance, step_geometry];
       });
@@ -150,7 +150,6 @@ function FOSSGISEngine(id, vehicleType) {
     },
 
     getRoute: function (points, callback) {
     },
 
     getRoute: function (points, callback) {
-
       var params = [
         { name: "overview", value: "false" },
         { name: "geometries", value: "polyline" },
       var params = [
         { name: "overview", value: "false" },
         { name: "geometries", value: "polyline" },
@@ -159,23 +158,24 @@ function FOSSGISEngine(id, vehicleType) {
 
 
       if (cachedHints.length === points.length) {
 
 
       if (cachedHints.length === points.length) {
-        params.push({name: "hints", value: cachedHints.join(";")});
+        params.push({ name: "hints", value: cachedHints.join(";") });
       } else {
         // invalidate cache
         cachedHints = [];
       }
 
       } else {
         // invalidate cache
         cachedHints = [];
       }
 
-      var encoded_coords = points.map(function(p) {
-        return p.lng + ',' + p.lat;
-      }).join(';');
+      var encoded_coords = points.map(function (p) {
+        return p.lng + "," + p.lat;
+      }).join(";");
 
       var req_url = OSM.FOSSGIS_OSRM_URL + "routed-" + vehicleType + "/route/v1/driving/" + encoded_coords;
 
       var onResponse = function (data) {
 
       var req_url = OSM.FOSSGIS_OSRM_URL + "routed-" + vehicleType + "/route/v1/driving/" + encoded_coords;
 
       var onResponse = function (data) {
-        if (data.code !== 'Ok')
+        if (data.code !== "Ok") {
           return callback(true);
           return callback(true);
+        }
 
 
-        cachedHints = data.waypoints.map(function(wp) {
+        cachedHints = data.waypoints.map(function (wp) {
           return wp.hint;
         });
 
           return wp.hint;
         });
 
The OpenStreetMap web site