From: Richard Fairhurst <richard@systemeD.net>
Date: Tue, 21 Jan 2014 21:15:49 +0000 (+0000)
Subject: Close directions
X-Git-Tag: live~4842^2~62
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fd991a0201c83a639c585de3119c779fda761209

Close directions
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 638be0dca..a3531eb30 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -347,6 +347,8 @@ $(document).ready(function () {
       map.getCenter().lng.toFixed(precision)));
   });
 
+  OSM.routing = OSM.Routing(map,'OSM.routing',$('.query_wrapper.routing'));
+
   $(".get_directions").on("click",function(e) {
 	e.preventDefault();
 	$(".search").hide();
@@ -358,9 +360,8 @@ $(document).ready(function () {
 	e.preventDefault();
 	$(".search").show();
 	$(".routing").hide();
+	OSM.routing.close();
 	$(".query_wrapper.search [name=query]").focus();
   });
 
-  OSM.routing = OSM.Routing(map,'OSM.routing',$('.query_wrapper.routing'));
-
 });
diff --git a/app/assets/javascripts/routing.js.erb b/app/assets/javascripts/routing.js.erb
index ee76fb14f..ed9551252 100644
--- a/app/assets/javascripts/routing.js.erb
+++ b/app/assets/javascripts/routing.js.erb
@@ -10,6 +10,7 @@
 	*** click each part
 	*** translation (including all alerts and presentation)
 	*** export GPX
+	*** URL history (or do we consciously not want to support that?)
 */
 
 var TURN_INSTRUCTIONS=["",
@@ -96,7 +97,7 @@ OSM.Routing=function(map,name,jqSearch) {
 	r.setItinerary=function(steps) {
 		$("#content").removeClass("overlay-sidebar");
 		$('#sidebar_content').empty();
-		var html='<h2><a class="geolink" href="#"><span class="icon close"></span></a>Directions</h2>';
+		var html='<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;"><span class="icon close"></span></a>Directions</h2>'.replace(/~/g,"'");
 		html+="<table>";
 		for (var i=0; i<steps.length; i++) {
 			var step=steps[i];
@@ -124,6 +125,13 @@ OSM.Routing=function(map,name,jqSearch) {
 	};
 
 
+	// Close all routing UI
+	
+	r.close=function() {
+		$("#content").addClass("overlay-sidebar");
+		if (r.polyline) map.removeLayer(r.polyline);
+	};
+
 	// Add engines
 	
 	r.engines=[];