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

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2c7d70e11ad99603056546396c017cc7e1711ddc..96870f600869ab92c99a550820eeaecf499edebc 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,5 +1,7 @@
 //= require_self
 //= require leaflet.sidebar
 //= require_self
 //= require leaflet.sidebar

+//= require leaflet.sidebar-pane
+//= require leaflet.locatecontrol/dist/L.Control.Locate.umd

 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key


@@ -10,43 +12,35 @@
 //= 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/directions
 //= require index/changeset
 //= require index/query
 //= require index/history
 //= require index/note
 //= require index/new_note
 //= require index/directions
 //= require index/changeset
 //= require index/query

+//= require index/home

 //= require router
 //= require router

-//= require bowser
-//= require querystring

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

-  var querystring = require("querystring-component");
-
-  var loaderTimeout;
-
-  var map = new L.OSM.Map("map", {
+  const map = new L.OSM.Map("map", {

     zoomControl: false,
     layerControl: false,
     zoomControl: false,
     layerControl: false,

-    contextmenu: true
+    contextmenu: true,
+    worldCopyJump: true

   });
 
   OSM.loadSidebarContent = function (path, callback) {
   });
 
   OSM.loadSidebarContent = function (path, callback) {

-    var content_path = path;
+    let content_path = path;

 
     map.setSidebarOverlaid(false);
 
 
     map.setSidebarOverlaid(false);
 

-    clearTimeout(loaderTimeout);
-
-    loaderTimeout = setTimeout(function () {
-      $("#sidebar_loader").show();
-    }, 200);
+    $("#sidebar_loader").show().addClass("delayed-fade-in");

 
 

-    // IE<10 doesn't respect Vary: X-Requested-With header, so
-    // prevent caching the XHR response as a full-page URL.
+    // Prevent caching the XHR response as a full-page URL
+    // https://github.com/openstreetmap/openstreetmap-website/issues/5663

     if (content_path.indexOf("?") >= 0) {
       content_path += "&xhr=1";
     } else {
     if (content_path.indexOf("?") >= 0) {
       content_path += "&xhr=1";
     } else {


@@ -56,20 +50,18 @@ $(document).ready(function () {
     $("#sidebar_content")
       .empty();
 
     $("#sidebar_content")
       .empty();
 

-    $.ajax({
-      url: content_path,
-      dataType: "html",
-      complete: function (xhr) {
-        clearTimeout(loaderTimeout);
+    fetch(content_path, { headers: { "accept": "text/html", "x-requested-with": "XMLHttpRequest" } })
+      .then(response => {

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

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

 
 

-        var content = $(xhr.responseText);
+        const title = response.headers.get("X-Page-Title");
+        if (title) document.title = decodeURIComponent(title);

 
 

-        if (xhr.getResponseHeader("X-Page-Title")) {
-          var title = xhr.getResponseHeader("X-Page-Title");
-          document.title = decodeURIComponent(title);
-        }
+        return response.text();
+      })
+      .then(html => {
+        const content = $(html);

 
         $("head")
           .find("link[type=\"application/atom+xml\"]")
 
         $("head")
           .find("link[type=\"application/atom+xml\"]")


@@ -83,11 +75,13 @@ $(document).ready(function () {
         if (callback) {
           callback();
         }
         if (callback) {
           callback();
         }

-      }
-    });
+      });

   };
 
   };
 

-  var params = OSM.mapParams();
+  const token = $("head").data("oauthToken");
+  if (token) OSM.oauth = { authorization: "Bearer " + token };
+
+  const params = OSM.mapParams();

 
   map.attributionControl.setPrefix("");
 
 
   map.attributionControl.setPrefix("");
 


@@ -99,60 +93,58 @@ $(document).ready(function () {
     }
   });
 
     }
   });
 

-  var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
-
-  L.OSM.zoom({ position: position })
+  const 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: I18n.t("javascripts.map.locate.popup")
-    }
-  }).addTo(map);
+  const 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");
+    const firstContainer = controls[0].getContainer();
+    $(firstContainer).find(".control-button").first()
+      .addClass("control-button-first");

 
 

