umap-project 2.9.0b0__py3-none-any.whl → 2.9.1__py3-none-any.whl

umap/tests/integration/test_conditional_rules.py

@@ -252,7 +252,7 @@ def test_can_create_new_rule(live_server, page, openmap):
     markers = page.locator(".leaflet-marker-icon .icon_container")
     expect(markers).to_have_count(5)
     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("Conditional style rules").click()
     page.get_by_role("button", name="Add rule").click()
     page.locator("input[name=condition]").click()
@@ -276,7 +276,7 @@ def test_can_deactive_rule_from_list(live_server, page, openmap):
     colors = getColors(markers)
     assert colors.count("rgb(240, 248, 255)") == 3
     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("Conditional style rules").click()
     page.get_by_role("button", name="Show/hide layer").click()
     colors = getColors(markers)
@@ -289,7 +289,7 @@ def test_can_deactive_rule_from_list(live_server, page, openmap):
 def test_autocomplete_datalist(live_server, page, openmap):
     DataLayerFactory(map=openmap, data=DATALAYER_DATA1)
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.948/1.670")
-    page.get_by_role("link", name="Map advanced properties").click()
+    page.get_by_role("button", name="Map advanced properties").click()
     page.locator("summary").filter(has_text="Conditional style rules").click()
     page.get_by_role("button", name="Add rule").click()
     panel = page.locator(".panel.right.on")

umap/tests/integration/test_draw_polygon.py

@@ -10,10 +10,8 @@ def test_draw_polygon(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
 
     # Click on the Draw a polygon button on a new map.
-    create_line = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polygon"
-    )
-    create_line.click()
+    create_path = page.locator(".umap-edit-bar").get_by_title("Draw a polygon")
+    create_path.click()
 
     # Check no polygon is present by default.
     # We target with the color, because there is also the drawing line guide (dash-array)
@@ -44,10 +42,8 @@ def test_clicking_esc_should_finish_polygon(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
 
     # Click on the Draw a polygon button on a new map.
-    create_line = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polygon"
-    )
-    create_line.click()
+    create_path = page.locator(".umap-edit-bar ").get_by_title("Draw a polygon")
+    create_path.click()
 
     # Check no polygon is present by default.
     # We target with the color, because there is also the drawing line guide (dash-array)
@@ -80,10 +76,8 @@ def test_clicking_esc_should_delete_polygon_if_empty(page, live_server, tilelaye
     page.goto(f"{live_server.url}/en/map/new/")
 
     # Click on the Draw a polygon button on a new map.
-    create_line = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polygon"
-    )
-    create_line.click()
+    create_path = page.locator(".umap-edit-bar ").get_by_title("Draw a polygon")
+    create_path.click()
 
     # Check no polygon is present by default.
     # We target with the color, because there is also the drawing line guide (dash-array)
@@ -105,10 +99,8 @@ def test_clicking_esc_should_delete_polygon_if_invalid(page, live_server, tilela
     page.goto(f"{live_server.url}/en/map/new/")
 
     # Click on the Draw a polygon button on a new map.
-    create_line = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polygon"
-    )
-    create_line.click()
+    create_path = page.locator(".umap-edit-bar ").get_by_title("Draw a polygon")
+    create_path.click()
 
     # Check no polygon is present by default.
     # We target with the color, because there is also the drawing line guide (dash-array)
@@ -188,7 +180,7 @@ def test_can_draw_hole(page, live_server, tilelayer):
 
     # First vertex of the hole will be created here
     map.click(position={"x": 180, "y": 120})
-    page.get_by_role("link", name="Start a hole here").click()
+    page.get_by_role("button", name="Start a hole here").click()
     map.click(position={"x": 180, "y": 180})
     map.click(position={"x": 120, "y": 180})
     map.click(position={"x": 120, "y": 120})
@@ -479,11 +471,11 @@ def test_vertexmarker_not_shown_if_too_many(live_server, map, page, settings):
     settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/en/map/new/#15/48.4395/3.3189")
     page.get_by_title("Import data").click()
-    page.locator(".umap-upload textarea").fill(geojson)
+    page.locator(".umap-import textarea").fill(geojson)
     page.locator('select[name="format"]').select_option("geojson")
     page.get_by_role("button", name="Import data", exact=True).click()
     page.locator("path").click()
-    page.get_by_role("link", name="Toggle edit mode (⇧+Click)").click()
+    page.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     expect(page.locator(".umap-tooltip-container")).to_contain_text(
         "Please zoom in to edit the geometry"
     )

umap/tests/integration/test_draw_polyline.py

@@ -10,9 +10,7 @@ def test_draw_polyline(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_line = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polyline"
-    )
+    create_line = page.locator(".umap-edit-bar ").get_by_title("Draw a polyline")
     create_line.click()
 
     # Check no line is present by default.
@@ -44,9 +42,7 @@ def test_clicking_esc_should_finish_line(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_line = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polyline"
-    )
+    create_line = page.locator(".umap-edit-bar ").get_by_title("Draw a polyline")
     create_line.click()
 
     # Check no line is present by default.
@@ -80,9 +76,7 @@ def test_clicking_esc_should_delete_line_if_empty(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_line = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polyline"
-    )
+    create_line = page.locator(".umap-edit-bar ").get_by_title("Draw a polyline")
     create_line.click()
 
     # Check no line is present by default.
@@ -109,9 +103,7 @@ def test_clicking_esc_should_delete_line_if_invalid(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_line = page.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polyline"
-    )
+    create_line = page.locator(".umap-edit-bar ").get_by_title("Draw a polyline")
     create_line.click()
 
     # Check no line is present by default.
@@ -337,11 +329,11 @@ def test_can_delete_shape_using_toolbar(live_server, page, tilelayer, settings):
 
     # Now split the line
     map.click(position={"x": 100, "y": 100})
-    page.get_by_role("link", name="Split line").click()
+    page.get_by_role("button", name="Split line").click()
 
     # Delete part of it
     map.click(position={"x": 125, "y": 100})
-    page.get_by_role("link", name="Delete this shape").click()
+    page.get_by_role("button", name="Delete this shape").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

@@ -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,7 +99,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#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()
@@ -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()
@@ -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"
@@ -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,7 +98,7 @@ 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 .show-on-defined label").first.click()

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")