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

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

diff --git a/app/assets/javascripts/leaflet.locate.js b/app/assets/javascripts/leaflet.locate.js
index d43a5e458fe4e1615f445509bb32bf9c230d8839..81b4f1a4eef496fd1691c54e61c9cac43d00e960 100644 (file)
--- a/app/assets/javascripts/leaflet.locate.js
+++ b/app/assets/javascripts/leaflet.locate.js
@@ -1,5 +1,5 @@
 L.OSM.locate = function (options) {
 L.OSM.locate = function (options) {

-  var control = L.control.locate(Object.assign({
+  const control = L.control.locate({

     icon: "icon geolocate",
     iconLoading: "icon geolocate",
     strings: {
     icon: "icon geolocate",
     iconLoading: "icon geolocate",
     strings: {


@@ -7,11 +7,12 @@ L.OSM.locate = function (options) {
       popup: function (options) {
         return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
       }
       popup: function (options) {
         return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
       }

-    }
-  }, options));
+    },
+    ...options
+  });

 
   control.onAdd = function (map) {
 
   control.onAdd = function (map) {

-    var container = Object.getPrototypeOf(this).onAdd.apply(this, [map]);
+    const container = Object.getPrototypeOf(this).onAdd.apply(this, [map]);

     $(container)
       .removeClass("leaflet-control-locate leaflet-bar")
       .addClass("control-locate")
     $(container)
       .removeClass("leaflet-control-locate leaflet-bar")
       .addClass("control-locate")