X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/676e624928b220fded59229738b8ae0cca744cef..957d75295b2c379b17e61a2a22ee28fb5f701589:/app/assets/javascripts/index/query.js
diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index e2c8699ff..333fce549 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -4,7 +4,7 @@ OSM.Query = function(map) {
var protocol = document.location.protocol === "https:" ? "https:" : "http:",
url = protocol + OSM.OVERPASS_URL,
queryButton = $(".control-query .control-button"),
- uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid'],
+ uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid', 'KSJ2:curve_id', 'KSJ2:lat', 'KSJ2:lon', 'KSJ2:coordinate', 'KSJ2:filename', 'note:ja'],
marker;
var featureStyle = {
@@ -19,22 +19,18 @@ OSM.Query = function(map) {
e.preventDefault();
e.stopPropagation();
- if (queryButton.hasClass("disabled")) return;
-
if (queryButton.hasClass("active")) {
- if ($("#content").hasClass("overlay-sidebar")) {
- disableQueryMode();
- }
- } else {
+ disableQueryMode();
+ } else if (!queryButton.hasClass("disabled")) {
enableQueryMode();
}
- }).on("disabled", function (e) {
+ }).on("disabled", function () {
if (queryButton.hasClass("active")) {
map.off("click", clickHandler);
$(map.getContainer()).removeClass("query-active").addClass("query-disabled");
$(this).tooltip("show");
}
- }).on("enabled", function (e) {
+ }).on("enabled", function () {
if (queryButton.hasClass("active")) {
map.on("click", clickHandler);
$(map.getContainer()).removeClass("query-disabled").addClass("query-active");
@@ -44,20 +40,20 @@ OSM.Query = function(map) {
$("#sidebar_content")
.on("mouseover", ".query-results li.query-result", function () {
- var geometry = $(this).data("geometry")
+ var geometry = $(this).data("geometry");
if (geometry) map.addLayer(geometry);
$(this).addClass("selected");
})
.on("mouseout", ".query-results li.query-result", function () {
- var geometry = $(this).data("geometry")
+ var geometry = $(this).data("geometry");
if (geometry) map.removeLayer(geometry);
$(this).removeClass("selected");
})
- .on("mousedown", ".query-results li.query-result", function (e) {
+ .on("mousedown", ".query-results li.query-result", function () {
var moved = false;
$(this).one("click", function (e) {
if (!moved) {
- var geometry = $(this).data("geometry")
+ var geometry = $(this).data("geometry");
if (geometry) map.removeLayer(geometry);
if (!$(e.target).is('a')) {
@@ -69,13 +65,8 @@ OSM.Query = function(map) {
});
});
- function interestingFeature(feature, origin, radius) {
+ function interestingFeature(feature) {
if (feature.tags) {
- if (feature.type === "node" &&
- OSM.distance(origin, L.latLng(feature.lat, feature.lon)) > radius) {
- return false;
- }
-
for (var key in feature.tags) {
if (uninterestingTags.indexOf(key) < 0) {
return true;
@@ -90,25 +81,34 @@ OSM.Query = function(map) {
var tags = feature.tags;
var prefix = "";
- if (tags.boundary === "administrative") {
- prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level)
+ if (tags.boundary === "administrative" && tags.admin_level) {
+ prefix = I18n.t("geocoder.search_osm_nominatim.admin_levels.level" + tags.admin_level, {
+ defaultValue: I18n.t("geocoder.search_osm_nominatim.prefix.boundary.administrative")
+ });
} else {
var prefixes = I18n.t("geocoder.search_osm_nominatim.prefix");
+ var key, value;
- for (var key in tags) {
- var value = tags[key];
+ for (key in tags) {
+ value = tags[key];
if (prefixes[key]) {
if (prefixes[key][value]) {
return prefixes[key][value];
- } else {
- var first = value.substr(0, 1).toUpperCase(),
- rest = value.substr(1).replace(/_/g, " ");
-
- return first + rest;
}
}
}
+
+ for (key in tags) {
+ value = tags[key];
+
+ if (prefixes[key]) {
+ var first = value.substr(0, 1).toUpperCase(),
+ rest = value.substr(1).replace(/_/g, " ");
+
+ return first + rest;
+ }
+ }
}
if (!prefix) {
@@ -119,12 +119,19 @@ OSM.Query = function(map) {
}
function featureName(feature) {
- var tags = feature.tags;
+ var tags = feature.tags,
+ locales = I18n.locales.get();
- if (tags["name"]) {
- return tags["name"];
- } else if (tags["ref"]) {
- return tags["ref"];
+ for (var i = 0; i < locales.length; i++) {
+ if (tags["name:" + locales[i]]) {
+ return tags["name:" + locales[i]];
+ }
+ }
+
+ if (tags.name) {
+ return tags.name;
+ } else if (tags.ref) {
+ return tags.ref;
} else if (tags["addr:housename"]) {
return tags["addr:housename"];
} else if (tags["addr:housenumber"] && tags["addr:street"]) {
@@ -134,33 +141,27 @@ OSM.Query = function(map) {
}
}
- function featureGeometry(feature, features) {
+ function featureGeometry(feature) {
var geometry;
- if (feature.type === "node") {
+ if (feature.type === "node" && feature.lat && feature.lon) {
geometry = L.circleMarker([feature.lat, feature.lon], featureStyle);
- } else if (feature.type === "way") {
- geometry = L.polyline(feature.nodes.map(function (node) {
- return features["node" + node].getLatLng();
+ } else if (feature.type === "way" && feature.geometry) {
+ geometry = L.polyline(feature.geometry.filter(function (point) {
+ return point !== null;
+ }).map(function (point) {
+ return [point.lat, point.lon];
}), 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;
+ } else if (feature.type === "relation" && feature.members) {
+ geometry = L.featureGroup(feature.members.map(featureGeometry).filter(function (geometry) {
+ return geometry !== undefined;
+ }));
}
return geometry;
}
- function runQuery(latlng, radius, query, $section) {
+ function runQuery(latlng, radius, query, $section, compare) {
var $ul = $section.find("ul");
$ul.empty();
@@ -181,18 +182,23 @@ OSM.Query = function(map) {
data: "[timeout:5][out:json];" + query,
},
success: function(results) {
- var features = {};
+ var elements;
$section.find(".loader").stopTime("loading").hide();
- for (var i = 0; i < results.elements.length; i++) {
- var element = results.elements[i],
- geometry = featureGeometry(element, features);
+ if (compare) {
+ 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)) {
var $li = $("")
.addClass("query-result")
- .data("geometry", geometry)
+ .data("geometry", featureGeometry(element))
.appendTo($ul);
var $p = $("")
.text(featurePrefix(element) + " ")
@@ -205,7 +211,7 @@ OSM.Query = function(map) {
}
}
- if ($ul.find("li").length == 0) {
+ if ($ul.find("li").length === 0) {
$("
")
.text(I18n.t("javascripts.query.nothing_found"))
.appendTo($ul);
@@ -221,13 +227,23 @@ 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
* following sets:
*
* node(around:,,lng>)
* way(around:,,lng>)
- * node(w)
* relation(around:,,lng>)
*
* to find enclosing objects we first find all the enclosing areas:
@@ -238,21 +254,21 @@ OSM.Query = function(map) {
*
* relation(pivot.a)
* way(pivot.a)
- * node(w)
*
- * In order to avoid overly large responses we don't currently
- * attempt to complete any relations and instead just show those
- * ways and nodes which are returned for other reasons.
+ * In both cases we then ask to retrieve tags and the geometry
+ * for each object.
*/
function queryOverpass(lat, lng) {
- var latlng = L.latLng(lat, lng),
+ var latlng = L.latLng(lat, lng).wrap(),
+ bounds = map.getBounds().wrap(),
+ bbox = bounds.getSouth() + "," + bounds.getWest() + "," + bounds.getNorth() + "," + bounds.getEast(),
radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
around = "around:" + radius + "," + lat + "," + lng,
nodes = "node(" + around + ")",
- ways = "way(" + around + ");node(w)",
+ ways = "way(" + around + ")",
relations = "relation(" + around + ")",
- nearby = "(" + nodes + ";" + ways + ";" + relations + ");out;",
- isin = "is_in(" + lat + "," + lng + ")->.a;(relation(pivot.a);way(pivot.a);node(w));out;";
+ nearby = "(" + nodes + ";" + ways + ");out tags geom(" + bbox + ");" + relations + ";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")
.hide();
@@ -261,7 +277,7 @@ OSM.Query = function(map) {
marker = L.circle(latlng, radius, featureStyle).addTo(map);
$(document).everyTime(75, "fadeQueryMarker", function (i) {
- if (i == 10) {
+ if (i === 10) {
map.removeLayer(marker);
} else {
marker.setStyle({
@@ -272,13 +288,14 @@ OSM.Query = function(map) {
}, 10);
runQuery(latlng, radius, nearby, $("#query-nearby"));
- runQuery(latlng, radius, isin, $("#query-isin"));
+ runQuery(latlng, radius, isin, $("#query-isin"), compareSize);
}
function clickHandler(e) {
var precision = OSM.zoomPrecision(map.getZoom()),
- lat = e.latlng.lat.toFixed(precision),
- lng = e.latlng.lng.toFixed(precision);
+ latlng = e.latlng.wrap(),
+ lat = latlng.lat.toFixed(precision),
+ lng = latlng.lng.toFixed(precision);
OSM.router.route("/query?lat=" + lat + "&lon=" + lng);
}
@@ -308,19 +325,19 @@ OSM.Query = function(map) {
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))) {
+ if (!window.location.hash && !noCentre && !map.getBounds().contains(latlng)) {
OSM.router.withoutMoveListener(function () {
map.setView(latlng, 15);
});
}
queryOverpass(params.lat, params.lon);
- enableQueryMode();
};
- page.unload = function() {
- disableQueryMode();
+ page.unload = function(sameController) {
+ if (!sameController) {
+ disableQueryMode();
+ }
};
return page;