umap-project 2.1.3__py3-none-any.whl → 2.2.0b0__py3-none-any.whl

umap/tests/integration/test_edit_marker.py

@@ -0,0 +1,120 @@
+import platform
+from copy import deepcopy
+
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+DATALAYER_DATA = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "name": "test marker",
+                "description": "Some description",
+            },
+            "id": "QwNjg",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [14.6889, 48.5529],
+            },
+        },
+    ],
+}
+
+
+@pytest.fixture
+def bootstrap(map, live_server):
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+
+
+def test_can_edit_on_shift_click(live_server, openmap, page, datalayer):
+    modifier = "Meta" if platform.system() == "Darwin" else "Control"
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.locator(".leaflet-marker-icon").click(modifiers=[modifier, "Shift"])
+    expect(page.get_by_role("heading", name="Layer properties")).to_be_visible()
+
+
+def test_marker_style_should_have_precedence(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+
+    # Change colour at layer level
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator(".umap-field-color .define").click()
+    expect(page.locator(".leaflet-marker-icon .icon_container")).to_have_css(
+        "background-color", "rgb(0, 0, 139)"
+    )
+    page.get_by_title("DarkRed").first.click()
+    expect(page.locator(".leaflet-marker-icon .icon_container")).to_have_css(
+        "background-color", "rgb(139, 0, 0)"
+    )
+
+    # Now change at marker level, it should take precedence
+    page.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator("#umap-feature-shape-properties").get_by_text("define").first.click()
+    page.get_by_title("GoldenRod", exact=True).click()
+    expect(page.locator(".leaflet-marker-icon .icon_container")).to_have_css(
+        "background-color", "rgb(218, 165, 32)"
+    )
+
+    # Now change again at layer level again, it should not change the marker color
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator(".umap-field-color input").click()
+    page.get_by_title("DarkViolet").first.click()
+    expect(page.locator(".leaflet-marker-icon .icon_container")).to_have_css(
+        "background-color", "rgb(218, 165, 32)"
+    )
+
+
+def test_should_open_an_edit_toolbar_on_click(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.locator(".leaflet-marker-icon").click()
+    expect(page.get_by_role("link", name="Toggle edit mode")).to_be_visible()
+    expect(page.get_by_role("link", name="Delete this feature")).to_be_visible()
+
+
+def test_should_update_open_popup_on_edit(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
+    expect(page.locator(".umap-icon-active")).to_be_hidden()
+    page.locator(".leaflet-marker-icon").click()
+    expect(page.locator(".leaflet-popup-content-wrapper")).to_be_visible()
+    expect(page.get_by_role("heading", name="test marker")).to_be_visible()
+    expect(page.get_by_text("Some description")).to_be_visible()
+    page.get_by_role("button", name="Edit").click()
+    page.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
+    page.locator('input[name="name"]').fill("test marker edited")
+    expect(page.get_by_role("heading", name="test marker edited")).to_be_visible()
+
+
+def test_should_follow_datalayer_style_when_changing_datalayer(
+    live_server, openmap, page
+):
+    data = deepcopy(DATALAYER_DATA)
+    data["_umap_options"] = {"color": "DarkCyan"}
+    DataLayerFactory(map=openmap, data=data)
+    DataLayerFactory(
+        map=openmap,
+        name="other datalayer",
+        data={
+            "type": "FeatureCollection",
+            "features": [],
+            "_umap_options": {"color": "DarkViolet"},
+        },
+    )
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    marker = page.locator(".leaflet-marker-icon .icon_container")
+    expect(marker).to_have_css("background-color", "rgb(0, 139, 139)")
+    # Change datalayer
+    marker.click()
+    page.get_by_role("link", name="Toggle edit mode (⇧+Click)").click()
+    page.locator(".umap-field-datalayer select").select_option(label="other datalayer")
+    expect(marker).to_have_css("background-color", "rgb(148, 0, 211)")

umap/tests/integration/test_edit_polygon.py

@@ -0,0 +1,122 @@
+import platform
+
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+DATALAYER_DATA = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "name": "name poly",
+            },
+            "id": "gyNzM",
+            "geometry": {
+                "type": "Polygon",
+                "coordinates": [
+                    [
+                        [11.25, 53.585984],
+                        [10.151367, 52.975108],
+                        [12.689209, 52.167194],
+                        [14.084473, 53.199452],
+                        [12.634277, 53.618579],
+                        [11.25, 53.585984],
+                        [11.25, 53.585984],
+                    ],
+                ],
+            },
+        },
+    ],
+}
+
+
+@pytest.fixture
+def bootstrap(map, live_server):
+    map.settings["properties"]["zoom"] = 6
+    map.settings["geometry"] = {
+        "type": "Point",
+        "coordinates": [8.429, 53.239],
+    }
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA)
+
+
+def test_can_edit_on_shift_click(live_server, openmap, page, datalayer):
+    modifier = "Meta" if platform.system() == "Darwin" else "Control"
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.locator(".leaflet-marker-icon").click(modifiers=[modifier, "Shift"])
+    expect(page.get_by_role("heading", name="Layer properties")).to_be_visible()
+
+
+def test_marker_style_should_have_precedence(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+
+    # Change colour at layer level
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator(".umap-field-color .define").click()
+    expect(page.locator(".leaflet-overlay-pane path[fill='DarkBlue']")).to_have_count(1)
+    page.get_by_title("DarkRed").first.click()
+    expect(page.locator(".leaflet-overlay-pane path[fill='DarkRed']")).to_have_count(1)
+
+    # Now change at polygon level, it should take precedence
+    page.locator("path").click(modifiers=["Shift"])
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator("#umap-feature-shape-properties").get_by_text("define").first.click()
+    page.get_by_title("GoldenRod", exact=True).first.click()
+    expect(page.locator(".leaflet-overlay-pane path[fill='GoldenRod']")).to_have_count(
+        1
+    )
+
+    # Now change again at layer level again, it should not change the marker color
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator(".umap-field-color input").click()
+    page.get_by_title("DarkViolet").first.click()
+    expect(page.locator(".leaflet-overlay-pane path[fill='GoldenRod']")).to_have_count(
+        1
+    )
+
+
+def test_should_open_an_edit_toolbar_on_click(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.locator("path").click()
+    expect(page.get_by_role("link", name="Toggle edit mode")).to_be_visible()
+    expect(page.get_by_role("link", name="Delete this feature")).to_be_visible()
+
+
+def test_can_remove_stroke(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    expect(page.locator(".leaflet-overlay-pane path[stroke='DarkBlue']")).to_have_count(
+        1
+    )
+    page.locator("path").click()
+    page.get_by_role("link", name="Toggle edit mode").click()
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator(".umap-field-stroke .define").first.click()
+    page.locator(".umap-field-stroke label").first.click()
+    expect(page.locator(".leaflet-overlay-pane path[stroke='DarkBlue']")).to_have_count(
+        0
+    )
+    expect(page.locator(".leaflet-overlay-pane path[stroke='none']")).to_have_count(1)
+
+
+def test_should_reset_style_on_cancel(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.locator("path").click(modifiers=["Shift"])
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator("#umap-feature-shape-properties").get_by_text("define").first.click()
+    page.get_by_title("GoldenRod", exact=True).first.click()
+    expect(page.locator(".leaflet-overlay-pane path[fill='GoldenRod']")).to_have_count(
+        1
+    )
+    page.once("dialog", lambda dialog: dialog.accept())
+    page.get_by_role("button", name="Cancel edits").click()
+    expect(page.locator(".leaflet-overlay-pane path[fill='DarkBlue']")).to_have_count(1)

umap/tests/integration/test_facets_browser.py

@@ -1,3 +1,5 @@
+import copy
+
 import pytest
 from playwright.sync_api import expect
 
@@ -11,12 +13,22 @@ DATALAYER_DATA1 = {
     "features": [
         {
             "type": "Feature",
-            "properties": {"mytype": "even", "name": "Point 2"},
+            "properties": {
+                "mytype": "even",
+                "name": "Point 2",
+                "mynumber": 10,
+                "mydate": "2024/04/14 12:19:17",
+            },
             "geometry": {"type": "Point", "coordinates": [0.065918, 48.385442]},
         },
         {
             "type": "Feature",
-            "properties": {"mytype": "odd", "name": "Point 1"},
+            "properties": {
+                "mytype": "odd",
+                "name": "Point 1",
+                "mynumber": 12,
+                "mydate": "2024/03/13 12:20:20",
+            },
             "geometry": {"type": "Point", "coordinates": [3.55957, 49.767074]},
         },
     ],
@@ -31,12 +43,22 @@ DATALAYER_DATA2 = {
     "features": [
         {
             "type": "Feature",
-            "properties": {"mytype": "even", "name": "Point 4"},
+            "properties": {
+                "mytype": "even",
+                "name": "Point 4",
+                "mynumber": 10,
+                "mydate": "2024/08/18 13:14:15",
+            },
             "geometry": {"type": "Point", "coordinates": [0.856934, 45.290347]},
         },
         {
             "type": "Feature",
-            "properties": {"mytype": "odd", "name": "Point 3"},
+            "properties": {
+                "mytype": "odd",
+                "name": "Point 3",
+                "mynumber": 14,
+                "mydate": "2024-04-14T10:19:17.000Z",
+            },
             "geometry": {"type": "Point", "coordinates": [4.372559, 47.945786]},
         },
     ],
@@ -70,23 +92,19 @@ DATALAYER_DATA3 = {
 }
 
 
-@pytest.fixture
-def bootstrap(map, live_server):
+def test_simple_facet_search(live_server, page, map):
     map.settings["properties"]["onLoadPanel"] = "facet"
-    map.settings["properties"]["facetKey"] = "mytype|My type"
+    map.settings["properties"]["facetKey"] = "mytype|My type,mynumber|My Number|number"
     map.settings["properties"]["showLabel"] = True
     map.save()
     DataLayerFactory(map=map, data=DATALAYER_DATA1)
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
     DataLayerFactory(map=map, data=DATALAYER_DATA3)
-
-
-def test_simple_facet_search(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()}#6/48.948/1.670")
     panel = page.locator(".umap-facet-search")
     # From a non browsable datalayer, should not be impacted
     paths = page.locator(".leaflet-overlay-pane path")
-    expect(paths).to_be_visible
+    expect(paths).to_be_visible()
     expect(panel).to_be_visible()
     # Facet name
     expect(page.get_by_text("My type")).to_be_visible()
@@ -95,7 +113,7 @@ def test_simple_facet_search(live_server, page, bootstrap, map):
     odd = page.get_by_text("odd")
     expect(oven).to_be_visible()
     expect(odd).to_be_visible()
-    expect(paths).to_be_visible
+    expect(paths).to_be_visible()
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(4)
     # Tooltips
@@ -114,4 +132,76 @@ def test_simple_facet_search(live_server, page, bootstrap, map):
     # Now let's filter
     odd.click()
     expect(markers).to_have_count(4)
-    expect(paths).to_be_visible
+    expect(paths).to_be_visible()
+
+    # Let's filter using the number facet
+    expect(page.get_by_text("My Number")).to_be_visible()
+    expect(page.get_by_label("Min")).to_have_value("10")
+    expect(page.get_by_label("Max")).to_have_value("14")
+    page.get_by_label("Min").fill("11")
+    page.keyboard.press("Tab")  # Move out of the input, so the "change" event is sent
+    expect(markers).to_have_count(2)
+    expect(paths).to_be_visible()
+    page.get_by_label("Max").fill("13")
+    page.keyboard.press("Tab")
+    expect(markers).to_have_count(1)
+
+    # Now let's combine
+    page.get_by_label("Min").fill("10")
+    page.keyboard.press("Tab")
+    expect(markers).to_have_count(3)
+    odd.click()
+    expect(markers).to_have_count(1)
+    expect(paths).to_be_visible()
+
+
+def test_date_facet_search(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "facet"
+    map.settings["properties"]["facetKey"] = "mydate|Date filter|date"
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA1)
+    DataLayerFactory(map=map, data=DATALAYER_DATA2)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    markers = page.locator(".leaflet-marker-icon")
+    expect(markers).to_have_count(4)
+    expect(page.get_by_text("Date Filter")).to_be_visible()
+    expect(page.get_by_label("From")).to_have_value("2024-03-13")
+    expect(page.get_by_label("Until")).to_have_value("2024-08-18")
+    page.get_by_label("From").fill("2024-03-14")
+    expect(markers).to_have_count(3)
+    page.get_by_label("Until").fill("2024-08-17")
+    expect(markers).to_have_count(2)
+
+
+def test_choice_with_empty_value(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "facet"
+    map.settings["properties"]["facetKey"] = "mytype|My type"
+    map.save()
+    data = copy.deepcopy(DATALAYER_DATA1)
+    data["features"][0]["properties"]["mytype"] = ""
+    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()}")
+    expect(page.get_by_text("<empty value>")).to_be_visible()
+    markers = page.locator(".leaflet-marker-icon")
+    expect(markers).to_have_count(4)
+    page.get_by_text("<empty value>").click()
+    expect(markers).to_have_count(2)
+
+
+def test_number_with_zero_value(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "facet"
+    map.settings["properties"]["facetKey"] = "mynumber|Filter|number"
+    map.save()
+    data = copy.deepcopy(DATALAYER_DATA1)
+    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()}")
+    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")
+    page.keyboard.press("Tab")  # Move out of the input, so the "change" event is sent
+    markers = page.locator(".leaflet-marker-icon")
+    expect(markers).to_have_count(3)

umap/tests/integration/test_import.py

@@ -1,6 +1,7 @@
 import json
 import re
 from pathlib import Path
+from time import sleep
 
 import pytest
 from playwright.sync_api import expect
@@ -10,11 +11,29 @@ from umap.models import DataLayer
 pytestmark = pytest.mark.django_db
 
 
+def test_layers_list_is_updated(live_server, tilelayer, page):
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_role("link", name="Import data (Ctrl+I)").click()
+    # Should work
+    page.get_by_label("Choose the layer to import").select_option(
+        label="Import in a new layer"
+    )
+    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Add a layer").click()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').fill("foobar")
+    page.get_by_role("link", name="Import data (Ctrl+I)").click()
+    # Should still work
+    page.get_by_label("Choose the layer to import").select_option(
+        label="Import in a new layer"
+    )
+    # Now layer should be visible in the options
+    page.get_by_label("Choose the layer to import").select_option(label="foobar")
+
+
 def test_umap_import_from_file(live_server, tilelayer, page):
     page.goto(f"{live_server.url}/map/new/")
-    button = page.get_by_title("Import data")
-    expect(button).to_be_visible()
-    button.click()
+    page.get_by_title("Import data").click()
     file_input = page.locator("input[type='file']")
     with page.expect_file_chooser() as fc_info:
         file_input.click()
@@ -24,34 +43,38 @@ def test_umap_import_from_file(live_server, tilelayer, page):
     button = page.get_by_role("button", name="Import", exact=True)
     expect(button).to_be_visible()
     button.click()
-    layers = page.locator(".umap-browse-datalayers li")
-    expect(layers).to_have_count(2)
-    nonloaded = page.locator(".umap-browse-datalayers li.off")
-    expect(nonloaded).to_have_count(1)
     assert file_input.input_value()
     # Close the import panel
     page.keyboard.press("Escape")
+    # Reopen
+    page.get_by_title("Import data").click()
+    sleep(1)  # Wait for CSS transition to happen
     assert not file_input.input_value()
     expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
         "Carte sans nom"
     )
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
+    expect(layers).to_have_count(2)
+    nonloaded = page.locator(".umap-browser .datalayer.off")
+    expect(nonloaded).to_have_count(1)
 
 
 def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
     settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/map/new/")
+    page.get_by_role("button", name="See layers").click()
     page.get_by_title("Import data").click()
     textarea = page.locator(".umap-upload textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.umap"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("umap")
     page.get_by_role("button", name="Import", exact=True).click()
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer")
     expect(layers).to_have_count(2)
     expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
         "Imported map"
     )
-    page.get_by_role("button", name="See data layers").click()
     expect(page.get_by_text("Tunnels")).to_be_visible()
     expect(page.get_by_text("Cities")).to_be_visible()
     expect(page.locator(".leaflet-control-minimap")).to_be_visible()
@@ -67,7 +90,8 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
 
 def test_import_geojson_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     expect(markers).to_have_count(0)
@@ -91,7 +115,8 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
 
 def test_import_kml_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     expect(markers).to_have_count(0)
@@ -115,7 +140,8 @@ def test_import_kml_from_textarea(tilelayer, live_server, page):
 
 def test_import_gpx_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     expect(markers).to_have_count(0)
@@ -139,7 +165,8 @@ def test_import_gpx_from_textarea(tilelayer, live_server, page):
 
 def test_import_osm_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
@@ -158,7 +185,8 @@ def test_import_osm_from_textarea(tilelayer, live_server, page):
 
 def test_import_csv_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
@@ -177,7 +205,8 @@ def test_import_csv_from_textarea(tilelayer, live_server, page):
 
 def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(1)
     expect(layers).to_have_count(1)
@@ -195,7 +224,8 @@ def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap)
 
 def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(1)
     expect(layers).to_have_count(1)
@@ -214,7 +244,8 @@ def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
 
 def test_can_import_in_new_datalayer(live_server, datalayer, page, openmap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(1)
     expect(layers).to_have_count(1)
@@ -317,7 +348,8 @@ def test_import_geometry_collection(live_server, page, tilelayer):
         ],
     }
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     expect(markers).to_have_count(0)
@@ -352,7 +384,8 @@ def test_import_multipolygon(live_server, page, tilelayer):
         },
     }
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     paths = page.locator("path")
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
@@ -383,7 +416,8 @@ def test_import_multipolyline(live_server, page, tilelayer):
         ],
     }
     page.goto(f"{live_server.url}/map/new/")
-    layers = page.locator(".umap-browse-datalayers li")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
     paths = page.locator("path")
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
@@ -397,3 +431,19 @@ def test_import_multipolyline(live_server, page, tilelayer):
     # A layer has been created
     expect(layers).to_have_count(1)
     expect(paths).to_have_count(1)
+
+
+def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
+    markers = page.locator(".leaflet-marker-icon")
+    page.get_by_title("Import data").click()
+    textarea = page.locator(".umap-upload textarea")
+    textarea.fill("a,b,c\n12.23,48.34,mypoint\n12.23,48.34,mypoint2")
+    page.locator('select[name="format"]').select_option("csv")
+    page.get_by_role("button", name="Import", exact=True).click()
+    # FIXME do not create a layer
+    expect(layers).to_have_count(1)
+    expect(markers).to_have_count(0)
+    expect(page.locator(".umap-alert")).to_be_visible()