Change default directions engine to fossgis_osrm_car

[rails.git] / app / assets / javascripts / index / directions.js

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 1ad7f9cb70c986a4d6e86ffe1a4d42746075758a..bdba41ec25c2aca44f7c439a639abda38f036d27 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -40,7 +40,8 @@ OSM.Directions = function (map) {
         shadowUrl: OSM.MARKER_SHADOW,
         shadowSize: [41, 41]
       }),
         shadowUrl: OSM.MARKER_SHADOW,
         shadowSize: [41, 41]
       }),

-      draggable: true
+      draggable: true,
+      autoPan: true

     });
 
     endpoint.marker.on('drag dragend', function (e) {
     });
 
     endpoint.marker.on('drag dragend', function (e) {


@@ -53,7 +54,13 @@ OSM.Directions = function (map) {
       }
     });
 
       }
     });
 

+    input.on("keydown", function() {
+      input.removeClass("error");
+    });
+

     input.on("change", function (e) {
     input.on("change", function (e) {

+      awaitingGeocode = true;
+      

       // make text the same in both text boxes
       var value = e.target.value;
       endpoint.setValue(value);
       // make text the same in both text boxes
       var value = e.target.value;
       endpoint.setValue(value);


@@ -62,6 +69,7 @@ OSM.Directions = function (map) {
     endpoint.setValue = function(value, latlng) {
       endpoint.value = value;
       delete endpoint.latlng;
     endpoint.setValue = function(value, latlng) {
       endpoint.value = value;
       delete endpoint.latlng;

+      input.removeClass("error");

       input.val(value);
 
       if (latlng) {
       input.val(value);
 
       if (latlng) {


@@ -84,16 +92,14 @@ OSM.Directions = function (map) {
         endpoint.awaitingGeocode = false;
         endpoint.hasGeocode = true;
         if (json.length === 0) {
         endpoint.awaitingGeocode = false;
         endpoint.hasGeocode = true;
         if (json.length === 0) {

-          alert(I18n.t('javascripts.directions.errors.no_place'));
+          input.addClass("error");
+          alert(I18n.t('javascripts.directions.errors.no_place', {place: endpoint.value}));

           return;
         }
 
           return;
         }
 

-        input.val(json[0].display_name);
+        endpoint.setLatLng(L.latLng(json[0]));

 
 

-        endpoint.latlng = L.latLng(json[0]);
-        endpoint.marker
-          .setLatLng(endpoint.latlng)
-          .addTo(map);
+        input.val(json[0].display_name);

 
         if (awaitingGeocode) {
           awaitingGeocode = false;
 
         if (awaitingGeocode) {
           awaitingGeocode = false;


@@ -153,15 +159,17 @@ OSM.Directions = function (map) {
     return h + ":" + (m < 10 ? '0' : '') + m;
   }
 
     return h + ":" + (m < 10 ? '0' : '') + m;
   }
 

-  function setEngine(id) {
-    engines.forEach(function(engine, i) {
-      if (engine.id === id) {
-        chosenEngine = engine;
-        select.val(i);
-      }
+  function findEngine(id) {
+    return engines.findIndex(function(engine) {
+      return engine.id === id;

     });
   }
 
     });
   }
 

+  function setEngine(index) {
+    chosenEngine = engines[index];
+    select.val(index);
+  }
+

   function getRoute(fitRoute, reportErrors) {
     // Cancel any route that is already in progress
     if (awaitingRoute) awaitingRoute.abort();
   function getRoute(fitRoute, reportErrors) {
     // Cancel any route that is already in progress
     if (awaitingRoute) awaitingRoute.abort();


@@ -310,11 +318,11 @@ OSM.Directions = function (map) {
     select.append("<option value='" + i + "'>" + I18n.t('javascripts.directions.engines.' + engine.id) + "</option>");
   });
 
     select.append("<option value='" + i + "'>" + I18n.t('javascripts.directions.engines.' + engine.id) + "</option>");
   });
 

-  var chosenEngineId = $.cookie('_osm_directions_engine');
-  if(!chosenEngineId) {
-    chosenEngineId = 'osrm_car';
+  var chosenEngineIndex = findEngine('fossgis_osrm_car');
+  if ($.cookie('_osm_directions_engine')) {
+    chosenEngineIndex = findEngine($.cookie('_osm_directions_engine'));

   }
   }

-  setEngine(chosenEngineId);
+  setEngine(chosenEngineIndex);

 
   select.on("change", function (e) {
     chosenEngine = engines[e.target.selectedIndex];
 
   select.on("change", function (e) {
     chosenEngine = engines[e.target.selectedIndex];


@@ -368,7 +376,11 @@ OSM.Directions = function (map) {
         to = route[1] && L.latLng(route[1].split(','));
 
     if (params.engine) {
         to = route[1] && L.latLng(route[1].split(','));
 
     if (params.engine) {

-      setEngine(params.engine);
+      var engineIndex = findEngine(params.engine);
+
+      if (engineIndex >= 0) {
+        setEngine(engineIndex);
+      }

     }
 
     endpoints[0].setValue(params.from || "", from);
     }
 
     endpoints[0].setValue(params.from || "", from);