Merge branch 'overpass'

[rails.git] / app / assets / javascripts / index / query.js

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 30a05419c05e2a30dddc5e56490a85da886471b3..d0e9cc299e999058d9c4743aea95cba74f9adc36 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -4,7 +4,7 @@ OSM.Query = function(map) {
   var protocol = document.location.protocol === "https:" ? "https:" : "http:",
     url = protocol + OSM.OVERPASS_URL,
     queryButton = $(".control-query .control-button"),
-    uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],
+    uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid', 'KSJ2:curve_id', 'KSJ2:lat', 'KSJ2:lon', 'KSJ2:coordinate', 'KSJ2:filename', 'note:ja'],
     marker;
 
   var featureStyle = {
@@ -317,11 +317,12 @@ OSM.Query = function(map) {
     }
 
     queryOverpass(params.lat, params.lon);
-    enableQueryMode();
   };
 
-  page.unload = function() {
-    disableQueryMode();
+  page.unload = function(sameController) {
+    if (!sameController) {
+      disableQueryMode();
+    }
   };
 
   return page;