umap-project 2.6.3__py3-none-any.whl → 2.7.0__py3-none-any.whl

umap/templates/umap/css.html

@@ -10,8 +10,6 @@
       href="{% static 'umap/vendors/editinosm/Leaflet.EditInOSM.css' %}" />
 <link rel="stylesheet"
       href="{% static 'umap/vendors/minimap/Control.MiniMap.min.css' %}" />
-<link rel="stylesheet"
-      href="{% static 'umap/vendors/contextmenu/leaflet.contextmenu.min.css' %}" />
 <link rel="stylesheet"
       href="{% static 'umap/vendors/toolbar/leaflet.toolbar.css' %}" />
 <link rel="stylesheet"

umap/templates/umap/dashboard_menu.html

@@ -7,8 +7,10 @@
     {% else %}
       <a href="{% url 'user_dashboard' %}">{% trans "My Maps" %}</a>
     {% endif %}
-    <a {% if selected == "profile" %}class="selected"{% endif %}
-       href="{% url 'user_profile' %}">{% trans "My profile" %}</a>
+    {% if UMAP_ALLOW_EDIT_PROFILE %}
+      <a {% if selected == "profile" %}class="selected"{% endif %}
+         href="{% url 'user_profile' %}">{% trans "My profile" %}</a>
+    {% endif %}
     <a {% if selected == "teams" %}class="selected"{% endif %}
        href="{% url 'user_teams' %}">{% trans "My teams" %}</a>
   </h2>

umap/templates/umap/js.html

@@ -25,11 +25,7 @@
 <script src="{% static 'umap/vendors/csv2geojson/csv2geojson.js' %}" defer></script>
 <script src="{% static 'umap/vendors/osmtogeojson/osmtogeojson.js' %}" defer></script>
 <script src="{% static 'umap/vendors/loading/Control.Loading.js' %}" defer></script>
-<script src="{% static 'umap/vendors/contextmenu/leaflet.contextmenu.min.js' %}"
-        defer></script>
 <script src="{% static 'umap/vendors/photon/leaflet.photon.js' %}" defer></script>
-<script src="{% static 'umap/vendors/georsstogeojson/GeoRSSToGeoJSON.js' %}"
-        defer></script>
 <script src="{% static 'umap/vendors/fullscreen/Leaflet.fullscreen.min.js' %}"
         defer></script>
 <script src="{% static 'umap/vendors/toolbar/leaflet.toolbar.js' %}" defer></script>
@@ -40,7 +36,6 @@
 <script src="{% static 'umap/vendors/iconlayers/iconLayers.js' %}" defer></script>
 <script src="{% static 'umap/vendors/locatecontrol/L.Control.Locate.min.js' %}"
         defer></script>
-<script src="{% static 'umap/vendors/colorbrewer/colorbrewer.js' %}" defer></script>
 <script src="{% static 'umap/vendors/simple-statistics/simple-statistics.min.js' %}"
         defer></script>
 <script src="{% static 'umap/js/umap.core.js' %}" defer></script>

umap/templates/umap/map_detail.html

@@ -17,8 +17,8 @@
   {% umap_css %}
   {{ block.super }}
   {% umap_js locale=locale %}
-  {% if object.share_status != object.PUBLIC %}
-    <meta name="robots" content="noindex">
+  {% if UMAP_DEMO_SITE or object.share_status != object.PUBLIC %}
+    <meta name="robots" content="noindex,nofollow">
   {% endif %}
   <link rel="alternate"
         type="application/json+oembed"

umap/tests/fixtures/test_upload_data.csv

@@ -1,3 +1,3 @@
 Foo,Latitude,geo_Longitude,title,description
-bar,41.34,122.86,a point somewhere,the description of this point
-bar,43.34,121.86,a point somewhere else,the description of this other point
+bar,48.5,14.5,a point somewhere,the description of this point
+bar,45.7,14.7,a point somewhere else,the description of this other point

umap/tests/integration/test_anonymous_owned_map.py

