cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sort enclosing features by size

Browse source
This commit is contained in:
Tom Hughes 2014-11-04 09:55:26 +00:00
parent c4746efdb5
commit 9c7e0e13d7
1 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/assets/javascripts/index/query.js
View file

@ -149,7 +149,7 @@ OSM.Query = function(map) {
return geometry; return geometry;
} }
function runQuery(latlng, radius, query, $section) { function runQuery(latlng, radius, query, $section, compare) {
var $ul = $section.find("ul"); var $ul = $section.find("ul");
$ul.empty(); $ul.empty();
@ -170,10 +170,18 @@ OSM.Query = function(map) {
data: "[timeout:5][out:json];" + query, data: "[timeout:5][out:json];" + query,
}, },
success: function(results) { success: function(results) {
var elements;
$section.find(".loader").stopTime("loading").hide(); $section.find(".loader").stopTime("loading").hide();
for (var i = 0; i < results.elements.length; i++) { if (compare) {
var element = results.elements[i]; elements = results.elements.sort(compare);
} else {
elements = results.elements;
}
for (var i = 0; i < elements.length; i++) {
var element = elements[i];
if (interestingFeature(element, latlng, radius)) { if (interestingFeature(element, latlng, radius)) {
var $li = $("<li>") var $li = $("<li>")
@ -207,6 +215,17 @@ OSM.Query = function(map) {
})); }));
} }
function compareSize(feature1, feature2) {
var width1 = feature1.bounds.maxlon - feature1.bounds.minlon,
height1 = feature1.bounds.maxlat - feature1.bounds.minlat,
area1 = width1 * height1,
width2 = feature2.bounds.maxlat - feature2.bounds.minlat,
height2 = feature2.bounds.maxlat - feature2.bounds.minlat,
area2 = width2 * height2;
return area1 - area2;
}
/* /*
* To find nearby objects we ask overpass for the union of the * To find nearby objects we ask overpass for the union of the
* following sets: * following sets:
@ -237,7 +256,7 @@ OSM.Query = function(map) {
ways = "way(" + around + ")", ways = "way(" + around + ")",
relations = "relation(" + around + ")", relations = "relation(" + around + ")",
nearby = "(" + nodes + ";" + ways + ");out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");", nearby = "(" + nodes + ";" + ways + ");out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");",
isin = "is_in(" + lat + "," + lng + ")->.a;(relation(pivot.a);way(pivot.a));out geom(" + bbox + ");"; isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags geom(" + bbox + ");relation(pivot.a);out tags bb;";
$("#sidebar_content .query-intro") $("#sidebar_content .query-intro")
.hide(); .hide();
@ -257,7 +276,7 @@ OSM.Query = function(map) {
}, 10); }, 10);
runQuery(latlng, radius, nearby, $("#query-nearby")); runQuery(latlng, radius, nearby, $("#query-nearby"));
runQuery(latlng, radius, isin, $("#query-isin")); runQuery(latlng, radius, isin, $("#query-isin"), compareSize);
} }
function clickHandler(e) { function clickHandler(e) {