Do not call AttributionControl._update for removed tile layer

umap-project · Dec 14, 2023 · beb9e38 · beb9e38
1 parent 8ce09b0
commit beb9e38
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
@@ -1246,8 +1246,10 @@ L.U.AttributionControl = L.Control.Attribution.extend({
   },
 
   _update: function () {
+    // Layer is no more on the map
+    if (!this._map) return
     L.Control.Attribution.prototype._update.call(this)
-    // Use our how container, so we can hide/show on small screens
+    // Use our own container, so we can hide/show on small screens
     const credits = this._container.innerHTML
     this._container.innerHTML = ''
     const container = L.DomUtil.add(

diff --git a/umap/tests/base.py b/umap/tests/base.py
@@ -81,7 +81,7 @@ class MapFactory(factory.django.DjangoModelFactory):
                     "attribution": "\xa9 OSM Contributors",
                     "maxZoom": 18,
                     "minZoom": 0,
-                    "url_template": "http://{s}.osm.fr/{z}/{x}/{y}.png",
+                    "url_template": "https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png",
                 },
                 "tilelayersControl": True,
                 "zoom": 7,

diff --git a/umap/tests/integration/test_export_map.py b/umap/tests/integration/test_export_map.py
@@ -61,7 +61,7 @@ def test_umap_export(map, live_server, datalayer, page):
                 "attribution": "© OSM Contributors",
                 "maxZoom": 18,
                 "minZoom": 0,
-                "url_template": "http://{s}.osm.fr/{z}/{x}/{y}.png",
+                "url_template": "https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png",
             },
             "tilelayersControl": True,
             "zoom": 7,

diff --git a/umap/tests/test_map_views.py b/umap/tests/test_map_views.py
@@ -624,7 +624,7 @@ def test_download(client, map, datalayer):
             "attribution": "© OSM Contributors",
             "maxZoom": 18,
             "minZoom": 0,
-            "url_template": "http://{s}.osm.fr/{z}/{x}/{y}.png",
+            "url_template": "https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png",
         },
         "tilelayersControl": True,
         "zoom": 7,