@@ -156,6 +156,7 @@ def test_can_change_perms_after_create(tilelayer, live_server, page):
         ".datalayer-permissions select[name='edit_status'] option:checked"
     )
     expect(option).to_have_text("Inherit")
+    expect(page.get_by_label("Secret edit link:")).to_be_visible()
 
 
 def test_alert_message_after_create(

umap/tests/integration/test_basics.py

@@ -94,4 +94,4 @@ def test_login_from_map_page(live_server, page, tilelayer, settings, user, conte
     # Save should have proceed
     assert Map.objects.count() == 1
     # Use name should now appear on the header toolbar
-    expect(page.get_by_text("My Dashboard (Joe)")).to_be_visible()
+    expect(page.get_by_role("button", name="Joe")).to_be_visible()

umap/tests/integration/test_browser.py

@@ -81,7 +81,7 @@ def test_data_browser_should_be_open(live_server, page, bootstrap, map):
 
 
 def test_data_browser_should_be_filterable(live_server, page, bootstrap, map):
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
     expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
@@ -115,7 +115,7 @@ def test_filter_uses_layer_setting_if_any(live_server, page, bootstrap, map):
     datalayer = map.datalayer_set.first()
     datalayer.settings["labelKey"] = "foo"
     datalayer.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
     expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
@@ -154,7 +154,7 @@ def test_filter_works_with_variable_in_labelKey(live_server, page, map):
     data = deepcopy(DATALAYER_DATA)
     data["_umap_options"]["labelKey"] = "{name} ({bar})"
     DataLayerFactory(map=map, data=data)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
     expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
@@ -182,7 +182,7 @@ def test_filter_works_with_missing_name(live_server, page, map):
     data = deepcopy(DATALAYER_DATA)
     del data["features"][0]["properties"]["name"]
     DataLayerFactory(map=map, data=data, name="foobar")
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
     expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
@@ -299,7 +299,7 @@ def test_data_browser_with_variable_in_name(live_server, page, bootstrap, map):
     # Include a variable
     map.settings["properties"]["labelKey"] = "{name} ({foo})"
     map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
     expect(page.get_by_text("one point in france (point)")).to_be_visible()
     expect(page.get_by_text("one line in new zeland (line)")).to_be_visible()
     expect(page.get_by_text("one polygon in greenland (polygon)")).to_be_visible()
@@ -335,7 +335,7 @@ def test_should_sort_features_in_natural_order(live_server, map, page):
 
 
 def test_should_redraw_list_on_feature_delete(live_server, openmap, page, bootstrap):
-    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}#2/19/-2")
     # Enable edit
     page.get_by_role("button", name="Edit").click()
     buttons = page.locator(".umap-browser .datalayer li .icon-delete")
@@ -380,7 +380,7 @@ def test_should_use_color_variable(live_server, map, page):
 
 
 def test_should_allow_to_toggle_datalayer_visibility(live_server, map, page, bootstrap):
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#2/19/-2")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator(".leaflet-overlay-pane path")
     expect(markers).to_have_count(1)
@@ -414,3 +414,65 @@ def test_should_have_edit_buttons_in_edit_mode(live_server, openmap, page, boots
     expect(delete_layer).to_be_visible()
     expect(edit_feature).to_have_count(3)
     expect(delete_feature).to_have_count(3)
+
+
+def test_main_toolbox_toggle_all_layers(live_server, map, page):
+    map.settings["properties"]["onLoadPanel"] = "databrowser"
+    map.save()
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"name": "one point"},
+                "geometry": {"type": "Point", "coordinates": [3.33, 46.92]},
+            },
+        ],
+    }
+    DataLayerFactory(map=map, data=data)
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"name": "one other point"},
+                "geometry": {"type": "Point", "coordinates": [3.34, 46.94]},
+            },
+        ],
+    }
+    DataLayerFactory(map=map, data=data)
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"name": "another point"},
+                "geometry": {"type": "Point", "coordinates": [3.35, 46.95]},
+            },
+        ],
+        "_umap_options": {"displayOnLoad": False},
+    }
+    DataLayerFactory(map=map, data=data, settings={"displayOnLoad": False})
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#10/46.93/3.33")
+    markers = page.locator(".leaflet-marker-icon")
+    expect(markers).to_have_count(2)
+    # Only one is off
+    expect(page.locator(".datalayer.off")).to_have_count(1)
+
+    # Click on button
+    page.locator(".umap-browser [data-ref=toggle]").click()
+    # Should have hidden the two other layers
+    expect(page.locator(".datalayer.off")).to_have_count(3)
+    expect(markers).to_have_count(0)
+
+    # Click again
+    page.locator(".umap-browser [data-ref=toggle]").click()
+    # Should shown all layers
+    expect(page.locator(".datalayer.off")).to_have_count(0)
+    expect(markers).to_have_count(3)
+
+    # Click again
+    page.locator(".umap-browser [data-ref=toggle]").click()
+    # Should hidden again all layers
+    expect(page.locator(".datalayer.off")).to_have_count(3)
+    expect(markers).to_have_count(0)

