Merge pull request #11 from danstowell/jsrouting-pulldownchange

[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 7f18aa472d612f12d37b56240c5c80f3b57c70b9..fbec3e7e3ada6e072eea4fd87ffdd670782dd837 100644 (file)
--- a/app/assets/javascripts/routing.js.erb
+++ b/app/assets/javascripts/routing.js.erb
@@ -6,34 +6,15 @@
        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=["",
-       "Continue on ",                         // 1
-       "Slight right onto ",           // 2
-       "Turn right onto ",                     // 3
-       "Sharp right onto ",            // 4
-       "U-turn along ",                        // 5
-       "Sharp left onto ",                     // 6
-       "Turn left onto ",                      // 7
-       "Slight left onto ",            // 8
-       "(via point) ",                         // 9
-       "Follow ",                                      // 10
-       "At roundabout take ",          // 11
-       "Leave roundabout - ",          // 12
-       "Stay on roundabout - ",        // 13
-       "Start at end of ",                     // 14
-       "Reach destination",            // 15
-       "Go against one-way on ",       // 16
-       "End of one-way on "]           // 17
+var TURN_INSTRUCTIONS=[]
 
 var ROUTING_POLYLINE={
        color: '#03f',
@@ -50,6 +31,25 @@ OSM.RoutingEngines={
 OSM.Routing=function(map,name,jqSearch) {
        var r={};
 
+    TURN_INSTRUCTIONS=["",
+       I18n.t('javascripts.directions.instructions.continue_on'),                              // 1
+       I18n.t('javascripts.directions.instructions.slight_right'),             // 2
+       I18n.t('javascripts.directions.instructions.turn_right'),                       // 3
+       I18n.t('javascripts.directions.instructions.sharp_right'),              // 4
+       I18n.t('javascripts.directions.instructions.uturn'),                    // 5
+       I18n.t('javascripts.directions.instructions.sharp_left'),                       // 6
+       I18n.t('javascripts.directions.instructions.turn_left'),                        // 7
+       I18n.t('javascripts.directions.instructions.slight_left'),              // 8
+       I18n.t('javascripts.directions.instructions.via_point'),                                // 9
+       I18n.t('javascripts.directions.instructions.follow'),                                   // 10
+       I18n.t('javascripts.directions.instructions.roundabout'),               // 11
+       I18n.t('javascripts.directions.instructions.leave_roundabout'),         // 12
+       I18n.t('javascripts.directions.instructions.stay_roundabout'),  // 13
+       I18n.t('javascripts.directions.instructions.start'),                    // 14
+       I18n.t('javascripts.directions.instructions.destination'),              // 15
+       I18n.t('javascripts.directions.instructions.against_oneway'),   // 16
+       I18n.t('javascripts.directions.instructions.end_oneway')]               // 17
+
        r.map=map;                              // Leaflet map
        r.name=name;                    // global variable name of this instance (needed for JSONP)
        r.jqSearch=jqSearch;    // JQuery object for search panel
@@ -186,7 +186,7 @@ OSM.Routing=function(map,name,jqSearch) {
                // Create base table
                $("#content").removeClass("overlay-sidebar");
                $('#sidebar_content').empty();
-               var html='<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;"><span class="icon close"></span></a>Directions</h2>'.replace(/~/g,"'");
+               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>'.replace(/~/g,"'");
                html+="<table id='turnbyturn' />";
                $('#sidebar_content').html(html);
                // Add each row
@@ -211,6 +211,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);
@@ -220,9 +222,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; }
                }
        };
 
@@ -242,7 +246,7 @@ OSM.Routing=function(map,name,jqSearch) {
                        };
                        r['gotRoute'+num]=function(data) { r.awaitingRoute=false; list[num].gotRoute(r,data); };
                }
-               select.append("<option value='"+i+"'>"+list[i].name+"</option>");
+               select.append("<option value='"+i+"'>"+I18n.t(list[i].name)+"</option>");
        }
        r.engines=list;
        r.chosenEngine=list[0]; // default to first engine
@@ -250,6 +254,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);
+               }
        };
        // Choose an engine by name
        r.chooseEngine=function(name) {