umap-project 2.8.1__py3-none-any.whl → 2.9.0__py3-none-any.whl

umap/tests/integration/test_edit_datalayer.py

@@ -59,7 +59,7 @@ def test_cancel_deleting_datalayer_should_restore(
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(1)
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Delete layer").click()
     page.get_by_role("button", name="OK").click()
     expect(markers).to_have_count(0)
@@ -77,7 +77,7 @@ def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(1)
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Edit", exact=True).click()
     page.get_by_text("Advanced actions").click()
     page.get_by_role("button", name="Clone").click()
@@ -99,11 +99,11 @@ 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#6/45.3/1")
     expect(page.locator(".umap-div-icon")).to_be_visible()
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     expect(page.locator(".umap-circle-icon")).to_be_hidden()
     page.locator(".panel.right").get_by_title("Edit", exact=True).click()
     page.get_by_text("Shape properties").click()
-    page.locator(".umap-field-iconClass a.define").click()
+    page.locator(".umap-field-iconClass button.define").click()
     page.get_by_text("Circle", exact=True).click()
     expect(page.locator(".umap-circle-icon")).to_be_visible()
     expect(page.locator(".umap-div-icon")).to_be_hidden()
@@ -113,7 +113,7 @@ def test_can_change_name(live_server, openmap, page, datalayer):
     page.goto(
         f"{live_server.url}{openmap.get_absolute_url()}?edit&onLoadPanel=databrowser"
     )
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Edit", exact=True).click()
     expect(page.locator(".umap-is-dirty")).to_be_hidden()
     page.locator('input[name="name"]').click()
@@ -143,7 +143,7 @@ def test_can_create_new_datalayer(live_server, openmap, page, datalayer):
     page.goto(
         f"{live_server.url}{openmap.get_absolute_url()}?edit&onLoadPanel=databrowser"
     )
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", 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("Layer A")
@@ -155,7 +155,7 @@ def test_can_create_new_datalayer(live_server, openmap, page, datalayer):
     assert saved.name == "Layer A"
     expect(page.locator(".umap-is-dirty")).to_be_hidden()
     # Edit again, it should not create a new datalayer
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Edit", exact=True).first.click()
     page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("Layer A with a new name")
@@ -179,7 +179,7 @@ def test_can_restore_version(live_server, openmap, page, datalayer):
     with page.expect_response(re.compile(".*/datalayer/update/.*")):
         page.get_by_role("button", name="Save").click()
     expect(marker).to_have_class(re.compile(".*umap-div-icon.*"))
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Edit", exact=True).click()
     page.get_by_text("Versions").click()
     page.get_by_role("button", name="Restore this version").last.click()
@@ -201,7 +201,7 @@ def test_deleting_datalayer_should_remove_from_browser_and_layers_list(
     panel = page.locator(".panel.left")
     edit_panel = page.locator(".panel.right")
     page.get_by_title("Open browser").click()
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", 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.locator(".panel.right").get_by_title("Delete layer").click()
@@ -216,7 +216,7 @@ def test_deleting_datalayer_should_remove_from_caption(
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     panel = page.locator(".panel.left")
     page.get_by_role("button", name="About").click()
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     expect(panel.get_by_text("test datalayer")).to_be_visible()
     page.locator(".panel.right").get_by_title("Delete layer").click()
     page.get_by_role("button", name="OK").click()
@@ -225,7 +225,7 @@ def test_deleting_datalayer_should_remove_from_caption(
 
 def test_can_edit_datalayer_name_in_list(live_server, openmap, datalayer, page):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.get_by_text("test datalayer").click()
     page.get_by_text("test datalayer").fill("test datalayer foobar")
     page.get_by_role("button", name="Open browser").click()

umap/tests/integration/test_edit_map.py

@@ -21,6 +21,16 @@ def test_can_edit_name(page, live_server, tilelayer):
     )
 
 
+def test_can_display_help(page, live_server, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    page.get_by_title("Edit map name and caption").click()
+    help_button = page.locator(".panel .umap-field-description .umap-help-button")
+    expect(help_button).to_be_visible()
+    help_button.click()
+    expect(page.locator("dialog").first).to_contain_text("Text formatting")
+
+
 def test_can_edit_name_on_click_on_toolbar(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
     page.locator(".umap-main-edit-toolbox .map-name").click()
@@ -60,8 +70,8 @@ def test_zoomcontrol_impacts_ui(live_server, page, tilelayer):
     # Hide them
     page.get_by_text("User interface options").click()
     hide_zoom_controls = (
-        page.locator("div")
-        .filter(has_text=re.compile(r"^Display the zoom control"))
+        page.locator(".panel")
+        .filter(has_text=re.compile("Display the zoom control"))
         .locator("label")
         .nth(2)
     )
@@ -182,7 +192,7 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
 
     # Change the default sortkey to be "key"
     page.get_by_role("button", name="Edit").click()
-    page.get_by_role("link", name="Map advanced properties").click()
+    page.get_by_role("button", name="Map advanced properties").click()
     page.get_by_text("Default properties").click()
 
     # Click "define"
@@ -191,7 +201,7 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
     page.locator('input[name="sortKey"]').fill("key")
 
     # Click the checkmark to apply the changes
-    page.locator(".panel .umap-field-sortKey .blur-button").click()
+    page.locator(".panel .umap-field-sortKey .blur-container button").click()
 
     # Features should be sorted by key  (First, Second, Third)
     first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)
@@ -200,3 +210,19 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
     assert "Z First" == first_listed_feature.text_content()
     assert "Y Second" == second_listed_feature.text_content()
     assert "X Third" == third_listed_feature.text_content()
+
+
+def test_hover_tooltip_setting_should_be_persistent(live_server, map, page):
+    map.settings["properties"]["showLabel"] = None
+    map.edit_status = Map.ANONYMOUS
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    page.get_by_role("button", name="Map advanced properties").click()
+    page.get_by_text("Default interaction options").click()
+    expect(page.get_by_text("on hover")).to_be_visible()
+    expect(page.locator(".umap-field-showLabel")).to_match_aria_snapshot("""
+        - text: Display label
+        - button "clear"
+        - text: always never on hover
+    """)
+    expect(page.locator(".umap-field-showLabel input[value=null]")).to_be_checked()

umap/tests/integration/test_edit_marker.py

@@ -43,7 +43,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
     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()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit", exact=True).click()
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-color .define").click()
@@ -65,7 +65,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
     )
 
     # Now change again at layer level again, it should not change the marker color
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit", exact=True).click()
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-color input").click()
@@ -78,8 +78,8 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
 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()
+    expect(page.get_by_role("button", name="Toggle edit mode")).to_be_visible()
+    expect(page.get_by_role("button", name="Delete this feature")).to_be_visible()
 
 
 def test_should_update_open_popup_on_edit(live_server, openmap, page, bootstrap):
@@ -115,6 +115,6 @@ def test_should_follow_datalayer_style_when_changing_datalayer(
     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.get_by_role("button", 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

@@ -57,7 +57,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
     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.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit", exact=True).click()
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-color .define").click()
@@ -75,7 +75,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
     )
 
     # Now change again at layer level again, it should not change the marker color
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit", exact=True).click()
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-color input").click()
@@ -88,8 +88,8 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
 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()
+    expect(page.get_by_role("button", name="Toggle edit mode")).to_be_visible()
+    expect(page.get_by_role("button", name="Delete this feature")).to_be_visible()
 
 
 def test_can_remove_stroke(live_server, openmap, page, bootstrap):
@@ -98,10 +98,10 @@ def test_can_remove_stroke(live_server, openmap, page, bootstrap):
         1
     )
     page.locator("path").click()
-    page.get_by_role("link", name="Toggle edit mode").click()
+    page.get_by_role("button", name="Toggle edit mode").click()
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-stroke .define").first.click()
-    page.locator(".umap-field-stroke label").first.click()
+    page.locator(".umap-field-stroke .show-on-defined label").first.click()
     expect(page.locator(".leaflet-overlay-pane path[stroke='DarkBlue']")).to_have_count(
         0
     )

umap/tests/integration/test_features_id_generation.py

@@ -6,9 +6,7 @@ def test_ids_generation(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
 
     # Click on the Draw a line button on a new map.
-    create_polyline = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polyline"
-    )
+    create_polyline = page.locator(".umap-edit-bar ").get_by_title("Draw a polyline")
     create_polyline.click()
 
     map = page.locator("#map")
@@ -18,9 +16,7 @@ def test_ids_generation(page, live_server, tilelayer):
     map.click(position={"x": 100, "y": 100})
 
     # Click on the Draw a polygon button on a new map.
-    create_polygon = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polygon"
-    )
+    create_polygon = page.locator(".umap-edit-bar ").get_by_title("Draw a polygon")
     create_polygon.click()
 
     map = page.locator("#map")

umap/tests/integration/test_import.py

@@ -17,14 +17,15 @@ pytestmark = pytest.mark.django_db
 def test_layers_list_is_updated(live_server, tilelayer, page):
     page.goto(f"{live_server.url}/map/new/")
     modifier = "Cmd" if platform.system() == "Darwin" else "Ctrl"
-    page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
+    page.get_by_role("button", name=f"Import data ({modifier}+I)").click()
     # Should work
     page.locator("[name=layer-id]").select_option(label="Import in a new layer")
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", 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=f"Import data ({modifier}+I)").click()
+    page.wait_for_timeout(300)  # Time for the input debounce.
+    page.get_by_role("button", name=f"Import data ({modifier}+I)").click()
     # Should still work
     page.locator("[name=layer-id]").select_option(label="Import in a new layer")
     # Now layer should be visible in the options
@@ -70,13 +71,12 @@ def test_umap_import_from_file(live_server, tilelayer, page):
     expect(nonloaded).to_have_count(1)
 
 
-@pytest.mark.skip
 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="Open browser").click()
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.umap"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("umap")
@@ -111,7 +111,7 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.json"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("geojson")
@@ -122,6 +122,28 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
     expect(paths).to_have_count(3)
 
 
+def test_import_invalid_data(tilelayer, live_server, page):
+    uncaught_errors = []
+    page.on("pageerror", lambda exc: uncaught_errors.append(exc))
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Open browser").click()
+    layers = page.locator(".umap-browser .datalayer")
+    markers = page.locator(".leaflet-marker-icon")
+    paths = page.locator("path")
+    expect(markers).to_have_count(0)
+    expect(paths).to_have_count(0)
+    expect(layers).to_have_count(0)
+    button = page.get_by_title("Import data")
+    expect(button).to_be_visible()
+    button.click()
+    textarea = page.locator(".umap-import textarea")
+    textarea.fill("invalid data")
+    for format in ["geojson", "csv", "gpx", "kml", "georss", "osm", "umap"]:
+        page.locator('select[name="format"]').select_option(format)
+        page.get_by_role("button", name="Import data", exact=True).click()
+        assert not uncaught_errors, f"Error with format {format}"
+
+
 def test_import_kml_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_title("Open browser").click()
@@ -134,7 +156,7 @@ def test_import_kml_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.kml"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("kml")
@@ -158,7 +180,7 @@ def test_import_gpx_from_textarea(tilelayer, live_server, page, settings):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.gpx"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("gpx")
@@ -215,7 +237,7 @@ def test_import_osm_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data_osm.json"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("osm")
@@ -235,7 +257,7 @@ def test_import_csv_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("csv")
@@ -254,7 +276,7 @@ def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap)
     expect(layers).to_have_count(1)
     page.get_by_role("button", name="Edit").click()
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("csv")
@@ -275,7 +297,7 @@ def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
     expect(layers).to_have_count(1)
     page.get_by_role("button", name="Edit").click()
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("csv")
@@ -296,7 +318,7 @@ def test_can_import_in_new_datalayer(live_server, datalayer, page, openmap):
     expect(layers).to_have_count(1)
     page.get_by_role("button", name="Edit").click()
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator("select[name=format]").select_option("csv")
@@ -342,7 +364,7 @@ def test_should_remove_dot_in_property_names(live_server, page, settings, tilela
     }
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
     page.get_by_role("button", name="Import data", exact=True).click()
