X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4abb666ef02dcacc590d7b104836c2f512dbed21..f1faffd4d1954f855f6450fc8e5c62ea5f457113:/app/assets/javascripts/index/query.js

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 1f45a6872..7ac613d71 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -12,7 +12,7 @@ OSM.Query = function(map) {
     weight: 4,
     opacity: 1,
     fillOpacity: 0.5,
-    clickable: false
+    interactive: false
   };
 
   queryButton.on("click", function (e) {
@@ -24,13 +24,13 @@ OSM.Query = function(map) {
     } else if (!queryButton.hasClass("disabled")) {
       enableQueryMode();
     }
-  }).on("disabled", function (e) {
+  }).on("disabled", function () {
     if (queryButton.hasClass("active")) {
       map.off("click", clickHandler);
       $(map.getContainer()).removeClass("query-active").addClass("query-disabled");
       $(this).tooltip("show");
     }
-  }).on("enabled", function (e) {
+  }).on("enabled", function () {
     if (queryButton.hasClass("active")) {
       map.on("click", clickHandler);
       $(map.getContainer()).removeClass("query-disabled").addClass("query-active");
@@ -40,20 +40,20 @@ OSM.Query = function(map) {
 
   $("#sidebar_content")
     .on("mouseover", ".query-results li.query-result", function () {
-      var geometry = $(this).data("geometry")
+      var geometry = $(this).data("geometry");
       if (geometry) map.addLayer(geometry);
       $(this).addClass("selected");
     })
     .on("mouseout", ".query-results li.query-result", function () {
-      var geometry = $(this).data("geometry")
+      var geometry = $(this).data("geometry");
       if (geometry) map.removeLayer(geometry);
       $(this).removeClass("selected");
     })
-    .on("mousedown", ".query-results li.query-result", function (e) {
+    .on("mousedown", ".query-results li.query-result", function () {
       var moved = false;
       $(this).one("click", function (e) {
         if (!moved) {
-          var geometry = $(this).data("geometry")
+          var geometry = $(this).data("geometry");
           if (geometry) map.removeLayer(geometry);
 
           if (!$(e.target).is('a')) {
@@ -65,7 +65,7 @@ OSM.Query = function(map) {
       });
     });
 
-  function interestingFeature(feature, origin, radius) {
+  function interestingFeature(feature) {
     if (feature.tags) {
       for (var key in feature.tags) {
         if (uninterestingTags.indexOf(key) < 0) {
@@ -82,27 +82,33 @@ OSM.Query = function(map) {
     var prefix = "";
 
     if (tags.boundary === "administrative" && tags.admin_level) {
-      prefix =
-      I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level, {
+      prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level, {
         defaultValue: I18n.t("geocoder.search_osm_nominatim.prefix.boundary.administrative")
-      })
+      });
     } else {
       var prefixes = I18n.t("geocoder.search_osm_nominatim.prefix");
+      var key, value;
 
-      for (var key in tags) {
-        var value = tags[key];
+      for (key in tags) {
+        value = tags[key];
 
         if (prefixes[key]) {
           if (prefixes[key][value]) {
             return prefixes[key][value];
-          } else {
-            var first = value.substr(0, 1).toUpperCase(),
-              rest = value.substr(1).replace(/_/g, " ");
-
-            return first + rest;
           }
         }
       }
+
+      for (key in tags) {
+        value = tags[key];
+
+        if (prefixes[key]) {
+          var first = value.substr(0, 1).toUpperCase(),
+            rest = value.substr(1).replace(/_/g, " ");
+
+          return first + rest;
+        }
+      }
     }
 
     if (!prefix) {
@@ -122,10 +128,10 @@ OSM.Query = function(map) {
       }
     }
 
-    if (tags["name"]) {
-      return tags["name"];
-    } else if (tags["ref"]) {
-      return tags["ref"];
+    if (tags.name) {
+      return tags.name;
+    } else if (tags.ref) {
+      return tags.ref;
     } else if (tags["addr:housename"]) {
       return tags["addr:housename"];
     } else if (tags["addr:housenumber"] && tags["addr:street"]) {
@@ -140,7 +146,7 @@ OSM.Query = function(map) {
 
     if (feature.type === "node" && feature.lat && feature.lon) {
       geometry = L.circleMarker([feature.lat, feature.lon], featureStyle);
-    } else if (feature.type === "way" && feature.geometry) {
+    } else if (feature.type === "way" && feature.geometry && feature.geometry.length > 0) {
       geometry = L.polyline(feature.geometry.filter(function (point) {
         return point !== null;
       }).map(function (point) {
@@ -155,7 +161,7 @@ OSM.Query = function(map) {
     return geometry;
   }
 
-  function runQuery(latlng, radius, query, $section, compare) {
+  function runQuery(latlng, radius, query, $section, merge, compare) {
     var $ul = $section.find("ul");
 
     $ul.empty();
@@ -173,23 +179,38 @@ OSM.Query = function(map) {
       url: url,
       method: "POST",
       data: {
-        data: "[timeout:5][out:json];" + query,
+        data: "[timeout:10][out:json];" + query,
       },
       success: function(results) {
         var elements;
 
         $section.find(".loader").stopTime("loading").hide();
 
-        if (compare) {
-          elements = results.elements.sort(compare);
+        if (merge) {
+          elements = results.elements.reduce(function (hash, element) {
+            var key = element.type + element.id;
+            if ("geometry" in element) {
+              delete element.bounds;
+            }
+            hash[key] = $.extend({}, hash[key], element);
+            return hash;
+          }, {});
+
+          elements = Object.keys(elements).map(function (key) {
+            return elements[key];
+          });
         } else {
           elements = results.elements;
         }
 
+        if (compare) {
+          elements = elements.sort(compare);
+        }
+
         for (var i = 0; i < elements.length; i++) {
           var element = elements[i];
 
-          if (interestingFeature(element, latlng, radius)) {
+          if (interestingFeature(element)) {
             var $li = $("<li>")
               .addClass("query-result")
               .data("geometry", featureGeometry(element))
@@ -205,7 +226,13 @@ OSM.Query = function(map) {
           }
         }
 
-        if ($ul.find("li").length == 0) {
+        if (results.remark) {
+          $("<li>")
+            .text(I18n.t("javascripts.query.error", { server: url, error: results.remark }))
+            .appendTo($ul);
+        }
+
+        if ($ul.find("li").length === 0) {
           $("<li>")
             .text(I18n.t("javascripts.query.nothing_found"))
             .appendTo($ul);
@@ -253,8 +280,8 @@ OSM.Query = function(map) {
    * for each object.
    */
   function queryOverpass(lat, lng) {
-    var latlng = L.latLng(lat, lng),
-      bounds = map.getBounds(),
+    var latlng = L.latLng(lat, lng).wrap(),
+      bounds = map.getBounds().wrap(),
       bbox = bounds.getSouth() + "," + bounds.getWest() + "," + bounds.getNorth() + "," + bounds.getEast(),
       radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
       around = "around:" + radius + "," + lat + "," + lng,
@@ -262,7 +289,7 @@ OSM.Query = function(map) {
       ways = "way(" + around + ")",
       relations = "relation(" + around + ")",
       nearby = "(" + nodes + ";" + ways + ");out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");",
-      isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags geom(" + bbox + ");relation(pivot.a);out tags bb;";
+      isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags bb;out ids geom(" + bbox + ");relation(pivot.a);out tags bb;";
 
     $("#sidebar_content .query-intro")
       .hide();
@@ -271,7 +298,7 @@ OSM.Query = function(map) {
     marker = L.circle(latlng, radius, featureStyle).addTo(map);
 
     $(document).everyTime(75, "fadeQueryMarker", function (i) {
-      if (i == 10) {
+      if (i === 10) {
         map.removeLayer(marker);
       } else {
         marker.setStyle({
@@ -281,14 +308,15 @@ OSM.Query = function(map) {
       }
     }, 10);
 
-    runQuery(latlng, radius, nearby, $("#query-nearby"));
-    runQuery(latlng, radius, isin, $("#query-isin"), compareSize);
+    runQuery(latlng, radius, nearby, $("#query-nearby"), false);
+    runQuery(latlng, radius, isin, $("#query-isin"), true, compareSize);
   }
 
   function clickHandler(e) {
     var precision = OSM.zoomPrecision(map.getZoom()),
-      lat = e.latlng.lat.toFixed(precision),
-      lng = e.latlng.lng.toFixed(precision);
+      latlng = e.latlng.wrap(),
+      lat = latlng.lat.toFixed(precision),
+      lng = latlng.lng.toFixed(precision);
 
     OSM.router.route("/query?lat=" + lat + "&lon=" + lng);
   }