Add history changesets layer module

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 1d167d977fb70e85481179b0671e963c9bc1c08a..5f8a931e3956132583e8a9f52734b9621b698a70 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,4 +1,4 @@
-//= require leaflet.locatecontrol/dist/L.Control.Locate.umd
+//= require leaflet.locate
 
 (function () {
   $(document).on("change", "#user_all", function () {
@@ -6,9 +6,9 @@
   });
 }());
 
-$(document).ready(function () {
-  var defaultHomeZoom = 12;
-  var map, marker, deleted_lat, deleted_lon;
+$(function () {
+  const defaultHomeZoom = 12;
+  let map, marker, deleted_lat, deleted_lon;
 
   if ($("#map").length) {
     map = L.map("map", {
@@ -16,32 +16,11 @@ $(document).ready(function () {
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 
-    var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
+    const position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
 
-    L.OSM.zoom({ position: position })
-      .addTo(map);
+    L.OSM.zoom({ position }).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 locateContainer = locate.getContainer();
-
-    $(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");
+    L.OSM.locate({ position }).addTo(map);
 
     if (OSM.home) {
       map.setView([OSM.home.lat, OSM.home.lon], defaultHomeZoom);
@@ -51,7 +30,7 @@ $(document).ready(function () {
 
     if ($("#map").hasClass("set_location")) {
       marker = L.marker([0, 0], {
-        icon: OSM.getUserIcon(),
+        icon: OSM.getMarker({}),
         keyboard: false,
         interactive: false
       });
@@ -64,7 +43,7 @@ $(document).ready(function () {
       map.on("click", function (e) {
         if (!$("#updatehome").is(":checked")) return;
 
-        const [lat, lon] = OSM.cropLocation(e.latlng);
+        const [lat, lon] = OSM.cropLocation(e.latlng, map.getZoom());
 
         $("#home_lat").val(lat);
         $("#home_lon").val(lon);
@@ -73,9 +52,9 @@ $(document).ready(function () {
         deleted_lon = null;
         respondToHomeUpdate();
       }).on("moveend", function () {
-        var lat = $("#home_lat").val().trim(),
-            lon = $("#home_lon").val().trim(),
-            location;
+        const lat = $("#home_lat").val().trim(),
+              lon = $("#home_lon").val().trim();
+        let location;
 
         try {
           if (lat && lon) {
@@ -95,15 +74,15 @@ $(document).ready(function () {
       });
 
       $("#home_show").click(function () {
-        var lat = $("#home_lat").val(),
-            lon = $("#home_lon").val();
+        const lat = $("#home_lat").val(),
+              lon = $("#home_lon").val();
 
         map.setView([lat, lon], defaultHomeZoom);
       });
 
       $("#home_delete").click(function () {
-        var lat = $("#home_lat").val(),
-            lon = $("#home_lon").val();
+        const lat = $("#home_lat").val(),
+              lon = $("#home_lon").val();
 
         $("#home_lat, #home_lon").val("");
         deleted_lat = lat;
@@ -122,9 +101,9 @@ $(document).ready(function () {
       });
     } else {
       $("[data-user]").each(function () {
-        var user = $(this).data("user");
+        const user = $(this).data("user");
         if (user.lon && user.lat) {
-          L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map)
+          L.marker([user.lat, user.lon], { icon: OSM.getMarker({ icon: user.icon }) }).addTo(map)
             .bindPopup(user.description, { minWidth: 200 });
         }
       });
@@ -132,9 +111,9 @@ $(document).ready(function () {
   }
 
   function respondToHomeUpdate() {
-    var lat = $("#home_lat").val().trim(),
-        lon = $("#home_lon").val().trim(),
-        location;
+    const lat = $("#home_lat").val().trim(),
+          lon = $("#home_lon").val().trim();
+    let location;
 
     try {
       if (lat && lon) {
@@ -160,14 +139,14 @@ $(document).ready(function () {
   }
 
   function isCloseEnoughToMapCenter(location) {
-    var inputPt = map.latLngToContainerPoint(location),
-        centerPt = map.latLngToContainerPoint(map.getCenter());
+    const inputPt = map.latLngToContainerPoint(location),
+          centerPt = map.latLngToContainerPoint(map.getCenter());
 
     return centerPt.distanceTo(inputPt) < 10;
   }
 
   function updateAuthUID() {
-    var provider = $("select#user_auth_provider").val();
+    const provider = $("select#user_auth_provider").val();
 
     if (provider === "openid") {
       $("input#user_auth_uid").show().prop("disabled", false);
@@ -210,10 +189,10 @@ $(document).ready(function () {
   });
 
   $("input[name=legale]").change(function () {
-    var url = $(this).data("url");
-
-    $("#contributorTerms").html("<div class='spinner-border' role='status'><span class='visually-hidden'>" + I18n.t("browse.start_rjs.loading") + "</span></div>");
-    $("#contributorTerms").load(url);
+    $("#contributorTerms").html("<div class='spinner-border' role='status'><span class='visually-hidden'>" + OSM.i18n.t("browse.start_rjs.loading") + "</span></div>");
+    fetch($(this).data("url"))
+      .then(r => r.text())
+      .then(html => { $("#contributorTerms").html(html); });
   });
 
   $("#read_ct").on("click", function () {