umap/tests/integration/test_caption.py

@@ -20,11 +20,11 @@ def test_caption(live_server, page, map):
     panel = page.locator(".panel.left.on")
     expect(panel).to_have_class(re.compile(".*condensed.*"))
     expect(panel.locator(".umap-caption")).to_be_visible()
-    expect(panel.locator(".datalayer-legend").get_by_text(basic.name)).to_be_visible()
+    expect(panel.locator(".caption-item").get_by_text(basic.name)).to_be_visible()
     expect(
-        panel.locator(".datalayer-legend .off").get_by_text(non_loaded.name)
+        panel.locator(".caption-item .off").get_by_text(non_loaded.name)
     ).to_be_visible()
-    expect(panel.locator(".datalayer-legend").get_by_text(hidden.name)).to_be_hidden()
+    expect(panel.locator(".caption-item").get_by_text(hidden.name)).to_be_hidden()
 
 
 def test_caption_should_display_owner_as_author(live_server, page, map):

umap/tests/integration/test_circles_layer.py

@@ -67,3 +67,15 @@ def test_basic_circles_layer(map, live_server, page):
         .get_attribute("d")
         .endswith("a2,2 0 1,0 -4,0 ")
     )
+
+
+def test_can_draw_new_circles(openmap, live_server, page):
+    path = Path(__file__).parent.parent / "fixtures/test_circles_layer.geojson"
+    data = json.loads(path.read_text())
+    DataLayerFactory(data=data, map=openmap)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#12/47.2210/-1.5621")
+    paths = page.locator("path")
+    expect(paths).to_have_count(10)
+    page.get_by_title("Draw a marker").click()
+    page.locator("#map").click(position={"x": 200, "y": 200})
+    expect(paths).to_have_count(11)

umap/tests/integration/test_datalayer.py

@@ -1,4 +1,5 @@
 import json
+import os
 import re
 
 import pytest
@@ -106,7 +107,7 @@ def test_should_honour_color_variable(live_server, map, page):
         },
     }
     DataLayerFactory(map=map, data=data)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/2.5")
     expect(page.locator(".leaflet-overlay-pane path[fill='tomato']"))
     markers = page.locator(".leaflet-marker-icon .icon_container")
     expect(markers).to_have_css("background-color", "rgb(240, 248, 255)")

umap/tests/integration/test_draw_polygon.py

@@ -161,8 +161,10 @@ def test_can_draw_multi(live_server, page, tilelayer):
     page.keyboard.press("Escape")
     expect(multi_button).to_be_hidden()
     polygons.first.click(button="right", position={"x": 10, "y": 10})
-    expect(page.get_by_role("link", name="Transform to lines")).to_be_hidden()
-    expect(page.get_by_role("link", name="Remove shape from the multi")).to_be_visible()
+    expect(page.get_by_role("button", name="Transform to lines")).to_be_hidden()
+    expect(
+        page.get_by_role("button", name="Remove shape from the multi")
+    ).to_be_visible()
 
 
 def test_can_draw_hole(page, live_server, tilelayer):
