From ead1a6c03a6c32055bdacd60d3ea408bcbeef17e Mon Sep 17 00:00:00 2001
From: mmd-osm <mmd.osm@gmail.com>
Date: Mon, 25 Aug 2025 22:43:56 +0200
Subject: [PATCH] Added error handling for object display on map

---
 app/assets/javascripts/download_util.js     | 14 +++++++++++++
 app/assets/javascripts/index/layers/data.js | 17 ++-------------
 app/assets/javascripts/leaflet.map.js       | 23 +++++++++++++++++++--
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/download_util.js b/app/assets/javascripts/download_util.js
index 84cf21628..5cef3087a 100644
--- a/app/assets/javascripts/download_util.js
+++ b/app/assets/javascripts/download_util.js
@@ -54,3 +54,17 @@ OSM.turboHtmlResponseHandler = function (event) {
     event.stopPropagation();
   }
 };
+
+OSM.displayLoadError = function (message, close) {
+  $("#browse_status").html(
+    $("<div class='p-3'>").append(
+      $("<div class='d-flex'>").append(
+        $("<h2 class='flex-grow-1 text-break'>")
+          .text(OSM.i18n.t("browse.start_rjs.load_data")),
+        $("<div>").append(
+          $("<button type='button' class='btn-close'>")
+            .attr("aria-label", OSM.i18n.t("javascripts.close"))
+            .on("click", close))),
+      $("<p class='alert alert-warning'>")
+        .text(OSM.i18n.t("browse.start_rjs.feature_error", { message: message }))));
+};
diff --git a/app/assets/javascripts/index/layers/data.js b/app/assets/javascripts/index/layers/data.js
index 0ba0cf60e..88b21ac19 100644
--- a/app/assets/javascripts/index/layers/data.js
+++ b/app/assets/javascripts/index/layers/data.js
@@ -1,3 +1,4 @@
+//= require download_util
 OSM.initializeDataLayer = function (map) {
   let dataLoader, loadedBounds;
   const dataLayer = map.dataLayer;
@@ -49,20 +50,6 @@ OSM.initializeDataLayer = function (map) {
           .click(add)));
   }
 
-  function displayLoadError(message, close) {
-    $("#browse_status").html(
-      $("<div class='p-3'>").append(
-        $("<div class='d-flex'>").append(
-          $("<h2 class='flex-grow-1 text-break'>")
-            .text(OSM.i18n.t("browse.start_rjs.load_data")),
-          $("<div>").append(
-            $("<button type='button' class='btn-close'>")
-              .attr("aria-label", OSM.i18n.t("javascripts.close"))
-              .click(close))),
-        $("<p class='alert alert-warning'>")
-          .text(OSM.i18n.t("browse.start_rjs.feature_error", { message: message }))));
-  }
-
   function getData() {
     /*
      * Modern browsers are quite happy showing far more than 100 features in
@@ -166,7 +153,7 @@ OSM.initializeDataLayer = function (map) {
       .catch(function (error) {
         if (error.name === "AbortError") return;
 
-        displayLoadError(error?.message, () => {
+        OSM.displayLoadError(error?.message, () => {
           $("#browse_status").empty();
         });
       })
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 0e62f27ac..f6f0259c1 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -1,3 +1,4 @@
+//= require download_util
 L.extend(L.LatLngBounds.prototype, {
   getSize: function () {
     return (this._northEast.lat - this._southWest.lat) *
@@ -277,7 +278,19 @@ L.OSM.Map = L.Map.extend({
         headers: { accept: "application/json" },
         signal: this._objectLoader.signal
       })
-        .then(response => response.json())
+        .then(async response => {
+          if (response.ok) {
+            return response.json();
+          }
+
+          const status = response.statusText || response.status;
+          if (response.status !== 400 && response.status !== 509) {
+            throw new Error(status);
+          }
+
+          const text = await response.text();
+          throw new Error(text || status);
+        })
         .then(function (data) {
           map._object = object;
 
@@ -300,8 +313,14 @@ L.OSM.Map = L.Map.extend({
 
           if (callback) callback(map._objectLayer.getBounds());
           map.fire("overlayadd", { layer: map._objectLayer });
+          $("#browse_status").empty();
         })
-        .catch(() => {});
+        .catch(function (error) {
+          if (error.name === "AbortError") return;
+          OSM.displayLoadError(error?.message, () => {
+            $("#browse_status").empty();
+          });
+        });
     }
   },
 
-- 
2.39.5