Merge remote-tracking branch 'upstream/pull/1693'

diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js
index 94f9bb1f018f05ca6894cede85f4cdab7b76bfee..ee195af416f92a929f1a12fee60324a73ff3d6a6 100644 (file)
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@ -32,6 +32,8 @@ OSM.Directions = function (map) {
   function Endpoint(input, iconUrl) {
     var endpoint = {};
 
+    endpoint.input = input;
+
     endpoint.marker = L.marker([0, 0], {
       icon: L.icon({
         iconUrl: iconUrl,
@@ -111,6 +113,20 @@ OSM.Directions = function (map) {
     return endpoint;
   }
 
+  $(".directions_form .reverse_directions").on("click", function() {
+    var input_from = endpoints[0].input.val();
+    var input_to = endpoints[1].input.val();
+    var latlng_from = endpoints[0].latlng;
+    var latlng_to = endpoints[1].latlng;
+
+    endpoints[0].setLatLng(latlng_to);
+    endpoints[1].setLatLng(latlng_from);
+    endpoints[0].input.val(input_to);
+    endpoints[1].input.val(input_from);
+
+    getRoute();
+  });
+
   $(".directions_form .close").on("click", function(e) {
     e.preventDefault();
     var route_from = endpoints[0].value;

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 00e970e3038f49515076a49fabad3142a0c30e03..6df4c14acaa914b028f05104958d12a290e6611e 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1002,6 +1002,11 @@ header .search_forms,
       vertical-align: middle;
     }
   }
+
+  a.reverse_directions {
+    cursor: pointer;
+    margin: 0px 0px 5px 25px;
+  }
 }
 
 /* Rules for the map key which appears in the popout sidebar */

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 2637d28b25d45d3d771d322e208ff447928d8bf2..98b3c6c542188b0e4b4ff081858797196b7bb094 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -23,6 +23,9 @@
       <select class="routing_engines" name="routing_engines"></select>
       <%= submit_tag t('site.search.submit_text'), :class => "routing_go", :data => { disable_with: false } %>
     </div>
+    <div class="line">
+      <a class="reverse_directions"><%= t('site.search.reverse_directions_text') %></a>
+    </div>
 
     <div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>
   </form>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 000e4c43510e68ceaeba8fed1b191fa615f11cf5..036f8de35d6aab5c1aa5d292496a8558aeba4028 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1483,6 +1483,7 @@ en:
       where_am_i: "Where is this?"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
+      reverse_directions_text: "Reverse Directions"
     key:
       table:
         entry: