Improve styling of feature list

[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 8d04efd5f7a4bb19af540d5de470dc848f3f9233..6b64ee8ee1d74bc214b03c628d5d999eb6a46f73 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,6 +1,9 @@
+//= require jquery.simulate
+

 OSM.Query = function(map) {
   var queryButton = $(".control-query .control-button"),
     uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],
 OSM.Query = function(map) {
   var queryButton = $(".control-query .control-button"),
     uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],

+    searchRadius = 10,

     marker;
 
   queryButton.on("click", function (e) {
     marker;
 
   queryButton.on("click", function (e) {


@@ -26,10 +29,20 @@ OSM.Query = function(map) {
       var geometry = $(this).data("geometry")
       if (geometry) map.removeLayer(geometry);
       $(this).removeClass("selected");
       var geometry = $(this).data("geometry")
       if (geometry) map.removeLayer(geometry);
       $(this).removeClass("selected");

+    })
+    .on("click", ".query-results li", function (e) {
+      if (!$(e.target).is('a')) {
+        $(this).find("a").simulate("click", e);
+      }

     });
 
     });
 

-  function interestingFeature(feature) {
+  function interestingFeature(feature, origin) {

     if (feature.tags) {
     if (feature.tags) {

+      if (feature.type === "node" &&
+          OSM.distance(origin, L.latLng(feature.lat, feature.lon)) > searchRadius) {
+        return false;
+      }
+

       for (var key in feature.tags) {
         if (uninterestingTags.indexOf(key) < 0) {
           return true;
       for (var key in feature.tags) {
         if (uninterestingTags.indexOf(key) < 0) {
           return true;


@@ -118,7 +131,7 @@ OSM.Query = function(map) {
     return geometry;
   }
 
     return geometry;
   }
 

-  function runQuery(query, $section) {
+  function runQuery(latlng, query, $section) {

     var $ul = $section.find("ul");
 
     $ul.empty();
     var $ul = $section.find("ul");
 
     $ul.empty();


@@ -148,12 +161,11 @@ OSM.Query = function(map) {
         for (var i = 0; i < results.elements.length; i++) {
           var element = results.elements[i];
 
         for (var i = 0; i < results.elements.length; i++) {
           var element = results.elements[i];
 

-          if (interestingFeature(element)) {
+          if (interestingFeature(element, latlng)) {

             var $li = $("<li>")
               .data("geometry", featureGeometry(element, nodes))
               .appendTo($ul);
             var $p = $("<p>")
             var $li = $("<li>")
               .data("geometry", featureGeometry(element, nodes))
               .appendTo($ul);
             var $p = $("<p>")

-              .addClass("inner12 search_results_entry clearfix")

               .text(featurePrefix(element) + " ")
               .appendTo($li);
 
               .text(featurePrefix(element) + " ")
               .appendTo($li);
 


@@ -169,7 +181,7 @@ OSM.Query = function(map) {
 
   function queryOverpass(lat, lng) {
     var latlng = L.latLng(lat, lng),
 
   function queryOverpass(lat, lng) {
     var latlng = L.latLng(lat, lng),

-      around = "around:10.0," + lat + "," + lng,
+      around = "around:" + searchRadius + "," + lat + "," + lng,

       features = "(node(" + around + ");way(" + around + ");relation(" + around + "))",
       nearby = "((" + features + ";way(bn));node(w));out;",
       isin = "(is_in(" + lat + "," + lng + ");>);out;";
       features = "(node(" + around + ");way(" + around + ");relation(" + around + "))",
       nearby = "((" + features + ";way(bn));node(w));out;",
       isin = "(is_in(" + lat + "," + lng + ");>);out;";


@@ -180,7 +192,7 @@ OSM.Query = function(map) {
     if (marker) {
       marker.setLatLng(latlng).addTo(map);
     } else {
     if (marker) {
       marker.setLatLng(latlng).addTo(map);
     } else {

-      marker = L.circle(latlng, 10, { clickable: false }).addTo(map);
+      marker = L.circle(latlng, searchRadius, { clickable: false }).addTo(map);

     }
 
     $(document).everyTime(75, "fadeQueryMarker", function (i) {
     }
 
     $(document).everyTime(75, "fadeQueryMarker", function (i) {


@@ -194,8 +206,8 @@ OSM.Query = function(map) {
       }
     }, 10);
 
       }
     }, 10);
 

-    runQuery(nearby, $("#query-nearby"));
-    runQuery(isin, $("#query-isin"));
+    runQuery(latlng, nearby, $("#query-nearby"));
+    runQuery(latlng, isin, $("#query-isin"));

   }
 
   function clickHandler(e) {
   }
 
   function clickHandler(e) {