X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/50ea797f33409aecb6061f3f6baceb5c499edb2a..ca07fe853cd743f6d17ebcd02b6e8794e548e2a4:/app/assets/javascripts/index/query.js

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 58750d242..0edc265dc 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -22,9 +22,9 @@ OSM.Query = function(map) {
     if (queryButton.hasClass("disabled")) return;
 
     if (queryButton.hasClass("active")) {
-      disableQueryMode();
-
-      OSM.router.route("/");
+      if ($("#content").hasClass("overlay-sidebar")) {
+        disableQueryMode();
+      }
     } else {
       enableQueryMode();
     }
@@ -54,6 +54,9 @@ OSM.Query = function(map) {
       $(this).removeClass("selected");
     })
     .on("click", ".query-results li.query-result", function (e) {
+      var geometry = $(this).data("geometry")
+      if (geometry) map.removeLayer(geometry);
+
       if (!$(e.target).is('a')) {
         $(this).find("a").simulate("click", e);
       }