Remove some repeated-query funkiness

diff --git a/app/assets/javascripts/routing.js.erb b/app/assets/javascripts/routing.js.erb
index 26d2a8b394053dfb6bea023658ad49d44657e172..b6bf9f4a0cac80fa3f0070f71155d2c1e6802715 100644 (file)
--- a/app/assets/javascripts/routing.js.erb
+++ b/app/assets/javascripts/routing.js.erb
@@ -218,9 +218,11 @@ OSM.Routing=function(map,name,jqSearch) {
        
        r.close=function() {
                $("#content").addClass("overlay-sidebar");
        
        r.close=function() {
                $("#content").addClass("overlay-sidebar");

-               var remove=[r.polyline,r.popup,r.marker_from,r.marker_to];
+               r.route_from=r.route_to=null;
+               $(".query_wrapper.routing input").val("");
+               var remove=['polyline','popup','marker_from','marker_to'];

                for (var i=0; i<remove.length; i++) {
                for (var i=0; i<remove.length; i++) {

-                       if (remove[i]) map.removeLayer(remove[i]);
+                       if (r[remove[i]]) { map.removeLayer(r[remove[i]]); r[remove[i]]=null; }

                }
        };
 
                }
        };