X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be878df0978d5b51f7fbb72fca16f74c5708c818..a9dcb66e7b835a45902e1257f47be3f625389831:/app/assets/javascripts/index/query.js
diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 4b58e6f93..5c8ee8876 100644
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,8 +1,6 @@
-//= require jquery-simulate/jquery.simulate
-//= require qs/dist/qs
-
OSM.Query = function (map) {
var url = OSM.OVERPASS_URL,
+ credentials = OSM.OVERPASS_CREDENTIALS,
queryButton = $(".control-query .control-button"),
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;
@@ -38,32 +36,21 @@ OSM.Query = function (map) {
}
});
+ function showResultGeometry() {
+ var geometry = $(this).data("geometry");
+ if (geometry) map.addLayer(geometry);
+ $(this).addClass("selected");
+ }
+
+ function hideResultGeometry() {
+ var geometry = $(this).data("geometry");
+ if (geometry) map.removeLayer(geometry);
+ $(this).removeClass("selected");
+ }
+
$("#sidebar_content")
- .on("mouseover", ".query-results li.query-result", function () {
- 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");
- if (geometry) map.removeLayer(geometry);
- $(this).removeClass("selected");
- })
- .on("mousedown", ".query-results li.query-result", function () {
- var moved = false;
- $(this).one("click", function (e) {
- if (!moved) {
- var geometry = $(this).data("geometry");
- if (geometry) map.removeLayer(geometry);
-
- if (!$(e.target).is("a")) {
- $(this).find("a").simulate("click", e);
- }
- }
- }).one("mousemove", function () {
- moved = true;
- });
- });
+ .on("mouseover", ".query-results a", showResultGeometry)
+ .on("mouseout", ".query-results a", hideResultGeometry);
function interestingFeature(feature) {
if (feature.tags) {
@@ -120,11 +107,11 @@ OSM.Query = function (map) {
function featureName(feature) {
var tags = feature.tags,
- locales = I18n.locales.get();
+ locales = OSM.preferred_languages;
- for (var i = 0; i < locales.length; i++) {
- if (tags["name:" + locales[i]]) {
- return tags["name:" + locales[i]];
+ for (const locale of locales) {
+ if (tags["name:" + locale]) {
+ return tags["name:" + locale];
}
}
@@ -167,10 +154,6 @@ OSM.Query = function (map) {
$ul.empty();
$section.show();
- $section.find(".loader").oneTime(1000, "loading", function () {
- $(this).show();
- });
-
if ($section.data("ajax")) {
$section.data("ajax").abort();
}
@@ -181,10 +164,13 @@ OSM.Query = function (map) {
data: {
data: "[timeout:10][out:json];" + query
},
+ xhrFields: {
+ withCredentials: credentials
+ },
success: function (results) {
var elements;
- $section.find(".loader").stopTime("loading").hide();
+ $section.find(".loader").hide();
if (merge) {
elements = results.elements.reduce(function (hash, element) {
@@ -207,42 +193,41 @@ OSM.Query = function (map) {
elements = elements.sort(compare);
}
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
+ for (const element of elements) {
+ if (!interestingFeature(element)) continue;
- if (interestingFeature(element)) {
- var $li = $("")
- .addClass("query-result list-group-item")
- .data("geometry", featureGeometry(element))
- .text(featurePrefix(element) + " ")
- .appendTo($ul);
+ var $li = $("")
+ .addClass("list-group-item list-group-item-action")
+ .text(featurePrefix(element) + " ")
+ .appendTo($ul);
- $("")
- .attr("href", "/" + element.type + "/" + element.id)
- .text(featureName(element))
- .appendTo($li);
- }
+ $("")
+ .addClass("stretched-link")
+ .attr("href", "/" + element.type + "/" + element.id)
+ .data("geometry", featureGeometry(element))
+ .text(featureName(element))
+ .appendTo($li);
}
if (results.remark) {
$("")
- .addClass("query-result list-group-item")
+ .addClass("list-group-item")
.text(I18n.t("javascripts.query.error", { server: url, error: results.remark }))
.appendTo($ul);
}
if ($ul.find("li").length === 0) {
$("")
- .addClass("query-result list-group-item")
+ .addClass("list-group-item")
.text(I18n.t("javascripts.query.nothing_found"))
.appendTo($ul);
}
},
error: function (xhr, status, error) {
- $section.find(".loader").stopTime("loading").hide();
+ $section.find(".loader").hide();
$("")
- .addClass("query-result list-group-item")
+ .addClass("list-group-item")
.text(I18n.t("javascripts.query." + status, { server: url, error: error }))
.appendTo($ul);
}
@@ -264,9 +249,9 @@ OSM.Query = function (map) {
* To find nearby objects we ask overpass for the union of the
* following sets:
*
- * node(around:,,lng>)
- * way(around:,,lng>)
- * relation(around:,,lng>)
+ * node(around:,,)
+ * way(around:,,)
+ * relation(around:,,)
*
* to find enclosing objects we first find all the enclosing areas:
*
@@ -283,47 +268,36 @@ OSM.Query = function (map) {
function queryOverpass(lat, lng) {
var latlng = L.latLng(lat, lng).wrap(),
bounds = map.getBounds().wrap(),
- precision = OSM.zoomPrecision(map.getZoom()),
- bbox = bounds.getSouth().toFixed(precision) + "," +
- bounds.getWest().toFixed(precision) + "," +
- bounds.getNorth().toFixed(precision) + "," +
- bounds.getEast().toFixed(precision),
- radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
- around = "around:" + radius + "," + lat + "," + lng,
- nodes = "node(" + around + ")",
- ways = "way(" + around + ")",
- relations = "relation(" + around + ")",
- nearby = "(" + nodes + ";" + ways + ";);out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");",
- isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags bb;out ids geom(" + bbox + ");relation(pivot.a);out tags bb;";
+ zoom = map.getZoom(),
+ bbox = [bounds.getSouthWest(), bounds.getNorthEast()]
+ .map(c => OSM.cropLocation(c, zoom))
+ .join(),
+ geombbox = "geom(" + bbox + ");",
+ radius = 10 * Math.pow(1.5, 19 - zoom),
+ around = "(around:" + radius + "," + lat + "," + lng + ")",
+ nodes = "node" + around,
+ ways = "way" + around,
+ relations = "relation" + around,
+ nearby = "(" + nodes + ";" + ways + ";);out tags " + geombbox + relations + ";out " + geombbox,
+ isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags bb;out ids " + geombbox + "relation(pivot.a);out tags bb;";
$("#sidebar_content .query-intro")
.hide();
if (marker) map.removeLayer(marker);
- marker = L.circle(latlng, radius, featureStyle).addTo(map);
-
- $(document).everyTime(75, "fadeQueryMarker", function (i) {
- if (i === 10) {
- map.removeLayer(marker);
- } else {
- marker.setStyle({
- opacity: 1 - (i * 0.1),
- fillOpacity: 0.5 - (i * 0.05)
- });
- }
- }, 10);
+ marker = L.circle(latlng, Object.assign({
+ radius: radius,
+ className: "query-marker"
+ }, featureStyle)).addTo(map);
runQuery(latlng, radius, nearby, $("#query-nearby"), false);
runQuery(latlng, radius, isin, $("#query-isin"), true, compareSize);
}
function clickHandler(e) {
- var precision = OSM.zoomPrecision(map.getZoom()),
- latlng = e.latlng.wrap(),
- lat = latlng.lat.toFixed(precision),
- lng = latlng.lng.toFixed(precision);
+ const [lat, lon] = OSM.cropLocation(e.latlng, map.getZoom());
- OSM.router.route("/query?lat=" + lat + "&lon=" + lng);
+ OSM.router.route("/query?" + new URLSearchParams({ lat, lon }));
}
function enableQueryMode() {
@@ -348,8 +322,8 @@ OSM.Query = function (map) {
};
page.load = function (path, noCentre) {
- var params = Qs.parse(path.substring(path.indexOf("?") + 1)),
- latlng = L.latLng(params.lat, params.lon);
+ const params = new URLSearchParams(path.substring(path.indexOf("?"))),
+ latlng = L.latLng(params.get("lat"), params.get("lon"));
if (!window.location.hash && !noCentre && !map.getBounds().contains(latlng)) {
OSM.router.withoutMoveListener(function () {
@@ -357,12 +331,13 @@ OSM.Query = function (map) {
});
}
- queryOverpass(params.lat, params.lon);
+ queryOverpass(params.get("lat"), params.get("lon"));
};
page.unload = function (sameController) {
if (!sameController) {
disableQueryMode();
+ $("#sidebar_content .query-results a.selected").each(hideResultGeometry);
}
};