@@ -403,7 +425,7 @@ def test_import_geometry_collection(live_server, page, tilelayer):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
     page.get_by_role("button", name="Import data", exact=True).click()
@@ -437,7 +459,7 @@ def test_import_multipolygon(live_server, page, tilelayer):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
     page.get_by_role("button", name="Import data", exact=True).click()
@@ -469,7 +491,7 @@ def test_import_multipolyline(live_server, page, tilelayer):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
     page.get_by_role("button", name="Import data", exact=True).click()
@@ -478,13 +500,77 @@ def test_import_multipolyline(live_server, page, tilelayer):
     expect(paths).to_have_count(1)
 
 
+def test_should_not_import_empty_coordinates(live_server, page, tilelayer):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"name": "An empty polygon"},
+                "geometry": {
+                    "type": "Polygon",
+                    "coordinates": [],
+                },
+            },
+            {
+                "type": "Feature",
+                "properties": {"name": "An empty linestring"},
+                "geometry": {
+                    "type": "LineString",
+                    "coordinates": [],
+                },
+            },
+            {
+                "type": "Feature",
+                "properties": {"name": "An empty point"},
+                "geometry": {
+                    "type": "Point",
+                    "coordinates": [],
+                },
+            },
+            {
+                "geometry": {
+                    "type": "Point",
+                    "coordinates": [6.922931671142578, 47.481161607175736],
+                },
+                "type": "Feature",
+                "properties": {"name": "A point"},
+            },
+            {
+                "geometry": {
+                    "type": "LineString",
+                    "coordinates": [
+                        [2.4609375, 48.88639177703194],
+                        [2.48291015625, 48.76343113791796],
+                        [2.164306640625, 48.719961222646276],
+                    ],
+                },
+                "type": "Feature",
+                "properties": {
+                    "name": "A linestring",
+                },
+            },
+        ],
+    }
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Open browser").click()
+    page.get_by_title("Import data").click()
+    textarea = page.locator(".umap-import textarea")
+    textarea.fill(json.dumps(data))
+    page.locator('select[name="format"]').select_option("geojson")
+    page.get_by_role("button", name="Import data", exact=True).click()
+    page.locator("#map").click(button="right")
+    page.get_by_role("button", name="browse data").click()
+    expect(page.locator("li.feature")).to_have_count(2)
+
+
 def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_title("Open browser").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 = page.locator(".umap-import 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 data", exact=True).click()
