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

[rails.git] / app / assets / javascripts / leaflet.map.js

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index c8377226a0b725b9564905c0396817818e7426fb..6e42d4ac103e88f45259870aba389b104da82aad 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -10,79 +10,122 @@ L.extend(L.LatLngBounds.prototype, {
 });
 
 L.OSM.Map = L.Map.extend({
 });
 
 L.OSM.Map = L.Map.extend({

-  initialize: function(id, options) {
+  initialize: function (id, options) {

     L.Map.prototype.initialize.call(this, id, options);
 
     L.Map.prototype.initialize.call(this, id, options);
 

-    var copyright = I18n.t("javascripts.map.copyright", {copyright_url: "/copyright"});
-    var donate = I18n.t("javascripts.map.donate_link_text", {donate_url: "https://donate.openstreetmap.org"});
-

     this.baseLayers = [];
 
     this.baseLayers = [];
 

-    this.baseLayers.push(new L.OSM.Mapnik({
-      attribution: copyright + " ♥ " + donate,
-      code: "M",
-      keyid: "mapnik",
-      name: I18n.t("javascripts.map.base.standard")
-    }));
-
-    if (OSM.THUNDERFOREST_KEY) {
-      this.baseLayers.push(new L.OSM.CycleMap({
-        attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
-        apikey: OSM.THUNDERFOREST_KEY,
-        code: "C",
-        keyid: "cyclemap",
-        name: I18n.t("javascripts.map.base.cycle_map")
-      }));
-
-      this.baseLayers.push(new L.OSM.TransportMap({
-        attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
-        apikey: OSM.THUNDERFOREST_KEY,
-        code: "T",
-        keyid: "transportmap",
-        name: I18n.t("javascripts.map.base.transport_map")
-      }));
-    }
+    for (const layerDefinition of OSM.LAYER_DEFINITIONS) {
+      if (layerDefinition.apiKeyId && !OSM[layerDefinition.apiKeyId]) continue;
+
+      let layerConstructor = L.OSM.TileLayer;
+      const layerOptions = {};
+
+      for (const [property, value] of Object.entries(layerDefinition)) {
+        if (property === "credit") {
+          layerOptions.attribution = makeAttribution(value);
+        } else if (property === "nameId") {
+          layerOptions.name = I18n.t(`javascripts.map.base.${value}`);
+        } else if (property === "apiKeyId") {
+          layerOptions.apikey = OSM[value];
+        } else if (property === "leafletOsmId") {
+          layerConstructor = L.OSM[value];
+        } else if (property === "leafletOsmDarkId" && OSM.isDarkMap() && L.OSM[value]) {
+          layerConstructor = L.OSM[value];
+        } else {
+          layerOptions[property] = value;
+        }
+      }

 
 

-    this.baseLayers.push(new L.OSM.HOT({
-      attribution: copyright + ". Tiles style by <a href='https://www.hotosm.org/' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='https://openstreetmap.fr/' target='_blank'>OpenStreetMap France</a>",
-      code: "H",
-      keyid: "hot",
-      name: I18n.t("javascripts.map.base.hot")
-    }));
+      const layer = new layerConstructor(layerOptions);
+      layer.on("add", () => {
+        this.fire("baselayerchange", { layer: layer });
+      });
+      this.baseLayers.push(layer);
+    }

 
     this.noteLayer = new L.FeatureGroup();
 
     this.noteLayer = new L.FeatureGroup();

-    this.noteLayer.options = {code: "N"};
+    this.noteLayer.options = { code: "N" };

 
     this.dataLayer = new L.OSM.DataLayer(null);
     this.dataLayer.options.code = "D";
 
     this.gpsLayer = new L.OSM.GPS({
       pane: "overlayPane",
 
     this.dataLayer = new L.OSM.DataLayer(null);
     this.dataLayer.options.code = "D";
 
     this.gpsLayer = new L.OSM.GPS({
       pane: "overlayPane",

-      code: "G",
-      name: I18n.t("javascripts.map.base.gps")
+      code: "G"
+    });
+    this.gpsLayer.on("add", () => {
+      this.fire("overlayadd", { layer: this.gpsLayer });
+    }).on("remove", () => {
+      this.fire("overlayremove", { layer: this.gpsLayer });

     });
 
     });
 

-    this.on("layeradd", function (event) {
+
+    this.on("baselayerchange", function (event) {

       if (this.baseLayers.indexOf(event.layer) >= 0) {
         this.setMaxZoom(event.layer.options.maxZoom);
       }
     });
       if (this.baseLayers.indexOf(event.layer) >= 0) {
         this.setMaxZoom(event.layer.options.maxZoom);
       }
     });

-  },

 
 

-  updateLayers: function(layerParam) {
-    layerParam = layerParam || "M";
-    var layersAdded = "";
+    function makeAttribution(credit) {
+      let attribution = "";
+
+      attribution += I18n.t("javascripts.map.copyright_text", {
+        copyright_link: $("<a>", {
+          href: "/copyright",
+          text: I18n.t("javascripts.map.openstreetmap_contributors")
+        }).prop("outerHTML")
+      });
+
+      attribution += credit.donate ? " &hearts; " : ". ";
+      attribution += makeCredit(credit);
+      attribution += ". ";
+
+      attribution += $("<a>", {
+        href: "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
+        text: I18n.t("javascripts.map.website_and_api_terms")
+      }).prop("outerHTML");

 
 

-    for (var i = this.baseLayers.length - 1; i >= 0; i--) {
-      if (layerParam.indexOf(this.baseLayers[i].options.code) >= 0) {
-        this.addLayer(this.baseLayers[i]);
-        layersAdded = layersAdded + this.baseLayers[i].options.code;
-      } else if (i === 0 && layersAdded === "") {
-        this.addLayer(this.baseLayers[i]);
+      return attribution;
+    }
+
+    function makeCredit(credit) {
+      const children = {};
+      for (const childId in credit.children) {
+        children[childId] = makeCredit(credit.children[childId]);
+      }
+      const text = I18n.t(`javascripts.map.${credit.id}`, children);
+      if (credit.href) {
+        const link = $("<a>", {
+          href: credit.href,
+          text: text
+        });
+        if (credit.donate) {
+          link.addClass("donate-attr");
+        } else {
+          link.attr("target", "_blank");
+        }
+        return link.prop("outerHTML");

       } else {
       } else {

-        this.removeLayer(this.baseLayers[i]);
+        return text;
+      }
+    }
+  },
+
+  updateLayers: function (layerParam) {
+    const oldBaseLayer = this.getMapBaseLayer();
+    let newBaseLayer;
+
+    for (const layer of this.baseLayers) {
+      if (!newBaseLayer || layerParam.includes(layer.options.code)) {
+        newBaseLayer = layer;

       }
     }
       }
     }

+
+    if (newBaseLayer !== oldBaseLayer) {
+      if (oldBaseLayer) this.removeLayer(oldBaseLayer);
+      if (newBaseLayer) this.addLayer(newBaseLayer);
+    }

   },
 
   getLayersCode: function () {
   },
 
   getLayersCode: function () {


@@ -96,26 +139,26 @@ L.OSM.Map = L.Map.extend({
   },
 
   getMapBaseLayerId: function () {
   },
 
   getMapBaseLayerId: function () {

-    var baseLayer;
-    this.eachLayer(function (layer) {
-      if (layer.options && layer.options.keyid) baseLayer = layer;
-    });
-    return baseLayer.keyid;
+    const layer = this.getMapBaseLayer();
+    if (layer) return layer.options.layerId;
+  },
+
+  getMapBaseLayer: function () {
+    for (const layer of this.baseLayers) {
+      if (this.hasLayer(layer)) return layer;
+    }

   },
 
   },
 

-  getUrl: function(marker) {
-    var precision = OSM.zoomPrecision(this.getZoom()),
-        params = {};
+  getUrl: function (marker) {
+    const params = {};

 
     if (marker && this.hasLayer(marker)) {
 
     if (marker && this.hasLayer(marker)) {

-      var latLng = marker.getLatLng().wrap();
-      params.mlat = latLng.lat.toFixed(precision);
-      params.mlon = latLng.lng.toFixed(precision);
+      [params.mlat, params.mlon] = OSM.cropLocation(marker.getLatLng(), this.getZoom());

     }
 
     var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
     }
 
     var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",

-      query = querystring.stringify(params),
-      hash = OSM.formatHash(this);
+        query = new URLSearchParams(params),
+        hash = OSM.formatHash(this);

 
     if (query) url += "?" + query;
     if (hash) url += hash;
 
     if (query) url += "?" + query;
     if (hash) url += hash;


@@ -123,61 +166,63 @@ L.OSM.Map = L.Map.extend({
     return url;
   },
 
     return url;
   },
 

-  getShortUrl: function(marker) {
+  getShortUrl: function (marker) {

     var zoom = this.getZoom(),
     var zoom = this.getZoom(),

-      latLng = marker && this.hasLayer(marker) ? marker.getLatLng().wrap() : this.getCenter().wrap(),
-      str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
-        window.location.protocol + "//osm.org/go/" :
-        window.location.protocol + "//" + window.location.hostname + "/go/",
-      char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",
-      x = Math.round((latLng.lng + 180.0) * ((1 << 30) / 90.0)),
-      y = Math.round((latLng.lat + 90.0) * ((1 << 30) / 45.0)),
-      // JavaScript only has to keep 32 bits of bitwise operators, so this has to be
-      // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
-      // and drops the last 4 bits of the full 64 bit Morton code.
-      c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff),
-      digit,
-      i;
+        latLng = marker && this.hasLayer(marker) ? marker.getLatLng().wrap() : this.getCenter().wrap(),
+        str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
+          window.location.protocol + "//osm.org/go/" :
+          window.location.protocol + "//" + window.location.hostname + "/go/",
+        char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",
+        x = Math.round((latLng.lng + 180.0) * ((1 << 30) / 90.0)),
+        y = Math.round((latLng.lat + 90.0) * ((1 << 30) / 45.0)),
+        // JavaScript only has to keep 32 bits of bitwise operators, so this has to be
+        // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
+        // and drops the last 4 bits of the full 64 bit Morton code.
+        c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff),
+        digit,
+        i;

 
     for (i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
 
     for (i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {

-      digit = (c1 >> (24 - 6 * i)) & 0x3f;
+      digit = (c1 >> (24 - (6 * i))) & 0x3f;

       str += char_array.charAt(digit);
     }
     for (i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {
       str += char_array.charAt(digit);
     }
     for (i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {

-      digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
+      digit = (c2 >> (24 - (6 * (i - 5)))) & 0x3f;

       str += char_array.charAt(digit);
     }
     for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-";
 
     // Called to interlace the bits in x and y, making a Morton code.
     function interlace(x, y) {
       str += char_array.charAt(digit);
     }
     for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-";
 
     // Called to interlace the bits in x and y, making a Morton code.
     function interlace(x, y) {

-      x = (x | (x << 8)) & 0x00ff00ff;
-      x = (x | (x << 4)) & 0x0f0f0f0f;
-      x = (x | (x << 2)) & 0x33333333;
-      x = (x | (x << 1)) & 0x55555555;
-      y = (y | (y << 8)) & 0x00ff00ff;
-      y = (y | (y << 4)) & 0x0f0f0f0f;
-      y = (y | (y << 2)) & 0x33333333;
-      y = (y | (y << 1)) & 0x55555555;
-      return (x << 1) | y;
+      var interlaced_x = x,
+          interlaced_y = y;
+      interlaced_x = (interlaced_x | (interlaced_x << 8)) & 0x00ff00ff;
+      interlaced_x = (interlaced_x | (interlaced_x << 4)) & 0x0f0f0f0f;
+      interlaced_x = (interlaced_x | (interlaced_x << 2)) & 0x33333333;
+      interlaced_x = (interlaced_x | (interlaced_x << 1)) & 0x55555555;
+      interlaced_y = (interlaced_y | (interlaced_y << 8)) & 0x00ff00ff;
+      interlaced_y = (interlaced_y | (interlaced_y << 4)) & 0x0f0f0f0f;
+      interlaced_y = (interlaced_y | (interlaced_y << 2)) & 0x33333333;
+      interlaced_y = (interlaced_y | (interlaced_y << 1)) & 0x55555555;
+      return (interlaced_x << 1) | interlaced_y;

     }
 
     }
 

-    var params = {};
+    const params = new URLSearchParams();

     var layers = this.getLayersCode().replace("M", "");
 
     if (layers) {
     var layers = this.getLayersCode().replace("M", "");
 
     if (layers) {

-      params.layers = layers;
+      params.set("layers", layers);

     }
 
     if (marker && this.hasLayer(marker)) {
     }
 
     if (marker && this.hasLayer(marker)) {

-      params.m = "";
+      params.set("m", "");

     }
 
     if (this._object) {
     }
 
     if (this._object) {

-      params[this._object.type] = this._object.id;
+      params.set(this._object.type, this._object.id);

     }
 
     }
 

-    var query = querystring.stringify(params);
+    const query = params.toString();

     if (query) {
       str += "?" + query;
     }
     if (query) {
       str += "?" + query;
     }


@@ -185,25 +230,18 @@ L.OSM.Map = L.Map.extend({
     return str;
   },
 
     return str;
   },
 

-  getGeoUri: function(marker) {
-    var precision = OSM.zoomPrecision(this.getZoom()),
-        latLng,
-        params = {};
+  getGeoUri: function (marker) {
+    let latLng = this.getCenter();
+    const zoom = this.getZoom();

 
     if (marker && this.hasLayer(marker)) {
 
     if (marker && this.hasLayer(marker)) {

-      latLng = marker.getLatLng().wrap();
-    } else {
-      latLng = this.getCenter();
+      latLng = marker.getLatLng();

     }
 
     }
 

-    params.lat = latLng.lat.toFixed(precision);
-    params.lon = latLng.lng.toFixed(precision);
-    params.zoom = this.getZoom();
-
-    return "geo:" + params.lat + "," + params.lon + "?z=" + params.zoom;
+    return `geo:${OSM.cropLocation(latLng, zoom).join(",")}?z=${zoom}`;

   },
 
   },
 

-  addObject: function(object, callback) {
+  addObject: function (object, callback) {

     var objectStyle = {
       color: "#FF6200",
       weight: 4,
     var objectStyle = {
       color: "#FF6200",
       weight: 4,


@@ -219,51 +257,89 @@ L.OSM.Map = L.Map.extend({
       interactive: false
     };
 
       interactive: false
     };
 

-    this.removeObject();
+    var haloStyle = {
+      weight: 2.5,
+      radius: 20,
+      fillOpacity: 0.5,
+      color: "#FF6200"
+    };

 
 

-    var map = this;
-    this._objectLoader = $.ajax({
-      url: OSM.apiUrl(object),
-      dataType: "xml",
-      success: function (xml) {
-        map._object = object;
-
-        map._objectLayer = new L.OSM.DataLayer(null, {
-          styles: {
-            node: objectStyle,
-            way: objectStyle,
-            area: objectStyle,
-            changeset: changesetStyle
-          }
-        });
+    this.removeObject();

 
 

-        map._objectLayer.interestingNode = function (node, ways, relations) {
-          if (object.type === "node") {
-            return true;
-          } else if (object.type === "relation") {
-            for (var i = 0; i < relations.length; i++)
-              if (relations[i].members.indexOf(node) !== -1)
-                return true;
-          } else {
-            return false;
-          }
-        };
-
-        map._objectLayer.addData(xml);
-        map._objectLayer.addTo(map);
-
-        if (callback) callback(map._objectLayer.getBounds());
+    if (object.type === "note" || object.type === "changeset") {
+      this._objectLoader = {
+        abort: function () {}
+      };
+
+      this._object = object;
+      this._objectLayer = L.featureGroup().addTo(this);
+
+      if (object.type === "note") {
+        L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
+
+        if (object.icon) {
+          L.marker(object.latLng, {
+            icon: object.icon,
+            opacity: 1,
+            interactive: true
+          }).addTo(this._objectLayer);
+        }
+      } else if (object.type === "changeset") {
+        if (object.bbox) {
+          L.rectangle([
+            [object.bbox.minlat, object.bbox.minlon],
+            [object.bbox.maxlat, object.bbox.maxlon]
+          ], changesetStyle).addTo(this._objectLayer);
+        }

       }
       }

-    });
+
+      if (callback) callback(this._objectLayer.getBounds());
+      this.fire("overlayadd", { layer: this._objectLayer });
+    } else { // element handled by L.OSM.DataLayer
+      var map = this;
+      this._objectLoader = $.ajax({
+        url: OSM.apiUrl(object),
+        dataType: "json",
+        success: function (data) {
+          map._object = object;
+
+          map._objectLayer = new L.OSM.DataLayer(null, {
+            styles: {
+              node: objectStyle,
+              way: objectStyle,
+              area: objectStyle,
+              changeset: changesetStyle
+            }
+          });
+
+          map._objectLayer.interestingNode = function (node, wayNodes, relationNodes) {
+            if (object.type === "node") {
+              return true;
+            } else if (object.type === "relation") {
+              return Boolean(relationNodes[node.id]);
+            } else {
+              return false;
+            }
+          };
+
+          map._objectLayer.addData(data);
+          map._objectLayer.addTo(map);
+
+          if (callback) callback(map._objectLayer.getBounds());
+          map.fire("overlayadd", { layer: map._objectLayer });
+        }
+      });
+    }

   },
 
   },
 

-  removeObject: function() {
+  removeObject: function () {

     this._object = null;
     if (this._objectLoader) this._objectLoader.abort();
     if (this._objectLayer) this.removeLayer(this._objectLayer);
     this._object = null;
     if (this._objectLoader) this._objectLoader.abort();
     if (this._objectLayer) this.removeLayer(this._objectLayer);

+    this.fire("overlayremove", { layer: this._objectLayer });

   },
 
   },
 

-  getState: function() {
+  getState: function () {

     return {
       center: this.getCenter().wrap(),
       zoom: this.getZoom(),
     return {
       center: this.getCenter().wrap(),
       zoom: this.getZoom(),


@@ -271,20 +347,25 @@ L.OSM.Map = L.Map.extend({
     };
   },
 
     };
   },
 

-  setState: function(state, options) {
+  setState: function (state, options) {

     if (state.center) this.setView(state.center, state.zoom, options);
     if (state.layers) this.updateLayers(state.layers);
   },
 
     if (state.center) this.setView(state.center, state.zoom, options);
     if (state.layers) this.updateLayers(state.layers);
   },
 

-  setSidebarOverlaid: function(overlaid) {
+  setSidebarOverlaid: function (overlaid) {
+    var sidebarWidth = 350;

     if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
       $("#content").addClass("overlay-sidebar");
     if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
       $("#content").addClass("overlay-sidebar");

-      this.invalidateSize({pan: false})
-        .panBy([-350, 0], {animate: false});
+      this.invalidateSize({ pan: false });
+      if ($("html").attr("dir") !== "rtl") {
+        this.panBy([-sidebarWidth, 0], { animate: false });
+      }

     } else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {
     } else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {

-      this.panBy([350, 0], {animate: false});
+      if ($("html").attr("dir") !== "rtl") {
+        this.panBy([sidebarWidth, 0], { animate: false });
+      }

       $("#content").removeClass("overlay-sidebar");
       $("#content").removeClass("overlay-sidebar");

-      this.invalidateSize({pan: false});
+      this.invalidateSize({ pan: false });

     }
     return this;
   }
     }
     return this;
   }


@@ -301,12 +382,20 @@ L.Icon.Default.imageUrls = {
 L.extend(L.Icon.Default.prototype, {
   _oldGetIconUrl: L.Icon.Default.prototype._getIconUrl,
 
 L.extend(L.Icon.Default.prototype, {
   _oldGetIconUrl: L.Icon.Default.prototype._getIconUrl,
 

-  _getIconUrl:  function (name) {
+  _getIconUrl: function (name) {

     var url = this._oldGetIconUrl(name);
     return L.Icon.Default.imageUrls[url];
   }
 });
 
     var url = this._oldGetIconUrl(name);
     return L.Icon.Default.imageUrls[url];
   }
 });
 

+OSM.isDarkMap = function () {
+  var mapTheme = $("body").attr("data-map-theme");
+  if (mapTheme) return mapTheme === "dark";
+  var siteTheme = $("html").attr("data-bs-theme");
+  if (siteTheme) return siteTheme === "dark";
+  return window.matchMedia("(prefers-color-scheme: dark)").matches;
+};
+

 OSM.getUserIcon = function (url) {
   return L.icon({
     iconUrl: url || OSM.MARKER_RED,
 OSM.getUserIcon = function (url) {
   return L.icon({
     iconUrl: url || OSM.MARKER_RED,