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

Replace jquery's getJSON with fetch

Browse source
This commit is contained in:
Marwin Hochfelsner 2025-02-27 22:40:18 +01:00
parent 648b8ba1f8
commit 64d41eac67
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,7 +104,13 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
const 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>
geocodeUrl = OSM.NOMINATIM_URL + "search?" + new URLSearchParams({ q: endpoint.value, format: "json", viewbox }); geocodeUrl = OSM.NOMINATIM_URL + "search?" + new URLSearchParams({ q: endpoint.value, format: "json", viewbox });
endpoint.geocodeRequest = $.getJSON(geocodeUrl, function (json) { endpoint.geocodeRequest = new AbortController();
fetch(geocodeUrl, { signal: endpoint.geocodeRequest.signal })
.then(r => r.json())
.then(success)
.catch(() => {});
function success(json) {
delete endpoint.geocodeRequest; delete endpoint.geocodeRequest;
if (json.length === 0) { if (json.length === 0) {
input.addClass("is-invalid"); input.addClass("is-invalid");
@ -119,7 +125,7 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
input.val(json[0].display_name); input.val(json[0].display_name);
changeCallback(); changeCallback();
}); }
} }
function getReverseGeocode() { function getReverseGeocode() {
@ -127,7 +133,13 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
{ lat, lng } = latlng, { lat, lng } = latlng,
reverseGeocodeUrl = OSM.NOMINATIM_URL + "reverse?" + new URLSearchParams({ lat, lon: lng, format: "json" }); reverseGeocodeUrl = OSM.NOMINATIM_URL + "reverse?" + new URLSearchParams({ lat, lon: lng, format: "json" });
endpoint.geocodeRequest = $.getJSON(reverseGeocodeUrl, function (json) { endpoint.geocodeRequest = new AbortController();
fetch(reverseGeocodeUrl, { signal: endpoint.geocodeRequest.signal })
.then(r => r.json())
.then(success)
.catch(() => {});
function success(json) {
delete endpoint.geocodeRequest; delete endpoint.geocodeRequest;
if (!json || !json.display_name) { if (!json || !json.display_name) {
endpoint.cachedReverseGeocode = { latlng: latlng, notFound: true }; endpoint.cachedReverseGeocode = { latlng: latlng, notFound: true };
@ -137,7 +149,7 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
endpoint.value = json.display_name; endpoint.value = json.display_name;
input.val(json.display_name); input.val(json.display_name);
endpoint.cachedReverseGeocode = { latlng: latlng, value: endpoint.value }; endpoint.cachedReverseGeocode = { latlng: latlng, value: endpoint.value };
}); }
} }
function setLatLng(ll) { function setLatLng(ll) {