Use fetch to make overpass requests for the query tool

openstreetmap · Feb 12, 2025 · 1527b18 · 1527b18
1 parent 46f642d
commit 1527b18
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
@@ -153,20 +153,24 @@ OSM.Query = function (map) {
     $ul.empty();
     $section.show();
 
-    if ($section.data("ajax")) {
-      $section.data("ajax").abort();
+    if ($section.data("controller")) {
+      $section.data("controller").abort();
     }
 
-    $section.data("ajax", $.ajax({
-      url: url,
+    $section.data("controller", new AbortController());
+
+    const request = new Request(url, {
       method: "POST",
-      data: {
-        data: "[timeout:10][out:json];" + query
-      },
-      xhrFields: {
-        withCredentials: credentials
-      },
-      success: function (results) {
+      body: new URLSearchParams({
+        datax: "[timeout:10][out:json];" + query
+      }),
+      credentials: credentials ? "include" : "omit",
+      signal: $section.data("controller").signal
+    });
+
+    fetch(request)
+      .then(response => response.json())
+      .then(results => {
         var elements;
 
         $section.find(".loader").hide();
@@ -221,16 +225,15 @@ OSM.Query = function (map) {
             .text(I18n.t("javascripts.query.nothing_found"))
             .appendTo($ul);
         }
-      },
-      error: function (xhr, status, error) {
+      })
+      .catch(error => {
         $section.find(".loader").hide();
 
         $("<li>")
           .addClass("list-group-item")
-          .text(I18n.t("javascripts.query." + status, { server: url, error: error }))
+          .text(I18n.t("javascripts.query.error", { server: url, error: error.message }))
           .appendTo($ul);
-      }
-    }));
+      });
   }
 
   function compareSize(feature1, feature2) {

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -3299,7 +3299,6 @@ en:
       relation: Relation
       nothing_found: No features found
       error: "Error contacting %{server}: %{error}"
-      timeout: "Timeout contacting %{server}"
     context:
       directions_from: Directions from here
       directions_to: Directions to here