@@ -501,7 +587,7 @@ def test_import_csv_with_commas_in_latlon(tilelayer, live_server, page, settings
     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 = page.locator(".umap-import textarea")
     textarea.fill("lat;lon;foobar\n12,24;48,34;mypoint\n12,23;48,35;mypoint2")
     page.locator('select[name="format"]').select_option("csv")
     page.get_by_role("button", name="Import data", exact=True).click()
@@ -549,14 +635,14 @@ def test_create_remote_data(page, live_server, tilelayer):
     page.route("*/**/ajax-proxy/**", handle)
     page.goto(f"{live_server.url}/map/new/")
     expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_role("button", name="Import data").click()
     page.get_by_placeholder("Provide an URL here").click()
     page.get_by_placeholder("Provide an URL here").fill("https://remote.org/data.json")
     page.locator("[name=format]").select_option("geojson")
     page.get_by_role("radio", name="Link to the layer as remote data").click()
     page.get_by_role("button", name="Import data", exact=True).click()
     expect(page.locator(".leaflet-marker-icon")).to_be_visible()
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.get_by_role("button", name="Edit", exact=True).click()
     page.locator("summary").filter(has_text="Remote data").click()
     expect(page.locator('.panel input[name="url"]')).to_have_value(
@@ -586,14 +672,14 @@ def test_import_geojson_from_url(page, live_server, tilelayer):
     page.route("https://remote.org/data.json", handle)
     page.goto(f"{live_server.url}/map/new/")
     expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_role("button", name="Import data").click()
     page.get_by_placeholder("Provide an URL here").click()
     page.get_by_placeholder("Provide an URL here").fill("https://remote.org/data.json")
     page.locator("[name=format]").select_option("geojson")
     page.get_by_role("radio", name="Copy into the layer").click()
     page.get_by_role("button", name="Import data", exact=True).click()
     expect(page.locator(".leaflet-marker-icon")).to_be_visible()
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.get_by_role("button", name="Edit", exact=True).click()
     page.locator("summary").filter(has_text="Remote data").click()
     expect(page.locator('.panel input[name="url"]')).to_have_value("")
@@ -604,7 +690,7 @@ def test_overpass_import_with_bbox(page, live_server, tilelayer, settings):
         "overpass": {"url": "https://my.overpass.io/interpreter"}
     }
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_role("button", name="Import data").click()
     page.get_by_role("button", name="Import helpers").click()
     page.get_by_role("button", name="Overpass").click()
     page.get_by_placeholder("amenity=drinking_water").fill("building")
@@ -655,7 +741,7 @@ def test_overpass_import_retains_boundary(page, live_server, tilelayer, settings
     # Intercept the route
     page.route(re.compile("https://foobar.io/api.*"), handle)
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_role("button", name="Import data").click()
     page.get_by_role("button", name="Import helpers").click()
     page.get_by_role("button", name="Overpass").click()
     page.get_by_placeholder("amenity=drinking_water").fill("building")
@@ -710,7 +796,7 @@ def test_import_from_datasets(page, live_server, tilelayer, settings):
     page.route("https://remote.org/data.json", handle)
     page.goto(f"{live_server.url}/map/new/")
     expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_title("Import data").click()
     page.get_by_role("button", name="Import helpers").click()
     page.get_by_role("button", name="Datasets").click()
     page.get_by_role("dialog").get_by_role("combobox").select_option(
@@ -718,7 +804,7 @@ def test_import_from_datasets(page, live_server, tilelayer, settings):
     )
     page.get_by_role("button", name="Choose this dataset").click()
     page.get_by_label("Copy into the layer").check()
-    page.get_by_role("button", name="Import data").click()
+    page.get_by_role("button", name="Import data", exact=True).click()
     expect(page.locator(".leaflet-marker-icon")).to_be_visible()
     page.get_by_role("button", name="Open browser").click()
     expect(page.locator("h5").get_by_text("Good data")).to_be_visible()
@@ -736,7 +822,7 @@ def test_import_osm_relation(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     file_path = Path(__file__).parent.parent / "fixtures/test_import_osm_relation.json"
     textarea.fill(file_path.read_text())
     page.locator('select[name="format"]').select_option("osm")
@@ -756,7 +842,7 @@ def test_import_georss_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_georss.xml"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("georss")

umap/tests/integration/test_optimistic_merge.py

@@ -285,6 +285,7 @@ def test_should_display_alert_on_conflict(context, live_server, datalayer, openm
     # Change name on page one and save
     page_one.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
     page_one.locator('input[name="name"]').fill("name from page one")
+    page_one.wait_for_timeout(300)  # Time for the input debounce.
     with page_one.expect_response(re.compile(r".*/datalayer/update/.*")):
         page_one.get_by_role("button", name="Save").click()
 

umap/tests/integration/test_owned_map.py

@@ -239,7 +239,7 @@ def test_can_delete_datalayer(live_server, map, login, datalayer):
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(1)
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     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/.*")):