Combine category and reporting user

[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 093afe30a9148836ac63a39cd985ee2b3538ae47..1a3e0d4ecae558056b2b9867c4ea2ea0fe4b9920 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -4,10 +4,9 @@
 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
 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 dragging;        // true if the user is dragging a start/end point

   var chosenEngine;
 
   var chosenEngine;
 

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

 
   var polyline = L.polyline([], {
     color: '#03f',
 
   var polyline = L.polyline([], {
     color: '#03f',


@@ -45,26 +44,33 @@ OSM.Directions = function (map) {
     });
 
     endpoint.marker.on('drag dragend', function (e) {
     });
 
     endpoint.marker.on('drag dragend', function (e) {

-      dragging = (e.type === 'drag');
+      var dragging = (e.type === 'drag');

       if (dragging && !chosenEngine.draggable) return;
       if (dragging && awaitingRoute) return;
       endpoint.setLatLng(e.target.getLatLng());
       if (map.hasLayer(polyline)) {
       if (dragging && !chosenEngine.draggable) return;
       if (dragging && awaitingRoute) return;
       endpoint.setLatLng(e.target.getLatLng());
       if (map.hasLayer(polyline)) {

-        getRoute();
+        getRoute(false, !dragging);

       }
     });
 
     input.on("change", function (e) {
       }
     });
 
     input.on("change", function (e) {

+      awaitingGeocode = true;
+      

       // make text the same in both text boxes
       var value = e.target.value;
       endpoint.setValue(value);
     });
 
       // make text the same in both text boxes
       var value = e.target.value;
       endpoint.setValue(value);
     });
 

-    endpoint.setValue = function(value) {
+    endpoint.setValue = function(value, latlng) {

       endpoint.value = value;
       delete endpoint.latlng;
       input.val(value);
       endpoint.value = value;
       delete endpoint.latlng;
       input.val(value);

-      endpoint.getGeocode();
+
+      if (latlng) {
+        endpoint.setLatLng(latlng);
+      } else {
+        endpoint.getGeocode();
+      }

     };
 
     endpoint.getGeocode = function() {
     };
 
     endpoint.getGeocode = function() {


@@ -84,16 +90,13 @@ OSM.Directions = function (map) {
           return;
         }
 
           return;
         }
 

-        input.val(json[0].display_name);
+        endpoint.setLatLng(L.latLng(json[0]));

 
 

-        endpoint.latlng = L.latLng(json[0]);
-        endpoint.marker
-          .setLatLng(endpoint.latlng)
-          .addTo(map);
+        input.val(json[0].display_name);

 
         if (awaitingGeocode) {
           awaitingGeocode = false;
 
         if (awaitingGeocode) {
           awaitingGeocode = false;

-          getRoute();
+          getRoute(true, true);

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


@@ -118,7 +121,7 @@ OSM.Directions = function (map) {
     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: from.lat + "," + from.lng + ";" + to.lat + "," + to.lng
+      route: to.lat + "," + to.lng + ";" + from.lat + "," + from.lng

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


@@ -158,7 +161,7 @@ OSM.Directions = function (map) {
     });
   }
 
     });
   }
 

-  function getRoute() {
+  function getRoute(fitRoute, reportErrors) {

     // Cancel any route that is already in progress
     if (awaitingRoute) awaitingRoute.abort();
 
     // Cancel any route that is already in progress
     if (awaitingRoute) awaitingRoute.abort();
 


@@ -202,7 +205,7 @@ OSM.Directions = function (map) {
       if (err) {
         map.removeLayer(polyline);
 
       if (err) {
         map.removeLayer(polyline);
 

-        if (!dragging) {
+        if (reportErrors) {

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


@@ -213,7 +216,7 @@ OSM.Directions = function (map) {
         .setLatLngs(route.line)
         .addTo(map);
 
         .setLatLngs(route.line)
         .addTo(map);
 

-      if (!dragging) {
+      if (fitRoute) {

         map.fitBounds(polyline.getBounds().pad(0.05));
       }
 
         map.fitBounds(polyline.getBounds().pad(0.05));
       }
 


@@ -316,13 +319,13 @@ OSM.Directions = function (map) {
     chosenEngine = engines[e.target.selectedIndex];
     $.cookie('_osm_directions_engine', chosenEngine.id, { expires: expiry, path: '/' });
     if (map.hasLayer(polyline)) {
     chosenEngine = engines[e.target.selectedIndex];
     $.cookie('_osm_directions_engine', chosenEngine.id, { expires: expiry, path: '/' });
     if (map.hasLayer(polyline)) {

-      getRoute();
+      getRoute(true, true);

     }
   });
 
   $(".directions_form").on("submit", function(e) {
     e.preventDefault();
     }
   });
 
   $(".directions_form").on("submit", function(e) {
     e.preventDefault();

-    getRoute();
+    getRoute(true, true);

   });
 
   $(".routing_marker").on('dragstart', function (e) {
   });
 
   $(".routing_marker").on('dragstart', function (e) {


@@ -355,28 +358,24 @@ OSM.Directions = function (map) {
       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);

-      getRoute();
+      getRoute(true, true);

     });
 
     var params = querystring.parse(location.search.substring(1)),
     });
 
     var params = querystring.parse(location.search.substring(1)),

-      route = (params.route || '').split(';');
+        route = (params.route || '').split(';'),
+        from = route[0] && L.latLng(route[0].split(',')),
+        to = route[1] && L.latLng(route[1].split(','));

 
     if (params.engine) {
       setEngine(params.engine);
     }
 
 
     if (params.engine) {
       setEngine(params.engine);
     }
 

-    endpoints[0].setValue(params.from || "");
-    endpoints[1].setValue(params.to || "");
-
-    var o = route[0] && L.latLng(route[0].split(',')),
-        d = route[1] && L.latLng(route[1].split(','));
-
-    if (o) endpoints[0].setLatLng(o);
-    if (d) endpoints[1].setLatLng(d);
+    endpoints[0].setValue(params.from || "", from);
+    endpoints[1].setValue(params.to || "", to);

 
 

-    map.setSidebarOverlaid(!o || !d);
+    map.setSidebarOverlaid(!from || !to);

 
 

-    getRoute();
+    getRoute(true, true);

   };
 
   page.load = function() {
   };
 
   page.load = function() {