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

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

Browse source
This commit is contained in:
Tom Hughes 2025-02-09 14:51:56 +00:00
commit 97bd4579b0
3 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/index/directions-endpoint.js
View file

@ -101,8 +101,8 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
}; };
function getGeocode() { function getGeocode() {
var viewbox = map.getBounds().toBBoxString(); // <sw lon>,<sw lat>,<ne lon>,<ne lat> const viewbox = map.getBounds().toBBoxString(), // <sw lon>,<sw lat>,<ne lon>,<ne lat>
var geocodeUrl = OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json&viewbox=" + viewbox; geocodeUrl = OSM.NOMINATIM_URL + "search?" + new URLSearchParams({ q: endpoint.value, format: "json", viewbox });
endpoint.geocodeRequest = $.getJSON(geocodeUrl, function (json) { endpoint.geocodeRequest = $.getJSON(geocodeUrl, function (json) {
delete endpoint.geocodeRequest; delete endpoint.geocodeRequest;
@ -123,8 +123,9 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
} }
function getReverseGeocode() { function getReverseGeocode() {
var latlng = endpoint.latlng.clone(); const latlng = endpoint.latlng.clone(),
var reverseGeocodeUrl = OSM.NOMINATIM_URL + "reverse?lat=" + latlng.lat + "&lon=" + latlng.lng + "&format=json"; { lat, lng } = latlng,
reverseGeocodeUrl = OSM.NOMINATIM_URL + "reverse?" + new URLSearchParams({ lat, lon: lng, format: "json" });
endpoint.geocodeRequest = $.getJSON(reverseGeocodeUrl, function (json) { endpoint.geocodeRequest = $.getJSON(reverseGeocodeUrl, function (json) {
delete endpoint.geocodeRequest; delete endpoint.geocodeRequest;

16
app/assets/javascripts/index/search.js
View file

@ -10,22 +10,18 @@ OSM.Search = function (map) {
$(".search_form a.btn.switch_link").on("click", function (e) { $(".search_form a.btn.switch_link").on("click", function (e) {
e.preventDefault(); e.preventDefault();
var query = $(this).closest("form").find("input[name=query]").val(); var query = $(this).closest("form").find("input[name=query]").val();
if (query) { let search = "";
OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map)); if (query) search = "?" + new URLSearchParams({ from: query });
} else { OSM.router.route("/directions" + search + OSM.formatHash(map));
OSM.router.route("/directions" + OSM.formatHash(map));
}
}); });
$(".search_form").on("submit", function (e) { $(".search_form").on("submit", function (e) {
e.preventDefault(); e.preventDefault();
$("header").addClass("closed"); $("header").addClass("closed");
var query = $(this).find("input[name=query]").val(); var query = $(this).find("input[name=query]").val();
if (query) { let search = "/";
OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map)); if (query) search = "/search?" + new URLSearchParams({ query });
} else { OSM.router.route(search + OSM.formatHash(map));
OSM.router.route("/" + OSM.formatHash(map));
}
}); });
$(".describe_location").on("click", function (e) { $(".describe_location").on("click", function (e) {

8
app/assets/javascripts/leaflet.share.js
View file

@ -349,14 +349,14 @@ L.OSM.share = function (options) {
$("#short_link").attr("href", map.getShortUrl(marker)); $("#short_link").attr("href", map.getShortUrl(marker));
$("#long_link").attr("href", map.getUrl(marker)); $("#long_link").attr("href", map.getUrl(marker));
var params = { const params = new URLSearchParams({
bbox: bounds.toBBoxString(), bbox: bounds.toBBoxString(),
layer: map.getMapBaseLayerId() layer: map.getMapBaseLayerId()
}; });
if (map.hasLayer(marker)) { if (map.hasLayer(marker)) {
var latLng = marker.getLatLng().wrap(); var latLng = marker.getLatLng().wrap();
params.marker = latLng.lat + "," + latLng.lng; params.set("marker", latLng.lat + "," + latLng.lng);
} }
$("#embed_link") $("#embed_link")
@ -369,7 +369,7 @@ L.OSM.share = function (options) {
$("#embed_html").val( $("#embed_html").val(
"<iframe width=\"425\" height=\"350\" src=\"" + "<iframe width=\"425\" height=\"350\" src=\"" +
escapeHTML(OSM.SERVER_PROTOCOL + "://" + OSM.SERVER_URL + "/export/embed.html?" + $.param(params)) + escapeHTML(OSM.SERVER_PROTOCOL + "://" + OSM.SERVER_URL + "/export/embed.html?" + params) +
"\" style=\"border: 1px solid black\"></iframe><br/>" + "\" style=\"border: 1px solid black\"></iframe><br/>" +
"<small><a href=\"" + escapeHTML(map.getUrl(marker)) + "\">" + "<small><a href=\"" + escapeHTML(map.getUrl(marker)) + "\">" +
escapeHTML(I18n.t("javascripts.share.view_larger_map")) + "</a></small>"); escapeHTML(I18n.t("javascripts.share.view_larger_map")) + "</a></small>");