Write browse element icons as <img>

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

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 8a80328cc05c3767813ac7ff3823330001095d9e..391c1f9315c7fe945d822d49380f9578729e79c0 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -1,190 +1,120 @@
+//= require ./directions-endpoint

 //= require_self
 //= require_tree ./directions
 //= require_self
 //= require_tree ./directions

+//= require qs/dist/qs

 
 OSM.Directions = function (map) {
 
 OSM.Directions = function (map) {

-  var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
-  var awaitingRoute;   // true if we've asked the engine for a route and are waiting to hear back
+  var routeRequest = null; // jqXHR object of an ongoing route request or null

   var chosenEngine;
 
   var chosenEngine;
 

-  var popup = L.popup({autoPanPadding: [100, 100]});
+  var popup = L.popup({ autoPanPadding: [100, 100] });

 
   var polyline = L.polyline([], {
 
   var polyline = L.polyline([], {

-    color: '#03f',
+    color: "#03f",

     opacity: 0.3,
     weight: 10
   });
 
   var highlight = L.polyline([], {
     opacity: 0.3,
     weight: 10
   });
 
   var highlight = L.polyline([], {

-    color: '#ff0',
+    color: "#ff0",

     opacity: 0.5,
     weight: 12
   });
 
     opacity: 0.5,
     weight: 12
   });
 

+  var endpointDragCallback = function (dragging) {
+    if (!map.hasLayer(polyline)) return;
+    if (dragging && !chosenEngine.draggable) return;
+    if (dragging && routeRequest) return;
+
+    getRoute(false, !dragging);
+  };
+  var endpointChangeCallback = function () {
+    getRoute(true, true);
+  };
+

   var endpoints = [
   var endpoints = [

-    Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN),
-    Endpoint($("input[name='route_to']"), OSM.MARKER_RED)
+    OSM.DirectionsEndpoint(map, $("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback, endpointChangeCallback),
+    OSM.DirectionsEndpoint(map, $("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointChangeCallback)

   ];
 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
 
   ];
 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
 

-  function Endpoint(input, iconUrl) {
-    var endpoint = {};
-
-    endpoint.marker = L.marker([0, 0], {
-      icon: L.icon({
-        iconUrl: iconUrl,
-        iconSize: [25, 41],
-        iconAnchor: [12, 41],
-        popupAnchor: [1, -34],
-        shadowUrl: OSM.MARKER_SHADOW,
-        shadowSize: [41, 41]
-      }),
-      draggable: true,
-      autoPan: true
-    });
-
-    endpoint.marker.on('drag dragend', function (e) {
-      var dragging = (e.type === 'drag');
-      if (dragging && !chosenEngine.draggable) return;
-      if (dragging && awaitingRoute) return;
-      endpoint.setLatLng(e.target.getLatLng());
-      if (map.hasLayer(polyline)) {
-        getRoute(false, !dragging);
-      }
-    });
-
-    input.on("keydown", function() {
-      input.removeClass("error");
-    });
-
-    input.on("change", function (e) {
-      awaitingGeocode = true;
-      
-      // make text the same in both text boxes
-      var value = e.target.value;
-      endpoint.setValue(value);
-    });
-
-    endpoint.setValue = function(value, latlng) {
-      endpoint.value = value;
-      delete endpoint.latlng;
-      input.removeClass("error");
-      input.val(value);
-
-      if (latlng) {
-        endpoint.setLatLng(latlng);
-      } else {
-        endpoint.getGeocode();
-      }
-    };
-
-    endpoint.getGeocode = function() {
-      // if no one has entered a value yet, then we can't geocode, so don't
-      // even try.
-      if (!endpoint.value) {
-        return;
-      }
-
-      endpoint.awaitingGeocode = true;
-
-      $.getJSON(OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) {
-        endpoint.awaitingGeocode = false;
-        endpoint.hasGeocode = true;
-        if (json.length === 0) {
-          input.addClass("error");
-          alert(I18n.t('javascripts.directions.errors.no_place', {place: endpoint.value}));
-          return;
-        }
-
-        endpoint.setLatLng(L.latLng(json[0]));
-
-        input.val(json[0].display_name);
+  var engines = OSM.Directions.engines;

 
 

-        if (awaitingGeocode) {
-          awaitingGeocode = false;
-          getRoute(true, true);
-        }
-      });
-    };
+  engines.sort(function (a, b) {
+    var localised_a = I18n.t("javascripts.directions.engines." + a.id),
+        localised_b = I18n.t("javascripts.directions.engines." + b.id);
+    return localised_a.localeCompare(localised_b);
+  });

 
 

-    endpoint.setLatLng = function (ll) {
-      var precision = OSM.zoomPrecision(map.getZoom());
-      input.val(ll.lat.toFixed(precision) + ", " + ll.lng.toFixed(precision));
-      endpoint.hasGeocode = true;
-      endpoint.latlng = ll;
-      endpoint.marker
-        .setLatLng(ll)
-        .addTo(map);
-    };
+  var select = $("select.routing_engines");

 
 

-    return endpoint;
-  }
+  engines.forEach(function (engine, i) {
+    select.append("<option value='" + i + "'>" + I18n.t("javascripts.directions.engines." + engine.id) + "</option>");
+  });

 
 

-  $(".directions_form .reverse_directions").on("click", function() {
-    var from = endpoints[0].latlng,
-        to = endpoints[1].latlng;
+  $(".directions_form .reverse_directions").on("click", function () {
+    var coordFrom = endpoints[0].latlng,
+        coordTo = endpoints[1].latlng,
+        routeFrom = "",
+        routeTo = "";
+    if (coordFrom) {
+      routeFrom = coordFrom.lat + "," + coordFrom.lng;
+    }
+    if (coordTo) {
+      routeTo = coordTo.lat + "," + coordTo.lng;
+    }

 
 

-    OSM.router.route("/directions?" + querystring.stringify({
+    OSM.router.route("/directions?" + Qs.stringify({

       from: $("#route_to").val(),
       to: $("#route_from").val(),
       from: $("#route_to").val(),
       to: $("#route_from").val(),

-      route: to.lat + "," + to.lng + ";" + from.lat + "," + from.lng
+      route: routeTo + ";" + routeFrom

     }));
   });
 
     }));
   });
 

-  $(".directions_form .close").on("click", function(e) {
+  $(".directions_form .btn-close").on("click", function (e) {

     e.preventDefault();
     e.preventDefault();

-    var route_from = endpoints[0].value;
-    if (route_from) {
-      OSM.router.route("/?query=" + encodeURIComponent(route_from) + OSM.formatHash(map));
-    } else {
-      OSM.router.route("/" + OSM.formatHash(map));
-    }
+    $(".describe_location").toggle(!endpoints[0].value);
+    $(".search_form input[name='query']").val(endpoints[0].value);
+    OSM.router.route("/" + OSM.formatHash(map));

   });
 
   function formatDistance(m) {
     if (m < 1000) {
   });
 
   function formatDistance(m) {
     if (m < 1000) {

-      return Math.round(m) + "m";
+      return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) });

     } else if (m < 10000) {
     } else if (m < 10000) {

-      return (m / 1000.0).toFixed(1) + "km";
+      return I18n.t("javascripts.directions.distance_km", { distance: (m / 1000.0).toFixed(1) });

     } else {
     } else {

-      return Math.round(m / 1000) + "km";
+      return I18n.t("javascripts.directions.distance_km", { distance: Math.round(m / 1000) });

     }
   }
 
     }
   }
 

+  function formatHeight(m) {
+    return I18n.t("javascripts.directions.distance_m", { distance: Math.round(m) });
+  }
+

   function formatTime(s) {
     var m = Math.round(s / 60);
     var h = Math.floor(m / 60);
     m -= h * 60;
   function formatTime(s) {
     var m = Math.round(s / 60);
     var h = Math.floor(m / 60);
     m -= h * 60;

-    return h + ":" + (m < 10 ? '0' : '') + m;
+    return h + ":" + (m < 10 ? "0" : "") + m;

   }
 
   }
 

-  function setEngine(id) {
-    engines.forEach(function(engine, i) {
-      if (engine.id === id) {
-        chosenEngine = engine;
-        select.val(i);
-      }
+  function findEngine(id) {
+    return engines.findIndex(function (engine) {
+      return engine.id === id;

     });
   }
 
     });
   }
 

+  function setEngine(index) {
+    chosenEngine = engines[index];
+    select.val(index);
+  }
+

   function getRoute(fitRoute, reportErrors) {
     // Cancel any route that is already in progress
   function getRoute(fitRoute, reportErrors) {
     // Cancel any route that is already in progress

-    if (awaitingRoute) awaitingRoute.abort();
-
-    // go fetch geocodes for any endpoints which have not already
-    // been geocoded.
-    for (var ep_i = 0; ep_i < 2; ++ep_i) {
-      var endpoint = endpoints[ep_i];
-      if (!endpoint.hasGeocode && !endpoint.awaitingGeocode) {
-        endpoint.getGeocode();
-        awaitingGeocode = true;
-      }
-    }
-    if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) {
-      awaitingGeocode = true;
-      return;
-    }
+    if (routeRequest) routeRequest.abort();

 
     var o = endpoints[0].latlng,
         d = endpoints[1].latlng;
 
     var o = endpoints[0].latlng,
         d = endpoints[1].latlng;


@@ -194,26 +124,26 @@ OSM.Directions = function (map) {
 
     var precision = OSM.zoomPrecision(map.getZoom());
 
 
     var precision = OSM.zoomPrecision(map.getZoom());
 

-    OSM.router.replace("/directions?" + querystring.stringify({
+    OSM.router.replace("/directions?" + Qs.stringify({

       engine: chosenEngine.id,
       engine: chosenEngine.id,

-      route: o.lat.toFixed(precision) + ',' + o.lng.toFixed(precision) + ';' +
-             d.lat.toFixed(precision) + ',' + d.lng.toFixed(precision)
+      route: o.lat.toFixed(precision) + "," + o.lng.toFixed(precision) + ";" +
+             d.lat.toFixed(precision) + "," + d.lng.toFixed(precision)

     }));
 
     // copy loading item to sidebar and display it. we copy it, rather than
     // just using it in-place and replacing it in case it has to be used
     // again.
     }));
 
     // copy loading item to sidebar and display it. we copy it, rather than
     // just using it in-place and replacing it in case it has to be used
     // again.

-    $('#sidebar_content').html($('.directions_form .loader_copy').html());
+    $("#sidebar_content").html($(".directions_form .loader_copy").html());

     map.setSidebarOverlaid(false);
 
     map.setSidebarOverlaid(false);
 

-    awaitingRoute = chosenEngine.getRoute([o, d], function (err, route) {
-      awaitingRoute = null;
+    routeRequest = chosenEngine.getRoute([o, d], function (err, route) {
+      routeRequest = null;

 
       if (err) {
         map.removeLayer(polyline);
 
         if (reportErrors) {
 
       if (err) {
         map.removeLayer(polyline);
 
         if (reportErrors) {

-          $('#sidebar_content').html('<p class="search_results_error">' + I18n.t('javascripts.directions.errors.no_route') + '</p>');
+          $("#sidebar_content").html("<div class=\"alert alert-danger\">" + I18n.t("javascripts.directions.errors.no_route") + "</div>");

         }
 
         return;
         }
 
         return;


@@ -227,50 +157,58 @@ OSM.Directions = function (map) {
         map.fitBounds(polyline.getBounds().pad(0.05));
       }
 
         map.fitBounds(polyline.getBounds().pad(0.05));
       }
 

-      var html = '<h2><a class="geolink" href="#">' +
-        '<span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') +
-        '</h2><p id="routing_summary">' +
-        I18n.t('javascripts.directions.distance') + ': ' + formatDistance(route.distance) + '. ' +
-        I18n.t('javascripts.directions.time') + ': ' + formatTime(route.time) + '.';
-      if (typeof route.ascend !== 'undefined' && typeof route.descend !== 'undefined') {
-        html += '<br />' +
-          I18n.t('javascripts.directions.ascend') + ': ' + Math.round(route.ascend) + 'm. ' +
-          I18n.t('javascripts.directions.descend') + ': ' + Math.round(route.descend) +'m.';
+      var distanceText = $("<p>").append(
+        I18n.t("javascripts.directions.distance") + ": " + formatDistance(route.distance) + ". " +
+        I18n.t("javascripts.directions.time") + ": " + formatTime(route.time) + ".");
+      if (typeof route.ascend !== "undefined" && typeof route.descend !== "undefined") {
+        distanceText.append(
+          $("<br>"),
+          I18n.t("javascripts.directions.ascend") + ": " + formatHeight(route.ascend) + ". " +
+          I18n.t("javascripts.directions.descend") + ": " + formatHeight(route.descend) + ".");

       }
       }

-      html += '</p><table id="turnbyturn" />';

 
 

-      $('#sidebar_content')
-        .html(html);
+      var turnByTurnTable = $("<table class='table table-hover table-sm mb-3'>")
+        .append($("<tbody>"));
+      var directionsCloseButton = $("<button type='button' class='btn-close'>")
+        .attr("aria-label", I18n.t("javascripts.close"));
+
+      $("#sidebar_content")
+        .empty()
+        .append(
+          $("<div class='d-flex'>").append(
+            $("<h2 class='flex-grow-1 text-break'>")
+              .text(I18n.t("javascripts.directions.directions")),
+            $("<div>").append(directionsCloseButton)),
+          distanceText,
+          turnByTurnTable
+        );

 
       // Add each row
 
       // Add each row

-      var cumulative = 0;

       route.steps.forEach(function (step) {
       route.steps.forEach(function (step) {

-        var ll        = step[0],
-          direction   = step[1],
-          instruction = step[2],
-          dist        = step[3],
-          lineseg     = step[4];
-
-        cumulative += dist;
+        var ll = step[0],
+            direction = step[1],
+            instruction = step[2],
+            dist = step[3],
+            lineseg = step[4];

 
         if (dist < 5) {
           dist = "";
         } else if (dist < 200) {
 
         if (dist < 5) {
           dist = "";
         } else if (dist < 200) {

-          dist = Math.round(dist / 10) * 10 + "m";
+          dist = String(Math.round(dist / 10) * 10) + "m";

         } else if (dist < 1500) {
         } else if (dist < 1500) {

-          dist = Math.round(dist / 100) * 100 + "m";
+          dist = String(Math.round(dist / 100) * 100) + "m";

         } else if (dist < 5000) {
         } else if (dist < 5000) {

-          dist = Math.round(dist / 100) / 10 + "km";
+          dist = String(Math.round(dist / 100) / 10) + "km";

         } else {
         } else {

-          dist = Math.round(dist / 1000) + "km";
+          dist = String(Math.round(dist / 1000)) + "km";

         }
 
         var row = $("<tr class='turn'/>");
         }
 
         var row = $("<tr class='turn'/>");

-        row.append("<td><div class='direction i" + direction + "'/></td> ");
-        row.append("<td class='instruction'>" + instruction);
-        row.append("<td class='distance'>" + dist);
+        row.append("<td class='border-0'><div class='direction i" + direction + "'/></td> ");
+        row.append("<td>" + instruction);
+        row.append("<td class='distance text-body-secondary text-end'>" + dist);

 
 

-        row.on('click', function () {
+        row.on("click", function () {

           popup
             .setLatLng(ll)
             .setContent("<p>" + instruction + "</p>")
           popup
             .setLatLng(ll)
             .setContent("<p>" + instruction + "</p>")


@@ -285,61 +223,44 @@ OSM.Directions = function (map) {
           map.removeLayer(highlight);
         });
 
           map.removeLayer(highlight);
         });
 

-        $('#turnbyturn').append(row);
+        turnByTurnTable.append(row);

       });
 
       });
 

-      $('#sidebar_content').append('<p id="routing_credit">' +
-        I18n.t('javascripts.directions.instructions.courtesy', {link: chosenEngine.creditline}) +
-        '</p>');
+      $("#sidebar_content").append("<p class=\"text-center\">" +
+        I18n.t("javascripts.directions.instructions.courtesy", { link: chosenEngine.creditline }) +
+        "</p>");

 
 

-      $('#sidebar_content a.geolink').on('click', function(e) {
-        e.preventDefault();
+      directionsCloseButton.on("click", function () {

         map.removeLayer(polyline);
         map.removeLayer(polyline);

-        $('#sidebar_content').html('');
+        $("#sidebar_content").html("");

         map.setSidebarOverlaid(true);
         // TODO: collapse width of sidebar back to previous
       });
     });
   }
 
         map.setSidebarOverlaid(true);
         // TODO: collapse width of sidebar back to previous
       });
     });
   }
 

-  var engines = OSM.Directions.engines;
-
-  engines.sort(function (a, b) {
-    a = I18n.t('javascripts.directions.engines.' + a.id);
-    b = I18n.t('javascripts.directions.engines.' + b.id);
-    return a.localeCompare(b);
-  });
-
-  var select = $('select.routing_engines');
-
-  engines.forEach(function(engine, i) {
-    select.append("<option value='" + i + "'>" + I18n.t('javascripts.directions.engines.' + engine.id) + "</option>");
-  });
-
-  var chosenEngineId = $.cookie('_osm_directions_engine');
-  if(!chosenEngineId) {
-    chosenEngineId = 'osrm_car';
+  var chosenEngineIndex = findEngine("fossgis_osrm_car");
+  if (Cookies.get("_osm_directions_engine")) {
+    chosenEngineIndex = findEngine(Cookies.get("_osm_directions_engine"));

   }
   }

-  setEngine(chosenEngineId);
+  setEngine(chosenEngineIndex);

 
   select.on("change", function (e) {
     chosenEngine = engines[e.target.selectedIndex];
 
   select.on("change", function (e) {
     chosenEngine = engines[e.target.selectedIndex];

-    $.cookie('_osm_directions_engine', chosenEngine.id, { expires: expiry, path: '/' });
-    if (map.hasLayer(polyline)) {
-      getRoute(true, true);
-    }
+    Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" });
+    getRoute(true, true);

   });
 
   });
 

-  $(".directions_form").on("submit", function(e) {
+  $(".directions_form").on("submit", function (e) {

     e.preventDefault();
     getRoute(true, true);
   });
 
     e.preventDefault();
     getRoute(true, true);
   });
 

-  $(".routing_marker").on('dragstart', function (e) {
+  $(".routing_marker_column img").on("dragstart", function (e) {

     var dt = e.originalEvent.dataTransfer;
     var dt = e.originalEvent.dataTransfer;

-    dt.effectAllowed = 'move';
-    var dragData = { type: $(this).data('type') };
-    dt.setData('text', JSON.stringify(dragData));
+    dt.effectAllowed = "move";
+    var dragData = { type: $(this).data("type") };
+    dt.setData("text", JSON.stringify(dragData));

     if (dt.setDragImage) {
       var img = $("<img>").attr("src", $(e.originalEvent.target).attr("src"));
       dt.setDragImage(img.get(0), 12, 21);
     if (dt.setDragImage) {
       var img = $("<img>").attr("src", $(e.originalEvent.target).attr("src"));
       dt.setDragImage(img.get(0), 12, 21);


@@ -348,57 +269,65 @@ OSM.Directions = function (map) {
 
   var page = {};
 
 
   var page = {};
 

-  page.pushstate = page.popstate = function() {
+  page.pushstate = page.popstate = function () {

     $(".search_form").hide();
     $(".directions_form").show();
 
     $(".search_form").hide();
     $(".directions_form").show();
 

-    $("#map").on('dragend dragover', function (e) {
+    $("#map").on("dragend dragover", function (e) {

       e.preventDefault();
     });
 
       e.preventDefault();
     });
 

-    $("#map").on('drop', function (e) {
+    $("#map").on("drop", function (e) {

       e.preventDefault();
       var oe = e.originalEvent;
       e.preventDefault();
       var oe = e.originalEvent;

-      var dragData = JSON.parse(oe.dataTransfer.getData('text'));
+      var dragData = JSON.parse(oe.dataTransfer.getData("text"));

       var type = dragData.type;
       var type = dragData.type;

-      var pt = L.DomEvent.getMousePosition(oe, map.getContainer());  // co-ordinates of the mouse pointer at present
+      var pt = L.DomEvent.getMousePosition(oe, map.getContainer()); // co-ordinates of the mouse pointer at present

       pt.y += 20;
       var ll = map.containerPointToLatLng(pt);
       pt.y += 20;
       var ll = map.containerPointToLatLng(pt);

-      endpoints[type === 'from' ? 0 : 1].setLatLng(ll);
-      getRoute(true, true);
+      var precision = OSM.zoomPrecision(map.getZoom());
+      var value = ll.lat.toFixed(precision) + ", " + ll.lng.toFixed(precision);
+      var llWithPrecision = L.latLng(ll.lat.toFixed(precision), ll.lng.toFixed(precision));
+      endpoints[type === "from" ? 0 : 1].setValue(value, llWithPrecision);

     });
 
     });
 

-    var params = querystring.parse(location.search.substring(1)),
-        route = (params.route || '').split(';'),
-        from = route[0] && L.latLng(route[0].split(',')),
-        to = route[1] && L.latLng(route[1].split(','));
+    endpoints[0].enable();
+    endpoints[1].enable();
+
+    var params = Qs.parse(location.search.substring(1)),
+        route = (params.route || "").split(";"),
+        from = route[0] && L.latLng(route[0].split(",")),
+        to = route[1] && L.latLng(route[1].split(","));

 
     if (params.engine) {
 
     if (params.engine) {

-      setEngine(params.engine);
+      var engineIndex = findEngine(params.engine);
+
+      if (engineIndex >= 0) {
+        setEngine(engineIndex);
+      }

     }
 
     endpoints[0].setValue(params.from || "", from);
     endpoints[1].setValue(params.to || "", to);
 
     map.setSidebarOverlaid(!from || !to);
     }
 
     endpoints[0].setValue(params.from || "", from);
     endpoints[1].setValue(params.to || "", to);
 
     map.setSidebarOverlaid(!from || !to);

-
-    getRoute(true, true);

   };
 
   };
 

-  page.load = function() {
+  page.load = function () {

     page.pushstate();
   };
 
     page.pushstate();
   };
 

-  page.unload = function() {
+  page.unload = function () {

     $(".search_form").show();
     $(".directions_form").hide();
     $(".search_form").show();
     $(".directions_form").hide();

-    $("#map").off('dragend dragover drop');
+    $("#map").off("dragend dragover drop");
+
+    endpoints[0].disable();
+    endpoints[1].disable();

 
     map
       .removeLayer(popup)
 
     map
       .removeLayer(popup)

-      .removeLayer(polyline)
-      .removeLayer(endpoints[0].marker)
-      .removeLayer(endpoints[1].marker);
+      .removeLayer(polyline);

   };
 
   return page;
   };
 
   return page;