-  var sidebar = L.OSM.sidebar("#map-ui")
-    .addTo(map);
+    const 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);


@@ -160,12 +152,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);
     }


@@ -175,51 +167,49 @@ $(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();
+  const expiry = new Date();

   expiry.setYear(expiry.getFullYear() + 10);
 
   expiry.setYear(expiry.getFullYear() + 10);
 

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

     updateLinks(
       map.getCenter().wrap(),
       map.getZoom(),
       map.getLayersCode(),
       map._object);
 
     updateLinks(
       map.getCenter().wrap(),
       map.getZoom(),
       map.getLayersCode(),
       map._object);
 

-    $.removeCookie("_osm_location");
-    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+    Cookies.set("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/", samesite: "lax" });

   });
 
   });
 

-  if ($.cookie("_osm_welcome") !== "hide") {
-    $(".welcome").addClass("visible");
+  if (Cookies.get("_osm_welcome") !== "hide") {
+    $(".welcome").removeAttr("hidden");

   }
 
   }
 

-  $(".welcome .close-wrap").on("click", function () {
-    $(".welcome").removeClass("visible");
-    $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" });
+  $(".welcome .btn-close").on("click", function () {
+    $(".welcome").hide();
+    Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });

   });
 
   });
 

-  var bannerExpiry = new Date();
+  const bannerExpiry = new Date();

   bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
 
   bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
 

-  $("#banner .close-wrap").on("click", function (e) {
-    var cookieId = e.target.id;
+  $("#banner .btn-close").on("click", function (e) {
+    const cookieId = e.target.id;

     $("#banner").hide();
     e.preventDefault();
     if (cookieId) {
     $("#banner").hide();
     e.preventDefault();
     if (cookieId) {

-      $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" });
+      Cookies.set(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/", samesite: "lax" });

     }
   });
 
     }
   });
 

-  if (OSM.PIWIK) {
-    map.on("layeradd", function (e) {
+  if (OSM.MATOMO) {
+    map.on("baselayerchange overlayadd", function (e) {

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

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

 
         if (goal) {
 
         if (goal) {

-          $("body").trigger("piwikgoal", goal);
+          $("body").trigger("matomogoal", goal);

         }
       }
     });
         }
       }
     });


@@ -235,56 +225,38 @@ $(document).ready(function () {
     L.marker([params.mlat, params.mlon]).addTo(map);
   }
 
     L.marker([params.mlat, params.mlon]).addTo(map);
   }
 

-  $("#homeanchor").on("click", function (e) {
-    e.preventDefault();
-
-    var data = $(this).data(),
-        center = L.latLng(data.lat, data.lon);
-
-    map.setView(center, data.zoom);
-    L.marker(center, { icon: OSM.getUserIcon() }).addTo(map);
-  });
-

   function remoteEditHandler(bbox, object) {
   function remoteEditHandler(bbox, object) {

-    var loaded = false,
-        url,
-        query = {
-          left: bbox.getWest() - 0.0001,
-          top: bbox.getNorth() + 0.0001,
-          right: bbox.getEast() + 0.0001,
-          bottom: bbox.getSouth() - 0.0001
-        };
-
-    if (location.protocol === "http" ||
-        bowser.check({ chrome: "53", firefox: "55" })) {
-      url = "http://127.0.0.1:8111/load_and_zoom?";
-    } else {
-      url = "https://127.0.0.1:8112/load_and_zoom?";
-    }
-
-    if (object) query.select = object.type + object.id;
+    const 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
+          });

 
 

-    var iframe = $("<iframe>")
-      .hide()
-      .appendTo("body")
-      .attr("src", url + querystring.stringify(query))
-      .on("load", function () {
-        $(this).remove();
-        loaded = true;
+    if (object && object.type !== "note") query.set("select", object.type + object.id); // can't select notes
+    sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + query)
+      .then(() => {
+        if (object && object.type === "note") {
+          const noteQuery = new URLSearchParams({ url: osmHost + OSM.apiUrl(object) });
+          sendRemoteEditCommand(remoteEditHost + "/import?" + noteQuery);
+        }
+      })
+      .catch(() => {
+        // eslint-disable-next-line no-alert
+        alert(I18n.t("site.index.remote_failed"));

       });
 
       });
 

