Remove some repeated-query funkiness

[rails.git] / app / assets / javascripts / routing.js.erb

diff --git a/app/assets/javascripts/routing.js.erb b/app/assets/javascripts/routing.js.erb
index 81cd3e7a18f62250ac5abdfd5bf21c1570cccf44..b6bf9f4a0cac80fa3f0070f71155d2c1e6802715 100644 (file)
--- a/app/assets/javascripts/routing.js.erb
+++ b/app/assets/javascripts/routing.js.erb
@@ -6,13 +6,12 @@
        https://github.com/apmon/openstreetmap-website/compare/routing2
        https://github.com/apmon/openstreetmap-website/blob/9755c3ae0a8d0684d43760f91dc864ff42d8477a/app/views/routing/start.js.erb
 
-       *** draggable start/end markers
        *** translation (including all alerts and presentation)
        *** export GPX
        *** URL history (or do we consciously not want to support that?)
+       *** spinner when waiting for result (beneath 'Go' button?)
 
        *** add YOURS engine
-       *** add GraphHopper engine
 */
 
 var TURN_INSTRUCTIONS=["",
@@ -56,6 +55,7 @@ OSM.Routing=function(map,name,jqSearch) {
        r.route_from=null;              // null=unset, false=awaiting response, [lat,lon]=geocoded
        r.route_to=null;                //  |
        r.awaitingGeocode=false;// true if the user has requested a route, but we're waiting on a geocode result
+       r.awaitingRoute=false;  // true if we've asked the engine for a route and are waiting to hear back
        r.viaPoints=[];                 // not yet used
 
        r.polyline=null;                // Leaflet polyline object
@@ -104,10 +104,10 @@ OSM.Routing=function(map,name,jqSearch) {
                field.value=json[0].display_name;
                var lat=Number(json[0].lat), lon=Number(json[0].lon);
                r[field.id]=[lat,lon];
-               r.updateMarkers(field.id);
+               r.updateMarker(field.id);
                if (r.awaitingGeocode) {
                        r.awaitingGeocode=false;
-                       r.requestRoute();
+                       r.requestRoute(true);
                }
        };
 
@@ -118,6 +118,8 @@ OSM.Routing=function(map,name,jqSearch) {
                var ll=r.map.mouseEventToLatLng(e.originalEvent);
                // *** ^^^ this is slightly off - we need to work out the latLng of the tip
                r.createMarker(ll,id);
+               r.setNumericInput(ll,id);
+               r.requestRoute(true);
                // update to/from field
        };
        r.createMarker=function(latlng,id) {
@@ -130,22 +132,35 @@ OSM.Routing=function(map,name,jqSearch) {
                r[id].on('drag',r.markerDragged);
                r[id].on('dragend',r.markerDragged);
        };
-       r.updateMarkers=function(id) {
+       // Update marker from geocoded route input
+       r.updateMarker=function(id) {
+               var m=id.replace('route','marker');
+               if (!r[m]) { r.createMarker(r[id],m); return; }
+               var ll=r[m].getLatLng();
+               if (ll.lat!=r[id][0] || ll.lng!=r[id][1]) {
+                       r.createMarker(r[id],m);
+               }
        };
+       // Marker has been dragged
        r.markerDragged=function(e) {
-               // marker has been dragged
                if (e.type=='drag' && !r.chosenEngine.draggable) return;
-               // *** also return if e.type=='drag' and not long enough since last request returned
-               // *** but always do if e.type=='dragend'
-               console.log(e.target.options.name);
-               console.log(e.target.getLatLng());
+               if (e.type=='drag' && r.awaitingRoute) return;
+               r.setNumericInput(e.target.getLatLng(), e.target.options.name);
+               r.requestRoute(e.type=='dragend');
        };
+       // Set a route input field to a numeric value
+       r.setNumericInput=function(ll,id) {
+               var routeid=id.replace('marker','route');
+               r[routeid]=[ll.lat,ll.lng];
+               $("[name="+routeid+"]:visible").val(Math.round(ll.lat*10000)/10000+" "+Math.round(ll.lng*10000)/10000);
+       }
        
        // Route-fetching UI
 
-       r.requestRoute=function() {
+       r.requestRoute=function(isFinal) {
                if (r.route_from && r.route_to) {
-                       r.chosenEngine.getRoute(true,[r.route_from,r.route_to]);
+                       r.awaitingRoute=true;
+                       r.chosenEngine.getRoute(isFinal,[r.route_from,r.route_to]);
                        // then, when the route has been fetched, it'll call the engine's gotRoute function
                } else if (r.route_from==false || r.route_to==false) {
                        // we're waiting for a Nominatim response before we can request a route
@@ -157,7 +172,8 @@ OSM.Routing=function(map,name,jqSearch) {
        r.setPolyline=function(line) {
                if (r.polyline) map.removeLayer(r.polyline);
                r.polyline=L.polyline(line, ROUTING_POLYLINE).addTo(r.map);
-               r.map.fitBounds(r.polyline.getBounds());
+               // r.map.fitBounds(r.polyline.getBounds());
+               // *** ^^^ we only want to do this for geocode-originated routes
        };
 
        // Take directions and write them out
@@ -202,9 +218,11 @@ OSM.Routing=function(map,name,jqSearch) {
        
        r.close=function() {
                $("#content").addClass("overlay-sidebar");
-               var remove=[r.polyline,r.popup,r.marker_from,r.marker_to];
+               r.route_from=r.route_to=null;
+               $(".query_wrapper.routing input").val("");
+               var remove=['polyline','popup','marker_from','marker_to'];
                for (var i=0; i<remove.length; i++) {
-                       if (remove[i]) map.removeLayer(remove[i]);
+                       if (r[remove[i]]) { map.removeLayer(r[remove[i]]); r[remove[i]]=null; }
                }
        };
 
@@ -222,7 +240,7 @@ OSM.Routing=function(map,name,jqSearch) {
                                script.src = url+r.name+".gotRoute"+num;
                                document.body.appendChild(script); 
                        };
-                       r['gotRoute'+num]=function(data) { list[num].gotRoute(r,data); };
+                       r['gotRoute'+num]=function(data) { r.awaitingRoute=false; list[num].gotRoute(r,data); };
                }
                select.append("<option value='"+i+"'>"+list[i].name+"</option>");
        }