Merge pull request #12 from danstowell/jsrouting-bboxzoom

[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 3c6db9999888703ea310a0f0b5ef57777cf383ff..74607ef391572c0fe1c9e207a214c5cc50a5c240 100644 (file)
--- a/app/assets/javascripts/routing.js.erb
+++ b/app/assets/javascripts/routing.js.erb
@@ -109,7 +109,7 @@ OSM.Routing=function(map,name,jqSearch) {
                r.updateMarker(field.id);
                if (r.awaitingGeocode) {
                        r.awaitingGeocode=false;
-                       r.requestRoute(true);
+                       r.requestRoute(true, true);
                }
        };
 
@@ -121,7 +121,7 @@ OSM.Routing=function(map,name,jqSearch) {
                // *** ^^^ 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);
+               r.requestRoute(true, false);
                // update to/from field
        };
        r.createMarker=function(latlng,id) {
@@ -148,7 +148,7 @@ OSM.Routing=function(map,name,jqSearch) {
                if (e.type=='drag' && !r.chosenEngine.draggable) return;
                if (e.type=='drag' && r.awaitingRoute) return;
                r.setNumericInput(e.target.getLatLng(), e.target.options.name);
-               r.requestRoute(e.type=='dragend');
+               r.requestRoute(e.type=='dragend', false);
        };
        // Set a route input field to a numeric value
        r.setNumericInput=function(ll,id) {
@@ -159,10 +159,13 @@ OSM.Routing=function(map,name,jqSearch) {
        
        // Route-fetching UI
 
-       r.requestRoute=function(isFinal) {
+       r.requestRoute=function(isFinal, updateZoom) {
                if (r.route_from && r.route_to) {
                        r.awaitingRoute=true;
                        r.chosenEngine.getRoute(isFinal,[r.route_from,r.route_to]);
+                       if(updateZoom){
+                               r.map.fitBounds(L.latLngBounds([r.route_from, r.route_to]).pad(0.05));
+                       }
                        // 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
@@ -211,6 +214,8 @@ OSM.Routing=function(map,name,jqSearch) {
                        $('#turnbyturn').append(row);
                        cumulative+=step[3];
                }
+               $('#sidebar_content').append('<p id="routing_credit">' + r.chosenEngine.creditline + '</p>');
+
        };
        r.clickTurn=function(num,latlng) {
                r.popup=L.popup().setLatLng(latlng).setContent("<p>"+(num+1)+"</p>").openOn(r.map);
@@ -252,6 +257,9 @@ OSM.Routing=function(map,name,jqSearch) {
        // Choose an engine on dropdown change
        r.selectEngine=function(e) {
                r.chosenEngine=r.engines[e.target.selectedIndex];
+               if (r.polyline){ // and if a route is currently showing, must also refresh, else confusion
+                       r.requestRoute(true, false);
+               }
        };
        // Choose an engine by name
        r.chooseEngine=function(name) {