From 902f1b088743b1983ef5bbb2ac7a3c8f2fadbdf1 Mon Sep 17 00:00:00 2001
From: Richard Fairhurst <richard@systemeD.net>
Date: Sat, 8 Mar 2014 11:14:48 +0000
Subject: [PATCH] Add spinner while awaiting route

---
 app/assets/images/searching-small.gif | Bin 0 -> 1849 bytes
 app/assets/javascripts/routing.js.erb |   8 +++++---
 app/views/layouts/_search.html.erb    |   1 +
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/images/searching-small.gif

diff --git a/app/assets/images/searching-small.gif b/app/assets/images/searching-small.gif
new file mode 100644
index 0000000000000000000000000000000000000000..06dbc2bc21dddcf0e09b566d5b211aee89570f52
GIT binary patch
literal 1849
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

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/routing.js.erb b/app/assets/javascripts/routing.js.erb
index fb03e5bec..af9ce4fbf 100644
--- 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
 */
 
@@ -161,6 +159,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){
@@ -247,7 +246,10 @@ 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; list[num].gotRoute(r,data);
+				$(".query_wrapper.routing .spinner").hide();
+			};
 		}
 		select.append("<option value='"+i+"'>"+I18n.t(list[i].name)+"</option>");
 	}
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index e9aa76f5a..839b3dcec 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -20,6 +20,7 @@
     <%= image_tag "marker-red.png"  , :class => 'routing_marker', :id => 'marker_to'  , :draggable => 'true' %>
     <%= text_field_tag "route_to"  , params[:to]  , :placeholder => t('site.search.to')  , :onchange=>"OSM.routing.geocode('route_to'  ,event)" %>
     <select class='routing_engines' name='routing_engines' onchange="OSM.routing.selectEngine(event)"></select>
+    <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
   </div>
 
 <% end %>
-- 
2.43.2