Use generic GraphHopper engine

[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..2a10a9d5e571cd8025ea30e6cfad0160af31bef5 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?)
-       *** spinner when waiting for result (beneath 'Go' button?)
-
        *** 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.dragging=false;               // true if the user is dragging a start/end point
        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) {
-                       alert("Sorry, couldn't find that place.");      // *** internationalise
+                       alert(I18n.t('javascripts.directions.errors.no_place'));
                        r[field.id]=null;
                        return;
                }
@@ -145,10 +144,11 @@ OSM.Routing=function(map,name,jqSearch) {
        };
        // 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.requestRoute(e.type=='dragend', false);
+               r.requestRoute(!r.dragging, false);
        };
        // Set a route input field to a numeric value
        r.setNumericInput=function(ll,id) {
@@ -161,6 +161,7 @@ OSM.Routing=function(map,name,jqSearch) {
 
        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){
@@ -237,7 +238,7 @@ OSM.Routing=function(map,name,jqSearch) {
 
        // 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
@@ -247,7 +248,18 @@ OSM.Routing=function(map,name,jqSearch) {
                                script.src = url+r.name+".gotRoute"+num;
                                document.body.appendChild(script); 
                        };
-                       r['gotRoute'+num]=function(data) { r.awaitingRoute=false; list[num].gotRoute(r,data); };
+                       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>");
        }