-    setTimeout(function () {
-      if (!loaded) {
-        alert(I18n.t("site.index.remote_failed"));
-        iframe.remove();
-      }
-    }, 1000);
+    function sendRemoteEditCommand(url) {
+      return fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(5000) });
+    }

 
     return false;
   }
 
   $("a[data-editor=remote]").click(function (e) {
 
     return false;
   }
 
   $("a[data-editor=remote]").click(function (e) {

-    var params = OSM.mapParams(this.search);
+    const params = OSM.mapParams(this.search);

     remoteEditHandler(map.getBounds(), params.object);
     e.preventDefault();
   });
     remoteEditHandler(map.getBounds(), params.object);
     e.preventDefault();
   });


@@ -304,7 +276,7 @@ $(document).ready(function () {
   }
 
   OSM.Index = function (map) {
   }
 
   OSM.Index = function (map) {

-    var page = {};
+    const page = {};

 
     page.pushstate = page.popstate = function () {
       map.setSidebarOverlaid(true);
 
     page.pushstate = page.popstate = function () {
       map.setSidebarOverlaid(true);


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

-      var params = querystring.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();


@@ -326,21 +298,22 @@ $(document).ready(function () {
   };
 
   OSM.Browse = function (map, type) {
   };
 
   OSM.Browse = function (map, type) {

-    var page = {};
+    const page = {};

 
 

-    page.pushstate = page.popstate = function (path, id) {
+    page.pushstate = page.popstate = function (path, id, version) {

       OSM.loadSidebarContent(path, function () {
       OSM.loadSidebarContent(path, function () {

-        addObject(type, id);
+        addObject(type, id, version);

       });
     };
 
       });
     };
 

-    page.load = function (path, id) {
-      addObject(type, id, true);
+    page.load = function (path, id, version) {
+      addObject(type, id, version, true);

     };
 
     };
 

-    function addObject(type, id, center) {
-      map.addObject({ type: type, id: parseInt(id, 10) }, function (bounds) {
-        if (!window.location.hash && bounds.isValid() &&
+    function addObject(type, id, version, center) {
+      const hashParams = OSM.parseHash(window.location.hash);
+      map.addObject({ type: type, id: parseInt(id, 10), version: version && parseInt(version, 10) }, function (bounds) {
+        if (!hashParams.center && bounds.isValid() &&

             (center || !map.getBounds().contains(bounds))) {
           OSM.router.withoutMoveListener(function () {
             map.fitBounds(bounds);
             (center || !map.getBounds().contains(bounds))) {
           OSM.router.withoutMoveListener(function () {
             map.fitBounds(bounds);


@@ -356,7 +329,17 @@ $(document).ready(function () {
     return page;
   };
 
     return page;
   };
 

-  var history = OSM.History(map);
+  OSM.OldBrowse = function () {
+    const page = {};
+
+    page.pushstate = page.popstate = function (path) {
+      OSM.loadSidebarContent(path);
+    };
+
+    return page;
+  };
+
+  const history = OSM.History(map);

 
   OSM.router = OSM.Router(map, {
     "/": OSM.Index(map),
 
   OSM.router = OSM.Router(map, {
     "/": OSM.Index(map),


@@ -370,10 +353,14 @@ $(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.Browse(map, "node"),

     "/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),
     "/changeset/:id": OSM.Changeset(map),

-    "/query": OSM.Query(map)
+    "/query": OSM.Query(map),
+    "/account/home": OSM.Home(map)

   });
 
   if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {
   });
 
   if (OSM.preferred_editor === "remote" && document.location.pathname === "/edit") {


@@ -384,7 +371,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;
     }
 


@@ -400,6 +387,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));
+  });

 });
 });