Build and show partial geometries for relatons

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index b9aa4f4d051c0459095ef3343ad01b0bd1fdca30..c0f40d1e1854bec7f300e5bfb63ced0a64652d5f 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -140,15 +140,27 @@ OSM.Query = function(map) {
     }
   }
 
     }
   }
 

-  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) {
     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);
       }), 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;
     }
 
     return geometry;


@@ -171,23 +183,18 @@ OSM.Query = function(map) {
         data: "[timeout:5][out:json];" + query,
       },
       success: function(results) {
         data: "[timeout:5][out:json];" + query,
       },
       success: function(results) {

-        var nodes = {};
+        var features = {};

 
         $section.find(".loader").stopTime("loading").hide();
 
 
         $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++) {
         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")
 
           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($ul);
             var $p = $("<p>")
               .text(featurePrefix(element) + " ")