X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8dfad83a635a5c1cc48c234a8d8683cf978a8bd2..e78ab8d0d64e182c8c1d400b3064673e74330490:/app/assets/javascripts/index/query.js

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 0edc265dc..30a05419c 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -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();
     }
@@ -53,22 +51,24 @@ OSM.Query = function(map) {
       if (geometry) map.removeLayer(geometry);
       $(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);
-      }
+    .on("mousedown", ".query-results li.query-result", function (e) {
+      var moved = false;
+      $(this).one("click", function (e) {
+        if (!moved) {
+          var geometry = $(this).data("geometry")
+          if (geometry) map.removeLayer(geometry);
+
+          if (!$(e.target).is('a')) {
+            $(this).find("a").simulate("click", e);
+          }
+        }
+      }).one("mousemove", function () {
+        moved = true;
+      });
     });
 
   function interestingFeature(feature, origin, radius) {
     if (feature.tags) {
-      if (feature.type === "node" &&
-          OSM.distance(origin, L.latLng(feature.lat, feature.lon)) > radius) {
-        return false;
-      }
-
       for (var key in feature.tags) {
         if (uninterestingTags.indexOf(key) < 0) {
           return true;
@@ -127,33 +127,27 @@ OSM.Query = function(map) {
     }
   }
 
-  function featureGeometry(feature, features) {
+  function featureGeometry(feature) {
     var geometry;
 
-    if (feature.type === "node") {
+    if (feature.type === "node" && feature.lat && feature.lon) {
       geometry = L.circleMarker([feature.lat, feature.lon], featureStyle);
-    } else if (feature.type === "way") {
-      geometry = L.polyline(feature.nodes.map(function (node) {
-        return features["node" + node].getLatLng();
+    } else if (feature.type === "way" && feature.geometry) {
+      geometry = L.polyline(feature.geometry.filter(function (point) {
+        return point !== null;
+      }).map(function (point) {
+        return [point.lat, point.lon];
       }), featureStyle);
-    } else if (feature.type === "relation") {
-      geometry = L.featureGroup();
-
-      feature.members.forEach(function (member) {
-        if (features[member.type + member.ref]) {
-          geometry.addLayer(features[member.type + member.ref]);
-        }
-      });
-    }
-
-    if (geometry) {
-      features[feature.type + feature.id] = geometry;
+    } else if (feature.type === "relation" && feature.members) {
+      geometry = L.featureGroup(feature.members.map(featureGeometry).filter(function (geometry) {
+        return geometry !== undefined;
+      }));
     }
 
     return geometry;
   }
 
-  function runQuery(latlng, radius, query, $section) {
+  function runQuery(latlng, radius, query, $section, compare) {
     var $ul = $section.find("ul");
 
     $ul.empty();
@@ -174,18 +168,23 @@ OSM.Query = function(map) {
         data: "[timeout:5][out:json];" + query,
       },
       success: function(results) {
-        var features = {};
+        var elements;
 
         $section.find(".loader").stopTime("loading").hide();
 
-        for (var i = 0; i < results.elements.length; i++) {
-          var element = results.elements[i],
-            geometry = featureGeometry(element, features);
+        if (compare) {
+          elements = results.elements.sort(compare);
+        } else {
+          elements = results.elements;
+        }
+
+        for (var i = 0; i < elements.length; i++) {
+          var element = elements[i];
 
           if (interestingFeature(element, latlng, radius)) {
             var $li = $("<li>")
               .addClass("query-result")
-              .data("geometry", geometry)
+              .data("geometry", featureGeometry(element))
               .appendTo($ul);
             var $p = $("<p>")
               .text(featurePrefix(element) + " ")
@@ -214,13 +213,23 @@ OSM.Query = function(map) {
     }));
   }
 
+  function compareSize(feature1, feature2) {
+    var width1 = feature1.bounds.maxlon - feature1.bounds.minlon,
+      height1 = feature1.bounds.maxlat - feature1.bounds.minlat,
+      area1 = width1 * height1,
+      width2 = feature2.bounds.maxlat - feature2.bounds.minlat,
+      height2 = feature2.bounds.maxlat - feature2.bounds.minlat,
+      area2 = width2 * height2;
+
+    return area1 - area2;
+  }
+
   /*
    * To find nearby objects we ask overpass for the union of the
    * following sets:
    *
    *   node(around:<radius>,<lat>,lng>)
    *   way(around:<radius>,<lat>,lng>)
-   *   node(w)
    *   relation(around:<radius>,<lat>,lng>)
    *
    * to find enclosing objects we first find all the enclosing areas:
@@ -231,21 +240,21 @@ OSM.Query = function(map) {
    *
    *   relation(pivot.a)
    *   way(pivot.a)
-   *   node(w)
    *
-   * In order to avoid overly large responses we don't currently
-   * attempt to complete any relations and instead just show those
-   * ways and nodes which are returned for other reasons.
+   * In both cases we then ask to retrieve tags and the geometry
+   * for each object.
    */
   function queryOverpass(lat, lng) {
     var latlng = L.latLng(lat, lng),
+      bounds = map.getBounds(),
+      bbox = bounds.getSouth() + "," + bounds.getWest() + "," + bounds.getNorth() + "," + bounds.getEast(),
       radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
       around = "around:" + radius + "," + lat + "," + lng,
       nodes = "node(" + around + ")",
-      ways = "way(" + around + ");node(w)",
+      ways = "way(" + around + ")",
       relations = "relation(" + around + ")",
-      nearby = "(" + nodes + ";" + ways + ";" + relations + ");out;",
-      isin = "is_in(" + lat + "," + lng + ")->.a;(relation(pivot.a);way(pivot.a);node(w));out;";
+      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;";
 
     $("#sidebar_content .query-intro")
       .hide();
@@ -265,7 +274,7 @@ OSM.Query = function(map) {
     }, 10);
 
     runQuery(latlng, radius, nearby, $("#query-nearby"));
-    runQuery(latlng, radius, isin, $("#query-isin"));
+    runQuery(latlng, radius, isin, $("#query-isin"), compareSize);
   }
 
   function clickHandler(e) {
@@ -301,8 +310,7 @@ OSM.Query = function(map) {
     var params = querystring.parse(path.substring(path.indexOf('?') + 1)),
       latlng = L.latLng(params.lat, params.lon);
 
-    if (!window.location.hash &&
-        (!noCentre || !map.getBounds().contains(latlng))) {
+    if (!window.location.hash && !noCentre && !map.getBounds().contains(latlng)) {
       OSM.router.withoutMoveListener(function () {
         map.setView(latlng, 15);
       });