From a419f8890a66e584501b831aba9d1fdcbc6894bc Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Thu, 6 Oct 2022 00:42:04 +0300
Subject: [PATCH] Load note from edit link with remote control

---
 app/assets/javascripts/index.js   | 42 ++++++++++++++++++-------------
 app/assets/javascripts/osm.js.erb |  5 +++-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 5ba36a455..e5590c9f7 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -246,8 +246,8 @@ $(document).ready(function () {
   });
 
   function remoteEditHandler(bbox, object) {
-    var loaded = false,
-        url,
+    var remoteEditHost = "http://127.0.0.1:8111",
+        osmHost = location.protocol + "//" + location.host,
         query = {
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,
@@ -255,25 +255,31 @@ $(document).ready(function () {
           bottom: bbox.getSouth() - 0.0001
         };
 
-    url = "http://127.0.0.1:8111/load_and_zoom?";
-
-    if (object) query.select = object.type + object.id;
-
-    var iframe = $("<iframe>")
-      .hide()
-      .appendTo("body")
-      .attr("src", url + Qs.stringify(query))
-      .on("load", function () {
-        $(this).remove();
-        loaded = true;
-      });
+    if (object && object.type !== "note") query.select = object.type + object.id; // can't select notes
+    sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + Qs.stringify(query), function () {
+      if (object && object.type === "note") {
+        var noteQuery = { url: osmHost + OSM.apiUrl(object) };
+        sendRemoteEditCommand(remoteEditHost + "/import?" + Qs.stringify(noteQuery));
+      }
+    });
 
-    setTimeout(function () {
-      if (!loaded) {
+    function sendRemoteEditCommand(url, callback) {
+      var iframe = $("<iframe>");
+      var timeoutId = setTimeout(function () {
         alert(I18n.t("site.index.remote_failed"));
         iframe.remove();
-      }
-    }, 1000);
+      }, 5000);
+
+      iframe
+        .hide()
+        .appendTo("body")
+        .attr("src", url)
+        .on("load", function () {
+          clearTimeout(timeoutId);
+          iframe.remove();
+          if (callback) callback();
+        });
+    }
 
     return false;
   }
diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index f82516632..3290b5e2c 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -37,7 +37,8 @@ OSM = {
   SEARCHING:               <%= image_path("searching.gif").to_json %>,
 
   apiUrl: function (object) {
-    var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
+    var apiType = object.type === "note" ? "notes" : object.type;
+    var url = "/api/" + OSM.API_VERSION + "/" + apiType + "/" + object.id;
 
     if (object.type === "way" || object.type === "relation") {
       url += "/full";
@@ -85,6 +86,8 @@ OSM = {
       mapParams.object = {type: 'way', id: parseInt(params.way)};
     } else if (params.relation) {
       mapParams.object = {type: 'relation', id: parseInt(params.relation)};
+    } else if (params.note) {
+      mapParams.object = {type: 'note', id: parseInt(params.note)};
     }
 
     var hash = OSM.parseHash(location.hash);
-- 
2.39.5