From: Tom Hughes <tom@compton.nu>
Date: Wed, 17 May 2017 19:37:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1521'
X-Git-Tag: live~4852
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6e5240e1987a429e29d230e811af9176772a8228?hp=2e8c0d471fbefa97d1dd4fb5c5749280a4187f88

Merge remote-tracking branch 'openstreetmap/pull/1521'
---

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 11601c5b2..bb835f2fb 100644
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -26,6 +26,9 @@ OSM.Directions = function (map) {
     Endpoint($("input[name='route_to']"), OSM.MARKER_RED)
   ];
 
+  var expiry = new Date();
+  expiry.setYear(expiry.getFullYear() + 10);
+
   function Endpoint(input, iconUrl) {
     var endpoint = {};
 
@@ -292,10 +295,15 @@ OSM.Directions = function (map) {
     select.append("<option value='" + i + "'>" + I18n.t('javascripts.directions.engines.' + engine.id) + "</option>");
   });
 
-  setEngine('osrm_car');
+  var chosenEngineId = $.cookie('_osm_directions_engine');
+  if(!chosenEngineId) {
+    chosenEngineId = 'osrm_car';
+  }
+  setEngine(chosenEngineId);
 
   select.on("change", function (e) {
     chosenEngine = engines[e.target.selectedIndex];
+    $.cookie('_osm_directions_engine', chosenEngine.id, { expires: expiry, path: '/' });
     if (map.hasLayer(polyline)) {
       getRoute();
     }