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

Merge remote-tracking branch 'upstream/pull/4728'

Browse source
This commit is contained in:
Tom Hughes 2024-04-27 15:19:45 +01:00
commit a5f7221639
2 changed files with 9 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,3 @@
//= require jquery-simulate/jquery.simulate
//= require qs/dist/qs
OSM.Query = function (map) {
@ -52,23 +51,8 @@ OSM.Query = function (map) {
}
$("#sidebar_content")
.on("mouseover", ".query-results li.query-result", showResultGeometry)
.on("mouseout", ".query-results li.query-result", hideResultGeometry)
.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) {
@ -216,13 +200,14 @@ OSM.Query = function (map) {
if (interestingFeature(element)) {
var $li = $("<li>")
.addClass("query-result list-group-item list-group-item-action")
.data("geometry", featureGeometry(element))
.addClass("list-group-item list-group-item-action")
.text(featurePrefix(element) + " ")
.appendTo($ul);
$("<a>")
.addClass("stretched-link")
.attr("href", "/" + element.type + "/" + element.id)
.data("geometry", featureGeometry(element))
.text(featureName(element))
.appendTo($li);
}
@ -230,14 +215,14 @@ OSM.Query = function (map) {
if (results.remark) {
$("<li>")
.addClass("query-result list-group-item list-group-item-action")
.addClass("list-group-item")
.text(I18n.t("javascripts.query.error", { server: url, error: results.remark }))
.appendTo($ul);
}
if ($ul.find("li").length === 0) {
$("<li>")
.addClass("query-result list-group-item list-group-item-action")
.addClass("list-group-item")
.text(I18n.t("javascripts.query.nothing_found"))
.appendTo($ul);
}
@ -246,7 +231,7 @@ OSM.Query = function (map) {
$section.find(".loader").hide();
$("<li>")
.addClass("query-result list-group-item list-group-item-action")
.addClass("list-group-item")
.text(I18n.t("javascripts.query." + status, { server: url, error: error }))
.appendTo($ul);
}
@ -367,7 +352,7 @@ OSM.Query = function (map) {
page.unload = function (sameController) {
if (!sameController) {
disableQueryMode();
$("#sidebar_content .query-results li.query-result.selected").each(hideResultGeometry);
$("#sidebar_content .query-results a.selected").each(hideResultGeometry);
}
};

8
app/assets/stylesheets/common.scss
View file

@ -636,14 +636,6 @@ tr.turn {
.query-results {
display: none;
ul {
li {
&.query-result {
cursor: pointer;
}
}
}
}
}