Look for locale specific names

[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 cabb93f50148f1b0d844e5077cd59bae84601909..12bb49efc97a4964ed45067918eeb42a75187228 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 = {
@@ -22,9 +22,7 @@ OSM.Query = function(map) {
     if (queryButton.hasClass("disabled")) return;
 
     if (queryButton.hasClass("active")) {
-      if ($("#content").hasClass("overlay-sidebar")) {
-        disableQueryMode();
-      }
+      disableQueryMode();
     } else {
       enableQueryMode();
     }
@@ -85,7 +83,7 @@ OSM.Query = function(map) {
     var tags = feature.tags;
     var prefix = "";
 
-    if (tags.boundary === "administrative") {
+    if (tags.boundary === "administrative" && tags.admin_level) {
       prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level)
     } else {
       var prefixes = I18n.t("geocoder.search_osm_nominatim.prefix");
@@ -114,7 +112,14 @@ OSM.Query = function(map) {
   }
 
   function featureName(feature) {
-    var tags = feature.tags;
+    var tags = feature.tags,
+      locales = I18n.locales.get();
+
+    for (var i = 0; i < locales.length; i++) {
+      if (tags["name:" + locales[i]]) {
+        return tags["name:" + locales[i]];
+      }
+    }
 
     if (tags["name"]) {
       return tags["name"];
@@ -319,11 +324,12 @@ OSM.Query = function(map) {
     }
 
     queryOverpass(params.lat, params.lon);
-    enableQueryMode();
   };
 
-  page.unload = function() {
-    disableQueryMode();
+  page.unload = function(sameController) {
+    if (!sameController) {
+      disableQueryMode();
+    }
   };
 
   return page;