Use bootstrap table striping to replace hand-cycled table stripes

[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 b14c05e29a3e1781af700a6e459af2b6a294fdf8..1c095a36b2d51450708d03f51653f04bb3718554 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -1,9 +1,12 @@
 //= require_self
 //= require_tree ./directions
 //= require_self
 //= require_tree ./directions

+//= require querystring

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

+  var querystring = require("querystring-component");
+

   var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
   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 awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back

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


@@ -31,9 +34,9 @@ OSM.Directions = function (map) {
   var engines = OSM.Directions.engines;
 
   engines.sort(function (a, b) {
   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 localised_a = I18n.t("javascripts.directions.engines." + a.id),
+        localised_b = I18n.t("javascripts.directions.engines." + b.id);
+    return localised_a.localeCompare(localised_b);

   });
 
   var select = $("select.routing_engines");
   });
 
   var select = $("select.routing_engines");


@@ -102,7 +105,9 @@ OSM.Directions = function (map) {
 
       endpoint.awaitingGeocode = true;
 
 
       endpoint.awaitingGeocode = true;
 

-      $.getJSON(OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json", function (json) {
+      var viewbox = map.getBounds().toBBoxString(); // <sw lon>,<sw lat>,<ne lon>,<ne lat>
+
+      $.getJSON(OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json&viewbox=" + viewbox, function (json) {

         endpoint.awaitingGeocode = false;
         endpoint.hasGeocode = true;
         if (json.length === 0) {
         endpoint.awaitingGeocode = false;
         endpoint.hasGeocode = true;
         if (json.length === 0) {


@@ -137,12 +142,20 @@ OSM.Directions = function (map) {
 
   $(".directions_form .reverse_directions").on("click", function () {
     var from = endpoints[0].latlng,
 
   $(".directions_form .reverse_directions").on("click", function () {
     var from = endpoints[0].latlng,

-        to = endpoints[1].latlng;
+        to = endpoints[1].latlng,
+        routeFrom = "",
+        routeTo = "";
+    if (from) {
+      routeFrom = from.lat + "," + from.lng;
+    }
+    if (to) {
+      routeTo = to.lat + "," + to.lng;
+    }

 
     OSM.router.route("/directions?" + querystring.stringify({
       from: $("#route_to").val(),
       to: $("#route_from").val(),
 
     OSM.router.route("/directions?" + querystring.stringify({
       from: $("#route_to").val(),
       to: $("#route_from").val(),

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

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


@@ -260,11 +273,11 @@ OSM.Directions = function (map) {
 
       // Add each row
       route.steps.forEach(function (step) {
 
       // Add each row
       route.steps.forEach(function (step) {

-        var ll          = step[0],
-            direction   = step[1],
+        var ll = step[0],
+            direction = step[1],

             instruction = step[2],
             instruction = step[2],

-            dist        = step[3],
-            lineseg     = step[4];
+            dist = step[3],
+            lineseg = step[4];

 
         if (dist < 5) {
           dist = "";
 
         if (dist < 5) {
           dist = "";


@@ -360,7 +373,7 @@ OSM.Directions = function (map) {
       var oe = e.originalEvent;
       var dragData = JSON.parse(oe.dataTransfer.getData("text"));
       var type = dragData.type;
       var oe = e.originalEvent;
       var dragData = JSON.parse(oe.dataTransfer.getData("text"));
       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);
       endpoints[type === "from" ? 0 : 1].setLatLng(ll);
       pt.y += 20;
       var ll = map.containerPointToLatLng(pt);
       endpoints[type === "from" ? 0 : 1].setLatLng(ll);