@@ -196,7 +198,7 @@ def test_can_draw_hole(page, live_server, tilelayer):
     expect(vertices).to_have_count(8)
     # Click on the polygon but not in the hole
     polygons.first.click(button="right", position={"x": 10, "y": 10})
-    expect(page.get_by_role("link", name="Transform to lines")).to_be_hidden()
+    expect(page.get_by_role("button", name="Transform to lines")).to_be_hidden()
 
 
 def test_can_transfer_shape_from_simple_polygon(live_server, page, tilelayer):
@@ -228,7 +230,7 @@ def test_can_transfer_shape_from_simple_polygon(live_server, page, tilelayer):
     # Now that polygon 2 is selected, right click on first one
     # and transfer shape
     polygons.first.click(position={"x": 20, "y": 20}, button="right")
-    page.get_by_role("link", name="Transfer shape to edited feature").click()
+    page.get_by_role("button", name="Transfer shape to edited feature").click()
     expect(polygons).to_have_count(1)
 
 
@@ -246,7 +248,9 @@ def test_can_extract_shape(live_server, page, tilelayer, settings):
     # Click again to finish
     map.click(position={"x": 100, "y": 100})
     expect(polygons).to_have_count(1)
-    extract_button = page.get_by_role("link", name="Extract shape to separate feature")
+    extract_button = page.get_by_role(
+        "button", name="Extract shape to separate feature"
+    )
     expect(extract_button).to_be_hidden()
     page.get_by_title("Add a polygon to the current multi").click()
     map.click(position={"x": 250, "y": 200})
@@ -326,7 +330,9 @@ def test_cannot_transfer_shape_to_line(live_server, page, tilelayer):
     # Click again to finish
     map.click(position={"x": 100, "y": 100})
     expect(polygons).to_have_count(1)
-    extract_button = page.get_by_role("link", name="Extract shape to separate feature")
+    extract_button = page.get_by_role(
+        "button", name="Extract shape to separate feature"
+    )
     polygons.first.click(position={"x": 20, "y": 20}, button="right")
     expect(extract_button).to_be_hidden()
     page.get_by_title("Draw a polyline").click()
@@ -352,7 +358,9 @@ def test_cannot_transfer_shape_to_marker(live_server, page, tilelayer):
     # Click again to finish
     map.click(position={"x": 100, "y": 100})
     expect(polygons).to_have_count(1)
-    extract_button = page.get_by_role("link", name="Extract shape to separate feature")
+    extract_button = page.get_by_role(
+        "button", name="Extract shape to separate feature"
+    )
     polygons.first.click(position={"x": 20, "y": 20}, button="right")
     expect(extract_button).to_be_hidden()
     page.get_by_title("Draw a marker").click()
@@ -377,7 +385,7 @@ def test_can_clone_polygon(live_server, page, tilelayer, settings):
     map.click(position={"x": 100, "y": 100})
     expect(polygons).to_have_count(1)
     polygons.first.click(button="right")
-    page.get_by_role("link", name="Clone this feature").click()
+    page.get_by_role("button", name="Clone this feature").click()
     expect(polygons).to_have_count(2)
     data = save_and_get_json(page)
     assert len(data["features"]) == 2
@@ -402,7 +410,7 @@ def test_can_transform_polygon_to_line(live_server, page, tilelayer, settings):
     expect(polygons).to_have_count(1)
     expect(paths).to_have_count(1)
     polygons.first.click(button="right")
-    page.get_by_role("link", name="Transform to lines").click()
+    page.get_by_role("button", name="Transform to lines").click()
     # No more polygons (will fill), but one path, it must be a line
     expect(polygons).to_have_count(0)
     expect(paths).to_have_count(1)

umap/tests/integration/test_draw_polyline.py

