Merge branch 'master' into 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 5ce9969274f41edbbfef81db065dbfa0d85eb39c..e2c8699ff0ba2a792a8caaeb975901fe3cdd3f0c 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,7 +1,9 @@
 //= require jquery.simulate
 
 OSM.Query = function(map) {
-  var queryButton = $(".control-query .control-button"),
+  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'],
     marker;
 
@@ -20,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();
     }
@@ -51,10 +53,20 @@ OSM.Query = function(map) {
       if (geometry) map.removeLayer(geometry);
       $(this).removeClass("selected");
     })
-    .on("click", ".query-results li.query-result", function (e) {
-      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) {
@@ -163,7 +175,7 @@ OSM.Query = function(map) {
     }
 
     $section.data("ajax", $.ajax({
-      url: OSM.OVERPASS_URL,
+      url: url,
       method: "POST",
       data: {
         data: "[timeout:5][out:json];" + query,
@@ -198,16 +210,48 @@ OSM.Query = function(map) {
             .text(I18n.t("javascripts.query.nothing_found"))
             .appendTo($ul);
         }
+      },
+      error: function(xhr, status, error) {
+        $section.find(".loader").stopTime("loading").hide();
+
+        $("<li>")
+          .text(I18n.t("javascripts.query." + status, { server: url, error: error }))
+          .appendTo($ul);
       }
     }));
   }
 
+  /*
+   * 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:
+   *
+   *   is_in(<lat>,<lng>)->.a
+   *
+   * and then return the union of the following sets:
+   *
+   *   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.
+   */
   function queryOverpass(lat, lng) {
     var latlng = L.latLng(lat, lng),
       radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
       around = "around:" + radius + "," + lat + "," + lng,
-      features = "(node(" + around + ");way(" + around + ");relation(" + around + "))",
-      nearby = "((" + features + ";way(bn));node(w));out;",
+      nodes = "node(" + around + ")",
+      ways = "way(" + around + ");node(w)",
+      relations = "relation(" + around + ")",
+      nearby = "(" + nodes + ";" + ways + ";" + relations + ");out;",
       isin = "is_in(" + lat + "," + lng + ")->.a;(relation(pivot.a);way(pivot.a);node(w));out;";
 
     $("#sidebar_content .query-intro")
@@ -256,17 +300,23 @@ OSM.Query = function(map) {
 
   page.pushstate = page.popstate = function(path) {
     OSM.loadSidebarContent(path, function () {
-      page.load(path);
+      page.load(path, true);
     });
   };
 
-  page.load = function(path) {
-    var params = querystring.parse(path.substring(path.indexOf('?') + 1));
+  page.load = function(path, noCentre) {
+    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))) {
+      OSM.router.withoutMoveListener(function () {
+        map.setView(latlng, 15);
+      });
+    }
 
     queryOverpass(params.lat, params.lon);
     enableQueryMode();
-
-    return map.getState();
   };
 
   page.unload = function() {