Add distance/time summary

[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 fb03e5bec9c1b32de13b8e3fd89ef18b7712ac24..42373ef9d7ec740e738a6a0b4738ad17de2f0881 100644 (file)
--- a/app/assets/javascripts/routing.js.erb
+++ b/app/assets/javascripts/routing.js.erb
@@ -9,8 +9,6 @@
        *** translation (including all alerts and presentation)
        *** export GPX
        *** URL history (or do we consciously not want to support that?)
        *** 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 YOURS engine
 */
 


@@ -58,6 +56,7 @@ OSM.Routing=function(map,name,jqSearch) {
        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.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.dragging=false;               // true if the user is dragging a start/end point

        r.viaPoints=[];                 // not yet used
 
        r.polyline=null;                // Leaflet polyline object
        r.viaPoints=[];                 // not yet used
 
        r.polyline=null;                // Leaflet polyline object


@@ -99,7 +98,7 @@ OSM.Routing=function(map,name,jqSearch) {
        
        r._gotGeocode=function(json,field) {
                if (json.length==0) {
        
        r._gotGeocode=function(json,field) {
                if (json.length==0) {

-                       alert("Sorry, couldn't find that place.");      // *** internationalise
+                       alert(I18n.t('javascripts.directions.errors.no_place'));

                        r[field.id]=null;
                        return;
                }
                        r[field.id]=null;
                        return;
                }


@@ -116,9 +115,12 @@ OSM.Routing=function(map,name,jqSearch) {
        // Drag and drop markers
        
        r.handleDrop=function(e) {
        // Drag and drop markers
        
        r.handleDrop=function(e) {

-               var id=e.originalEvent.dataTransfer.getData('id');
-               var ll=r.map.mouseEventToLatLng(e.originalEvent);
-               // *** ^^^ this is slightly off - we need to work out the latLng of the tip
+               var oe=e.originalEvent;
+               var id=oe.dataTransfer.getData('id');
+               var pt=L.DomEvent.getMousePosition(oe,map.getContainer());      // co-ordinates of the mouse pointer at present
+               pt.x+=Number(oe.dataTransfer.getData('offsetX'));
+               pt.y+=Number(oe.dataTransfer.getData('offsetY'));
+               var ll=map.containerPointToLatLng(pt);

                r.createMarker(ll,id);
                r.setNumericInput(ll,id);
                r.requestRoute(true, false);
                r.createMarker(ll,id);
                r.setNumericInput(ll,id);
                r.requestRoute(true, false);


@@ -145,10 +147,11 @@ OSM.Routing=function(map,name,jqSearch) {
        };
        // Marker has been dragged
        r.markerDragged=function(e) {
        };
        // Marker has been dragged
        r.markerDragged=function(e) {

-               if (e.type=='drag' && !r.chosenEngine.draggable) return;
-               if (e.type=='drag' && r.awaitingRoute) return;
+               r.dragging=(e.type=='drag');    // true for drag, false for dragend
+               if (r.dragging && !r.chosenEngine.draggable) return;
+               if (r.dragging && r.awaitingRoute) return;

                r.setNumericInput(e.target.getLatLng(), e.target.options.name);
                r.setNumericInput(e.target.getLatLng(), e.target.options.name);

-               r.requestRoute(e.type=='dragend', false);
+               r.requestRoute(!r.dragging, false);

        };
        // Set a route input field to a numeric value
        r.setNumericInput=function(ll,id) {
        };
        // Set a route input field to a numeric value
        r.setNumericInput=function(ll,id) {


@@ -161,6 +164,7 @@ OSM.Routing=function(map,name,jqSearch) {
 
        r.requestRoute=function(isFinal, updateZoom) {
                if (r.route_from && r.route_to) {
 
        r.requestRoute=function(isFinal, updateZoom) {
                if (r.route_from && r.route_to) {

+                       $(".query_wrapper.routing .spinner").show();

                        r.awaitingRoute=true;
                        r.chosenEngine.getRoute(isFinal,[r.route_from,r.route_to]);
                        if(updateZoom){
                        r.awaitingRoute=true;
                        r.chosenEngine.getRoute(isFinal,[r.route_from,r.route_to]);
                        if(updateZoom){


@@ -190,7 +194,10 @@ OSM.Routing=function(map,name,jqSearch) {
                $('#sidebar_content').empty();
                var html=('<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;">' +
                          '<span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') + 
                $('#sidebar_content').empty();
                var html=('<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;">' +
                          '<span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') + 

-                         '</h2><table id="turnbyturn" />').replace(/~/g,"'");
+                         '</h2><p id="routing_summary">' + 
+                         I18n.t('javascripts.directions.distance') + ': ' + r.formatDistance(data.distance)+ '. ' +
+                         I18n.t('javascripts.directions.time'    ) + ': ' + r.formatTime(data.time) + '.</p>' +
+                         '<table id="turnbyturn" />').replace(/~/g,"'");

                $('#sidebar_content').html(html);
                // Add each row
                var cumulative=0;
                $('#sidebar_content').html(html);
                // Add each row
                var cumulative=0;


@@ -220,6 +227,15 @@ OSM.Routing=function(map,name,jqSearch) {
        r.clickTurn=function(num,latlng) {
                r.popup=L.popup().setLatLng(latlng).setContent("<p>"+(num+1)+"</p>").openOn(r.map);
        };
        r.clickTurn=function(num,latlng) {
                r.popup=L.popup().setLatLng(latlng).setContent("<p>"+(num+1)+"</p>").openOn(r.map);
        };

+       r.formatDistance=function(m) {
+               if      (m < 1000 ) { return Math.round(m) + "m"; }
+               else if (m < 10000) { return (m/1000.0).toFixed(1) + "km"; }
+               else                { return Math.round(m / 1000)  + "km"; }
+       };
+       r.formatTime=function(s) {
+               var d=new Date(s*1000); var h=d.getHours(); var m=d.getMinutes();
+               return h+":"+(m<10 ? '0' : '')+m;
+       };

 
        // Close all routing UI
        
 
        // Close all routing UI
        


@@ -237,7 +253,7 @@ OSM.Routing=function(map,name,jqSearch) {
 
        // Add all engines
        var list=OSM.RoutingEngines.list;
 
        // Add all engines
        var list=OSM.RoutingEngines.list;

-       list.sort(function(a,b) { return a.name>b.name; });
+       list.sort(function(a,b) { return I18n.t(a.name)>I18n.t(b.name); });

        var select=r.jqSearch.find('select.routing_engines');
        for (var i=0; i<list.length; i++) {
                // Set up JSONP callback
        var select=r.jqSearch.find('select.routing_engines');
        for (var i=0; i<list.length; i++) {
                // Set up JSONP callback


@@ -247,7 +263,21 @@ OSM.Routing=function(map,name,jqSearch) {
                                script.src = url+r.name+".gotRoute"+num;
                                document.body.appendChild(script); 
                        };
                                script.src = url+r.name+".gotRoute"+num;
                                document.body.appendChild(script); 
                        };

-                       r['gotRoute'+num]=function(data) { r.awaitingRoute=false; list[num].gotRoute(r,data); };
+                       list[num].requestCORS=function(url) {
+                               $.ajax({ url: url, method: "GET", data: {}, dataType: 'json', success: r['gotRoute'+num] });
+                       };
+                       r['gotRoute'+num]=function(data) { 
+                               r.awaitingRoute=false;
+                               $(".query_wrapper.routing .spinner").hide();
+                               if (!list[num].gotRoute(r,data)) {
+                                       // No route found
+                                       if (r.polyline) {
+                                               map.removeLayer(r.polyline);
+                                               r.polyline=null;
+                                       }
+                                       if (!r.dragging) { alert(I18n.t('javascripts.directions.errors.no_route')); }
+                               }
+                       };

                }
                select.append("<option value='"+i+"'>"+I18n.t(list[i].name)+"</option>");
        }
                }
                select.append("<option value='"+i+"'>"+I18n.t(list[i].name)+"</option>");
        }