@@ -157,8 +157,10 @@ def test_can_draw_multi(live_server, page, tilelayer):
     page.keyboard.press("Escape")
     expect(add_shape).to_be_hidden()
     lines.first.click(button="right", position={"x": 10, "y": 1})
-    expect(page.get_by_role("link", name="Transform to polygon")).to_be_hidden()
-    expect(page.get_by_role("link", name="Remove shape from the multi")).to_be_visible()
+    expect(page.get_by_role("button", name="Transform to polygon")).to_be_hidden()
+    expect(
+        page.get_by_role("button", name="Remove shape from the multi")
+    ).to_be_visible()
 
 
 def test_can_transfer_shape_from_simple_polyline(live_server, page, tilelayer):
@@ -188,7 +190,7 @@ def test_can_transfer_shape_from_simple_polyline(live_server, page, tilelayer):
     # Now that line 2 is selected, right click on first one
     # and transfer shape
     lines.first.click(position={"x": 10, "y": 1}, button="right")
-    page.get_by_role("link", name="Transfer shape to edited feature").click()
+    page.get_by_role("button", name="Transfer shape to edited feature").click()
     expect(lines).to_have_count(1)
 
 
@@ -227,7 +229,7 @@ def test_can_transfer_shape_from_multi(live_server, page, tilelayer, settings):
     # Now that line 2 is selected, right click on first one
     # and transfer shape
     lines.first.click(position={"x": 10, "y": 1}, button="right")
