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

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 5ba36a455db9e3a06ef467a872657844e8f972d9..a94131443d410b06b557a08aa306b1b90084edcc 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,7 +1,8 @@
 //= require_self
 //= require leaflet.sidebar
 //= require leaflet.sidebar-pane
 //= require_self
 //= require leaflet.sidebar
 //= require leaflet.sidebar-pane

-//= require leaflet.locatecontrol/src/L.Control.Locate
+//= require leaflet.locatecontrol/dist/L.Control.Locate.umd
+//= require leaflet.locate

 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note


@@ -11,9 +12,9 @@
 //= require leaflet.contextmenu
 //= require index/contextmenu
 //= require index/search
 //= require leaflet.contextmenu
 //= require index/contextmenu
 //= require index/search

-//= require index/browse
+//= require index/layers/data

 //= require index/export
 //= require index/export

-//= require index/notes
+//= require index/layers/notes

 //= require index/history
 //= require index/note
 //= require index/new_note
 //= require index/history
 //= require index/note
 //= require index/new_note


@@ -21,11 +22,8 @@
 //= require index/changeset
 //= require index/query
 //= require router
 //= require index/changeset
 //= require index/query
 //= require router

-//= require qs/dist/qs

 
 $(document).ready(function () {
 
 $(document).ready(function () {

-  var loaderTimeout;
-

   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,


@@ -38,19 +36,7 @@ $(document).ready(function () {
 
     map.setSidebarOverlaid(false);
 
 
     map.setSidebarOverlaid(false);
 

-    clearTimeout(loaderTimeout);
-
-    loaderTimeout = setTimeout(function () {
-      $("#sidebar_loader").show();
-    }, 200);
-
-    // IE<10 doesn't respect Vary: X-Requested-With header, so
-    // prevent caching the XHR response as a full-page URL.
-    if (content_path.indexOf("?") >= 0) {
-      content_path += "&xhr=1";
-    } else {
-      content_path += "?xhr=1";
-    }
+    $("#sidebar_loader").show().addClass("delayed-fade-in");

 
     $("#sidebar_content")
       .empty();
 
     $("#sidebar_content")
       .empty();


@@ -59,9 +45,8 @@ $(document).ready(function () {
       url: content_path,
       dataType: "html",
       complete: function (xhr) {
       url: content_path,
       dataType: "html",
       complete: function (xhr) {

-        clearTimeout(loaderTimeout);

         $("#flash").empty();
         $("#flash").empty();

-        $("#sidebar_loader").hide();
+        $("#sidebar_loader").removeClass("delayed-fade-in").hide();

 
         var content = $(xhr.responseText);
 
 
         var content = $(xhr.responseText);
 


@@ -98,62 +83,58 @@ $(document).ready(function () {
     }
   });
 
     }
   });
 

-  var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
-
-  L.OSM.zoom({ position: position })
+  var sidebar = L.OSM.sidebar("#map-ui")

     .addTo(map);
 
     .addTo(map);
 

-  var locate = L.control.locate({
-    position: position,
-    icon: "icon geolocate",
-    iconLoading: "icon geolocate",
-    strings: {
-      title: I18n.t("javascripts.map.locate.title"),
-      popup: function (options) {
-        return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
-      }
-    }
-  }).addTo(map);
+  var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";

 
 

-  var locateContainer = locate.getContainer();
+  function addControlGroup(controls) {
+    for (const control of controls) control.addTo(map);

 
 

-  $(locateContainer)
-    .removeClass("leaflet-control-locate leaflet-bar")
-    .addClass("control-locate")
-    .children("a")
-    .attr("href", "#")
-    .removeClass("leaflet-bar-part leaflet-bar-part-single")
-    .addClass("control-button");
+    var firstContainer = controls[0].getContainer();
+    $(firstContainer).find(".control-button").first()
+      .addClass("control-button-first");

 
 

-  var sidebar = L.OSM.sidebar("#map-ui")
-    .addTo(map);
+    var lastContainer = controls[controls.length - 1].getContainer();
+    $(lastContainer).find(".control-button").last()
+      .addClass("control-button-last");
+  }

 
 

-  L.OSM.layers({
-    position: position,
-    layers: map.baseLayers,
-    sidebar: sidebar
-  }).addTo(map);
-
-  L.OSM.key({
-    position: position,
-    sidebar: sidebar
-  }).addTo(map);
-
-  L.OSM.share({
-    "position": position,
-    "sidebar": sidebar,
-    "short": true
-  }).addTo(map);
-
-  L.OSM.note({
-    position: position,
-    sidebar: sidebar
-  }).addTo(map);
-
-  L.OSM.query({
-    position: position,
-    sidebar: sidebar
-  }).addTo(map);
+  addControlGroup([
+    L.OSM.zoom({ position: position }),
+    L.OSM.locate({ position: position })
+  ]);
+
+  addControlGroup([
+    L.OSM.layers({
+      position: position,
+      layers: map.baseLayers,
+      sidebar: sidebar
+    }),
+    L.OSM.key({
+      position: position,
+      sidebar: sidebar
+    }),
+    L.OSM.share({
+      "position": position,
+      "sidebar": sidebar,
+      "short": true
+    })
+  ]);
+
+  addControlGroup([
+    L.OSM.note({
+      position: position,
+      sidebar: sidebar
+    })
+  ]);
+
+  addControlGroup([
+    L.OSM.query({
+      position: position,
+      sidebar: sidebar
+    })
+  ]);

 
   L.control.scale()
     .addTo(map);
 
   L.control.scale()
     .addTo(map);


@@ -161,12 +142,12 @@ $(document).ready(function () {
   OSM.initializeContextMenu(map);
 
   if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
   OSM.initializeContextMenu(map);
 
   if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {

-    OSM.initializeNotes(map);
+    OSM.initializeNotesLayer(map);

     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);
     }
 
     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);
     }
 

-    OSM.initializeBrowse(map);
+    OSM.initializeDataLayer(map);

     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }
     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }


@@ -176,13 +157,12 @@ $(document).ready(function () {
     }
   }
 
     }
   }
 

-  var placement = $("html").attr("dir") === "rtl" ? "right" : "left";
-  $(".leaflet-control .control-button").tooltip({ placement: placement, container: "body" });
+  $(".leaflet-control .control-button").tooltip({ placement: "left", container: "body" });

 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
 
 
   var expiry = new Date();
   expiry.setYear(expiry.getFullYear() + 10);
 

-  map.on("moveend layeradd layerremove", function () {
+  map.on("moveend baselayerchange overlayadd overlayremove", function () {

     updateLinks(
       map.getCenter().wrap(),
       map.getZoom(),
     updateLinks(
       map.getCenter().wrap(),
       map.getZoom(),


@@ -193,11 +173,11 @@ $(document).ready(function () {
   });
 
   if (Cookies.get("_osm_welcome") !== "hide") {
   });
 
   if (Cookies.get("_osm_welcome") !== "hide") {

-    $(".welcome").addClass("visible");
+    $(".welcome").removeAttr("hidden");

   }
 
   $(".welcome .btn-close").on("click", function () {
   }
 
   $(".welcome .btn-close").on("click", function () {

-    $(".welcome").removeClass("visible");
+    $(".welcome").hide();

     Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
   });
 
     Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
   });
 


@@ -214,9 +194,9 @@ $(document).ready(function () {
   });
 
   if (OSM.MATOMO) {
   });
 
   if (OSM.MATOMO) {

-    map.on("layeradd", function (e) {
+    map.on("baselayerchange overlayadd", function (e) {

       if (e.layer.options) {
       if (e.layer.options) {

-        var goal = OSM.MATOMO.goals[e.layer.options.keyid];
+        var goal = OSM.MATOMO.goals[e.layer.options.layerId];

 
         if (goal) {
           $("body").trigger("matomogoal", goal);
 
         if (goal) {
           $("body").trigger("matomogoal", goal);


@@ -246,34 +226,31 @@ $(document).ready(function () {
   });
 
   function remoteEditHandler(bbox, object) {
   });
 
   function remoteEditHandler(bbox, object) {

-    var loaded = false,
-        url,
-        query = {
+    var remoteEditHost = "http://127.0.0.1:8111",
+        osmHost = location.protocol + "//" + location.host,
+        query = new URLSearchParams({

           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,
           right: bbox.getEast() + 0.0001,
           bottom: bbox.getSouth() - 0.0001
           left: bbox.getWest() - 0.0001,
           top: bbox.getNorth() + 0.0001,
           right: bbox.getEast() + 0.0001,
           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;
-      });
+        });

 
 

-    setTimeout(function () {
-      if (!loaded) {
-        alert(I18n.t("site.index.remote_failed"));
-        iframe.remove();
+    if (object && object.type !== "note") query.set("select", object.type + object.id); // can't select notes
+    sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + query, function () {
+      if (object && object.type === "note") {
+        const noteQuery = new URLSearchParams({ url: osmHost + OSM.apiUrl(object) });
+        sendRemoteEditCommand(remoteEditHost + "/import?" + noteQuery);

       }
       }

-    }, 1000);
+    });
+
+    function sendRemoteEditCommand(url, callback) {
+      fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(5000) })
+        .then(callback)
+        .catch(function () {
+          // eslint-disable-next-line no-alert
+          alert(I18n.t("site.index.remote_failed"));
+        });
+    }

 
     return false;
   }
 
     return false;
   }


@@ -307,9 +284,9 @@ $(document).ready(function () {
     };
 
     page.load = function () {
     };
 
     page.load = function () {

-      var params = Qs.parse(location.search.substring(1));
-      if (params.query) {
-        $("#sidebar .search_form input[name=query]").value(params.query);
+      const params = new URLSearchParams(location.search);
+      if (params.has("query")) {
+        $("#sidebar .search_form input[name=query]").value(params.get("query"));

       }
       if (!("autofocus" in document.createElement("input"))) {
         $("#sidebar .search_form input[name=query]").focus();
       }
       if (!("autofocus" in document.createElement("input"))) {
         $("#sidebar .search_form input[name=query]").focus();


@@ -342,10 +319,6 @@ $(document).ready(function () {
           });
         }
       });
           });
         }
       });

-
-      $(".colour-preview-box").each(function () {
-        $(this).css("background-color", $(this).data("colour"));
-      });

     }
 
     page.unload = function () {
     }
 
     page.unload = function () {


@@ -355,6 +328,16 @@ $(document).ready(function () {
     return page;
   };
 
     return page;
   };
 

+  OSM.OldBrowse = function () {
+    var page = {};
+
+    page.pushstate = page.popstate = function (path) {
+      OSM.loadSidebarContent(path);
+    };
+
+    return page;
+  };
+

   var history = OSM.History(map);
 
   OSM.router = OSM.Router(map, {
   var history = OSM.History(map);
 
   OSM.router = OSM.Router(map, {


@@ -369,8 +352,11 @@ $(document).ready(function () {
     "/user/:display_name/history": history,
     "/note/:id": OSM.Note(map),
     "/node/:id(/history)": OSM.Browse(map, "node"),
     "/user/:display_name/history": history,
     "/note/:id": OSM.Note(map),
     "/node/:id(/history)": OSM.Browse(map, "node"),

+    "/node/:id/history/:version": OSM.OldBrowse(),

     "/way/:id(/history)": OSM.Browse(map, "way"),
     "/way/:id(/history)": OSM.Browse(map, "way"),

+    "/way/:id/history/:version": OSM.OldBrowse(),

     "/relation/:id(/history)": OSM.Browse(map, "relation"),
     "/relation/:id(/history)": OSM.Browse(map, "relation"),

+    "/relation/:id/history/:version": OSM.OldBrowse(),

     "/changeset/:id": OSM.Changeset(map),
     "/query": OSM.Query(map)
   });
     "/changeset/:id": OSM.Changeset(map),
     "/query": OSM.Query(map)
   });


@@ -383,7 +369,7 @@ $(document).ready(function () {
   OSM.router.load();
 
   $(document).on("click", "a", function (e) {
   OSM.router.load();
 
   $(document).on("click", "a", function (e) {

-    if (e.isDefaultPrevented() || e.isPropagationStopped()) {
+    if (e.isDefaultPrevented() || e.isPropagationStopped() || $(e.target).data("turbo")) {

       return;
     }
 
       return;
     }
 


@@ -399,6 +385,13 @@ $(document).ready(function () {
 
     if (OSM.router.route(this.pathname + this.search + this.hash)) {
       e.preventDefault();
 
     if (OSM.router.route(this.pathname + this.search + this.hash)) {
       e.preventDefault();

+      if (this.pathname !== "/directions") {
+        $("header").addClass("closed");
+      }

     }
   });
     }
   });

+
+  $(document).on("click", "#sidebar_content .btn-close", function () {
+    OSM.router.route("/" + OSM.formatHash(map));
+  });

 });
 });