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

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

Browse source
This commit is contained in:
Tom Hughes 2025-01-26 10:24:05 +00:00
commit 6316745c2e
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/assets/javascripts/index/layers/data.js
View file

@ -63,6 +63,17 @@ OSM.initializeDataLayer = function (map) {
.click(add)));
}
function displayLoadError(message) {
$("#browse_status").html(
$("<div class='p-3'>").append(
$("<h2 class='flex-grow-1 text-break'>")
.text(I18n.t("browse.start_rjs.load_data")),
$("<div>").append(
$("<div class='d-flex'>").append(
$("<p class='alert alert-warning'>")
.text(I18n.t("browse.start_rjs.feature_error", { message: message }))))));
}
var dataLoader;
function getData() {
@ -114,6 +125,18 @@ OSM.initializeDataLayer = function (map) {
}
dataLoader = null;
},
error: function (XMLHttpRequest, textStatus) {
dataLoader = null;
if (textStatus === "abort") { return; }
if (XMLHttpRequest.status === 400 && XMLHttpRequest.responseText) {
displayLoadError(XMLHttpRequest.responseText);
} else if (XMLHttpRequest.statusText) {
displayLoadError(XMLHttpRequest.statusText);
} else {
displayLoadError(String(XMLHttpRequest.status));
}
}
});
}