Make sure the query location is always in view

[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 b9aa4f4d051c0459095ef3343ad01b0bd1fdca30..d9906407d11ead6a476d1187025d14c874640922 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -122,33 +122,27 @@ OSM.Query = function(map) {
     }
   }
 
-  function featureLink(feature) {
-    if (feature.type === "area") {
-      if (feature.id >= 3600000000) {
-        var id = feature.id - 3600000000;
-
-        return "/browse/relation/" + id;
-      } else if (feature.id >= 2400000000) {
-        var id = feature.id - 2400000000;
-
-        return "/browse/way/" + id;
-      } else {
-        return "/browse/node/" + feature.id;
-      }
-    } else {
-      return "/browse/" + feature.type + "/" + feature.id;
-    }
-  }
-
-  function featureGeometry(feature, nodes) {
+  function featureGeometry(feature, features) {
     var geometry;
 
     if (feature.type === "node") {
       geometry = L.circleMarker([feature.lat, feature.lon], featureStyle);
     } else if (feature.type === "way") {
       geometry = L.polyline(feature.nodes.map(function (node) {
-        return nodes[node];
+        return features["node" + node].getLatLng();
       }), 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;
     }
 
     return geometry;
@@ -164,37 +158,36 @@ OSM.Query = function(map) {
       $(this).show();
     });
 
-    $.ajax({
-      url: "http://overpass-api.de/api/interpreter",
-      method: "GET",
+    if ($section.data("ajax")) {
+      $section.data("ajax").abort();
+    }
+
+    $section.data("ajax", $.ajax({
+      url: OSM.OVERPASS_URL,
+      method: "POST",
       data: {
         data: "[timeout:5][out:json];" + query,
       },
       success: function(results) {
-        var nodes = {};
+        var features = {};
 
         $section.find(".loader").stopTime("loading").hide();
 
-        results.elements.forEach(function (element) {
-          if (element.type === "node") {
-            nodes[element.id] = [element.lat, element.lon];
-          }
-        });
-
         for (var i = 0; i < results.elements.length; i++) {
-          var element = results.elements[i];
+          var element = results.elements[i],
+            geometry = featureGeometry(element, features);
 
           if (interestingFeature(element, latlng, radius)) {
             var $li = $("<li>")
               .addClass("query-result")
-              .data("geometry", featureGeometry(element, nodes))
+              .data("geometry", geometry)
               .appendTo($ul);
             var $p = $("<p>")
               .text(featurePrefix(element) + " ")
               .appendTo($li);
 
             $("<a>")
-              .attr("href", featureLink(element))
+              .attr("href", "/" + element.type + "/" + element.id)
               .text(featureName(element))
               .appendTo($p);
           }
@@ -206,7 +199,7 @@ OSM.Query = function(map) {
             .appendTo($ul);
         }
       }
-    });
+    }));
   }
 
   function queryOverpass(lat, lng) {
@@ -215,7 +208,7 @@ OSM.Query = function(map) {
       around = "around:" + radius + "," + lat + "," + lng,
       features = "(node(" + around + ");way(" + around + ");relation(" + around + "))",
       nearby = "((" + features + ";way(bn));node(w));out;",
-      isin = "(is_in(" + lat + "," + lng + ");>);out;";
+      isin = "is_in(" + lat + "," + lng + ")->.a;(relation(pivot.a);way(pivot.a);node(w));out;";
 
     $("#sidebar_content .query-intro")
       .hide();
@@ -263,17 +256,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() {