-    page.get_by_role("link", name="Transfer shape to edited feature").click()
+    page.get_by_role("button", name="Transfer shape to edited feature").click()
     expect(lines).to_have_count(2)
     data = save_and_get_json(page)
     assert data["features"][0]["geometry"] == {
@@ -259,7 +261,9 @@ def test_can_extract_shape(live_server, page, tilelayer):
     # Click again to finish
     map.click(position={"x": 100, "y": 200})
     expect(lines).to_have_count(1)
-    extract_button = page.get_by_role("link", name="Extract shape to separate feature")
+    extract_button = page.get_by_role(
+        "button", name="Extract shape to separate feature"
+    )
     expect(extract_button).to_be_hidden()
     page.get_by_title("Add a line to the current multi").click()
     map.click(position={"x": 250, "y": 250})
@@ -287,7 +291,7 @@ def test_can_clone_polyline(live_server, page, tilelayer, settings):
     map.click(position={"x": 100, "y": 200})
     expect(lines).to_have_count(1)
     lines.first.click(position={"x": 10, "y": 1}, button="right")
-    page.get_by_role("link", name="Clone this feature").click()
+    page.get_by_role("button", name="Clone this feature").click()
     expect(lines).to_have_count(2)
     data = save_and_get_json(page)
     assert len(data["features"]) == 2
@@ -313,7 +317,7 @@ def test_can_transform_polyline_to_polygon(live_server, page, tilelayer, setting
     expect(paths).to_have_count(1)
     expect(polygons).to_have_count(0)
     paths.first.click(position={"x": 10, "y": 1}, button="right")
-    page.get_by_role("link", name="Transform to polygon").click()
+    page.get_by_role("button", name="Transform to polygon").click()
     expect(polygons).to_have_count(1)
     expect(paths).to_have_count(1)
     data = save_and_get_json(page)
@@ -374,7 +378,7 @@ def test_can_merge_lines(live_server, page, tilelayer, settings):
 
     # Right click and merge nodes
     map.click(button="right", position={"x": 100, "y": 200})
-    map.get_by_role("link", name="Merge lines").click()
+    page.get_by_role("button", name="Merge lines").click()
     data = save_and_get_json(page)
     assert len(data["features"]) == 1
     assert data["features"][0]["geometry"]["type"] == "LineString"

umap/tests/integration/test_edit_datalayer.py

@@ -60,12 +60,10 @@ def test_cancel_deleting_datalayer_should_restore(
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(1)
     page.get_by_role("link", name="Manage layers").click()
-    page.once("dialog", lambda dialog: dialog.accept())
     page.locator(".panel.right").get_by_title("Delete layer").click()
+    page.get_by_role("button", name="OK").click()
     expect(markers).to_have_count(0)
-    page.get_by_role("button", name="Open browser").click()
     expect(page.get_by_text("test datalayer")).to_be_hidden()
-    page.once("dialog", lambda dialog: dialog.accept())
     page.get_by_role("button", name="Cancel edits").click()
     page.locator("dialog").get_by_role("button", name="OK").click()
     expect(markers).to_have_count(1)
@@ -88,7 +86,6 @@ def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
 
 
 def test_can_change_icon_class(live_server, openmap, page):
-    # Faster than doing a login
     data = {
         "type": "FeatureCollection",
         "features": [
@@ -100,7 +97,7 @@ def test_can_change_icon_class(live_server, openmap, page):
         ],
     }
     DataLayerFactory(map=openmap, data=data)
-    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/45.3/1")
     expect(page.locator(".umap-div-icon")).to_be_visible()
     page.get_by_role("link", name="Manage layers").click()
     expect(page.locator(".umap-circle-icon")).to_be_hidden()
@@ -174,8 +171,8 @@ def test_can_restore_version(live_server, openmap, page, datalayer):
     page.get_by_role("link", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Edit", exact=True).click()
     page.get_by_text("Versions").click()
-    page.once("dialog", lambda dialog: dialog.accept())
     page.get_by_role("button", name="Restore this version").last.click()
+    page.get_by_role("button", name="OK").click()
     expect(marker).to_have_class(re.compile(".*umap-ball-icon.*"))
 
 
@@ -196,8 +193,8 @@ def test_deleting_datalayer_should_remove_from_browser_and_layers_list(
     page.get_by_role("link", name="Manage layers").click()
     expect(panel.get_by_text("test datalayer")).to_be_visible()
     expect(edit_panel.get_by_text("test datalayer")).to_be_visible()
-    page.once("dialog", lambda dialog: dialog.accept())
     page.locator(".panel.right").get_by_title("Delete layer").click()
+    page.get_by_role("button", name="OK").click()
     expect(panel.get_by_text("test datalayer")).to_be_hidden()
     expect(edit_panel.get_by_text("test datalayer")).to_be_hidden()
 
@@ -210,6 +207,6 @@ def test_deleting_datalayer_should_remove_from_caption(
     page.get_by_role("button", name="About").click()
     page.get_by_role("link", name="Manage layers").click()
     expect(panel.get_by_text("test datalayer")).to_be_visible()
-    page.once("dialog", lambda dialog: dialog.accept())
     page.locator(".panel.right").get_by_title("Delete layer").click()
+    page.get_by_role("button", name="OK").click()
     expect(panel.get_by_text("test datalayer")).to_be_hidden()

umap/tests/integration/test_edit_map.py

@@ -23,7 +23,7 @@ def test_can_edit_name(page, live_server, tilelayer):
 
 def test_can_edit_name_on_click_on_toolbar(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
-    page.locator(".map-name").click()
+    page.locator(".umap-main-edit-toolbox .map-name").click()
     name_input = page.locator('.map-metadata input[name="name"]')
     expect(name_input).to_be_visible()
 
@@ -40,7 +40,7 @@ def test_map_name_impacts_ui(live_server, page, tilelayer):
 
     name_input.fill("something else")
 
-    expect(page.get_by_role("button", name="something else").nth(1)).to_be_visible()
+    expect(page.get_by_role("button", name="something else").first).to_be_visible()
 
 
 def test_zoomcontrol_impacts_ui(live_server, page, tilelayer):

umap/tests/integration/test_edit_marker.py

@@ -40,7 +40,7 @@ def test_can_edit_on_shift_click(live_server, openmap, page, datalayer):
 
 
 def test_marker_style_should_have_precedence(live_server, openmap, page, bootstrap):
-    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.5/19")
 
     # Change colour at layer level
     page.get_by_role("link", name="Manage layers").click()

umap/tests/integration/test_facets_browser.py

@@ -175,7 +175,7 @@ def test_date_facet_search(live_server, page, map):
     map.save()
     DataLayerFactory(map=map, data=DATALAYER_DATA1)
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/-1.5")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(4)
     expect(page.get_by_text("Date Filter")).to_be_visible()
@@ -196,7 +196,7 @@ def test_choice_with_empty_value(live_server, page, map):
     del data["features"][1]["properties"]["mytype"]
     DataLayerFactory(map=map, data=data)
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/-1.5")
     expect(page.get_by_text("<empty value>")).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(4)
@@ -212,7 +212,7 @@ def test_number_with_zero_value(live_server, page, map):
     data["features"][0]["properties"]["mynumber"] = 0
     DataLayerFactory(map=map, data=data)
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/-1.5")
     expect(page.get_by_label("Min")).to_have_value("0")
     expect(page.get_by_label("Max")).to_have_value("14")
     page.get_by_label("Min").fill("1")

umap/tests/integration/test_import.py

@@ -1,4 +1,5 @@
 import json
+import os
 import platform
 import re
 from pathlib import Path

umap/tests/integration/test_map.py

@@ -1,3 +1,4 @@
+import os
 import re
 
 import pytest

umap/tests/integration/test_owned_map.py

@@ -234,8 +234,8 @@ def test_can_delete_datalayer(live_server, map, login, datalayer):
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(1)
     page.get_by_role("link", name="Manage layers").click()
-    page.once("dialog", lambda dialog: dialog.accept())
     page.locator(".panel.right").get_by_title("Delete layer").click()
+    page.get_by_role("button", name="OK").click()
     with page.expect_response(re.compile(r".*/datalayer/delete/.*")):
         page.get_by_role("button", name="Save").click()
     expect(markers).to_have_count(0)

umap/tests/integration/test_view_marker.py

@@ -106,3 +106,66 @@ def test_extended_properties_in_popup(live_server, map, page, bootstrap):
     expect(page.get_by_text("Alt: 241")).to_be_visible()
     expect(page.get_by_text("Zoom: 7")).to_be_visible()
     expect(page.get_by_text("Layer: test datalayer")).to_be_visible()
+
+
+def test_only_visible_markers_are_added_to_dom(live_server, map, page):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {
+                    "name": "marker 1",
+                    "description": "added to dom",
+                },
+                "geometry": {
+                    "type": "Point",
+                    "coordinates": [14.6, 48.5],
+                },
+            },
+            {
+                "type": "Feature",
+                "properties": {
+                    "name": "marker 2",
+                    "description": "not added to dom at load",
+                },
+                "geometry": {
+                    "type": "Point",
+                    "coordinates": [12.6, 44.5],
+                },
+            },
+        ],
+    }
+    DataLayerFactory(map=map, data=data)
+    map.settings["properties"]["showLabel"] = True
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    markers = page.locator(".leaflet-marker-icon")
+    tooltips = page.locator(".leaflet-tooltip")
+    expect(markers).to_have_count(1)
+    expect(tooltips).to_have_count(1)
+
+    # Zoom in/out to show the other marker
+    page.get_by_label("Zoom out").click()
+    expect(markers).to_have_count(2)
+    expect(tooltips).to_have_count(2)
+    page.get_by_label("Zoom in").click()
+    expect(markers).to_have_count(1)
+    expect(tooltips).to_have_count(1)
+
+    # Drag map to show/hide the marker
+    map_el = page.locator("#map")
+    map_el.drag_to(
+        map_el,
+        source_position={"x": 100, "y": 600},
+        target_position={"x": 100, "y": 200},
+    )
+    expect(markers).to_have_count(2)
+    expect(tooltips).to_have_count(2)
+    map_el.drag_to(
+        map_el,
+        source_position={"x": 100, "y": 600},
+        target_position={"x": 100, "y": 200},
+    )
+    expect(markers).to_have_count(1)
+    expect(tooltips).to_have_count(1)