From: Tom Hughes <tom@compton.nu>
Date: Fri, 14 Mar 2014 00:31:24 +0000 (+0000)
Subject: Pivot areas to the underlying way or relation object
X-Git-Tag: live~4334^2~20
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5452cfeb08dbeaade0a71ae35cfe50e2314ef604

Pivot areas to the underlying way or relation object
---

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index fb8649025..5ce996927 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -122,24 +122,6 @@ 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, features) {
     var geometry;
 
@@ -205,7 +187,7 @@ OSM.Query = function(map) {
               .appendTo($li);
 
             $("<a>")
-              .attr("href", featureLink(element))
+              .attr("href", "/" + element.type + "/" + element.id)
               .text(featureName(element))
               .appendTo($p);
           }
@@ -226,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();