umap-project 2.2.2__py3-none-any.whl → 2.3.1__py3-none-any.whl

umap/tests/base.py

@@ -125,6 +125,7 @@ class DataLayerFactory(factory.django.DjangoModelFactory):
                 **kwargs["settings"],
             }
         data.setdefault("_umap_options", {})
+        kwargs["settings"]["name"] = kwargs["name"]
         data["_umap_options"]["name"] = kwargs["name"]
         kwargs["geojson"] = ContentFile(json.dumps(data), "foo.json")
         return kwargs

umap/tests/integration/conftest.py

@@ -1,14 +1,15 @@
 import os
 
 import pytest
+from playwright.sync_api import expect
 
 
 @pytest.fixture(autouse=True)
 def set_timeout(context):
-    context.set_default_timeout(int(os.environ.get("PLAYWRIGHT_TIMEOUT", 7500)))
-    context.set_default_navigation_timeout(
-        int(os.environ.get("PLAYWRIGHT_TIMEOUT", 7500))
-    )
+    timeout = int(os.environ.get("PLAYWRIGHT_TIMEOUT", 7500))
+    context.set_default_timeout(timeout)
+    context.set_default_navigation_timeout(timeout)
+    expect.set_options(timeout=timeout)
 
 
 @pytest.fixture(autouse=True)

umap/tests/integration/test_browser.py

@@ -1,3 +1,4 @@
+import re
 from copy import deepcopy
 from time import sleep
 
@@ -63,8 +64,9 @@ def bootstrap(map, live_server):
 
 def test_data_browser_should_be_open(live_server, page, bootstrap, map):
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    el = page.locator(".umap-browser")
-    expect(el).to_be_visible()
+    panel = page.locator(".panel.left.on")
+    expect(panel).to_have_class(re.compile(".*expanded.*"))
+    expect(panel.locator(".umap-browser")).to_be_visible()
     expect(page.get_by_text("one point in france")).to_be_visible()
     expect(page.get_by_text("one line in new zeland")).to_be_visible()
     expect(page.get_by_text("one polygon in greenland")).to_be_visible()
@@ -77,6 +79,7 @@ def test_data_browser_should_be_filterable(live_server, page, bootstrap, map):
     paths = page.locator(".leaflet-overlay-pane path")
     expect(markers).to_have_count(1)
     expect(paths).to_have_count(2)
+    page.locator(".filters summary").click()
     filter_ = page.locator("input[name='filter']")
     expect(filter_).to_be_visible()
     filter_.type("poly")
@@ -103,6 +106,7 @@ def test_data_browser_should_be_filterable(live_server, page, bootstrap, map):
 def test_data_browser_can_show_only_visible_features(live_server, page, bootstrap, map):
     # Zoom on France
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/51.000/2.000")
+    page.locator(".filters summary").click()
     el = page.get_by_text("Current map view")
     expect(el).to_be_visible()
     el.click()
@@ -114,6 +118,7 @@ def test_data_browser_can_show_only_visible_features(live_server, page, bootstra
 def test_data_browser_can_mix_filter_and_bbox(live_server, page, bootstrap, map):
     # Zoom on north west
     page.goto(f"{live_server.url}{map.get_absolute_url()}#4/61.98/-2.68")
+    page.locator(".filters summary").click()
     el = page.get_by_text("Current map view")
     expect(el).to_be_visible()
     el.click()
@@ -131,6 +136,7 @@ def test_data_browser_can_mix_filter_and_bbox(live_server, page, bootstrap, map)
 def test_data_browser_bbox_limit_should_be_dynamic(live_server, page, bootstrap, map):
     # Zoom on Europe
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/51.000/2.000")
+    page.locator(".filters summary").click()
     el = page.get_by_text("Current map view")
     expect(el).to_be_visible()
     el.click()
@@ -156,6 +162,7 @@ def test_data_browser_bbox_filter_should_be_persistent(
 ):
     # Zoom on Europe
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/51.000/2.000")
+    page.locator(".filters summary").click()
     el = page.get_by_text("Current map view")
     expect(el).to_be_visible()
     el.click()
@@ -181,6 +188,7 @@ def test_data_browser_bbox_filtered_is_clickable(live_server, page, bootstrap, m
     popup = page.locator(".leaflet-popup")
     # Zoom on Europe
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/51.000/2.000")
+    page.locator(".filters summary").click()
     el = page.get_by_text("Current map view")
     expect(el).to_be_visible()
     el.click()
@@ -202,6 +210,7 @@ def test_data_browser_with_variable_in_name(live_server, page, bootstrap, map):
     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()
+    page.locator(".filters summary").click()
     filter_ = page.locator("input[name='filter']")
     expect(filter_).to_be_visible()
     filter_.type("foobar")  # Hide all

umap/tests/integration/test_caption.py

@@ -0,0 +1,27 @@
+import re
+
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+
+def test_caption(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "caption"
+    map.save()
+    basic = DataLayerFactory(map=map, name="Basic layer")
+    non_loaded = DataLayerFactory(
+        map=map, name="Non loaded", settings={"displayOnLoad": False}
+    )
+    hidden = DataLayerFactory(map=map, name="Hidden", settings={"inCaption": False})
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    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(".datalayer-legend .off").get_by_text(non_loaded.name)
+    ).to_be_visible()
+    expect(panel.locator(".datalayer-legend").get_by_text(hidden.name)).to_be_hidden()

umap/tests/integration/test_choropleth.py

@@ -50,7 +50,7 @@ def test_basic_choropleth_map_with_custom_brewer(openmap, live_server, page):
     page.get_by_role("button", name="Edit").click()
     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="Choropleth: settings").click()
+    page.get_by_text("Choropleth: settings").click()
     page.locator('select[name="brewer"]').select_option("Greens")
 
     # Hauts-de-France

umap/tests/integration/test_draw_polygon.py

@@ -83,6 +83,8 @@ def test_clicking_esc_should_finish_polygon(page, live_server, tilelayer):
     page.keyboard.press("Escape")
     expect(lines).to_have_count(1)
     expect(guide).to_have_count(0)
+    # Should have opened edit form panel
+    expect(page.locator(".panel").get_by_text("Feature properties")).to_be_visible()
 
 
 def test_clicking_esc_should_delete_polygon_if_empty(page, live_server, tilelayer):
@@ -106,6 +108,8 @@ def test_clicking_esc_should_delete_polygon_if_empty(page, live_server, tilelaye
     page.keyboard.press("Escape")
     expect(lines).to_have_count(0)
     expect(guide).to_have_count(0)
+    # Should not have opened edit form panel
+    expect(page.locator(".panel").get_by_text("Feature properties")).to_be_hidden()
 
 
 def test_clicking_esc_should_delete_polygon_if_invalid(page, live_server, tilelayer):
@@ -137,6 +141,8 @@ def test_clicking_esc_should_delete_polygon_if_invalid(page, live_server, tilela
     page.keyboard.press("Escape")
     expect(lines).to_have_count(0)
     expect(guide).to_have_count(0)
+    # Should not have opened edit form panel
+    expect(page.locator(".panel").get_by_text("Feature properties")).to_be_hidden()
 
 
 def test_can_draw_multi(live_server, page, tilelayer):

umap/tests/integration/test_draw_polyline.py

@@ -83,6 +83,8 @@ def test_clicking_esc_should_finish_line(page, live_server, tilelayer):
     page.keyboard.press("Escape")
     expect(lines).to_have_count(1)
     expect(guide).to_have_count(0)
+    # Should have opened edit form panel
+    expect(page.locator(".panel").get_by_text("Feature properties")).to_be_visible()
 
 
 def test_clicking_esc_should_delete_line_if_empty(page, live_server, tilelayer):
@@ -110,6 +112,8 @@ def test_clicking_esc_should_delete_line_if_empty(page, live_server, tilelayer):
     page.keyboard.press("Escape")
     expect(lines).to_have_count(0)
     expect(guide).to_have_count(0)
+    # Should not have opened edit form panel
+    expect(page.locator(".panel").get_by_text("Feature properties")).to_be_hidden()
 
 
 def test_clicking_esc_should_delete_line_if_invalid(page, live_server, tilelayer):
@@ -135,6 +139,8 @@ def test_clicking_esc_should_delete_line_if_invalid(page, live_server, tilelayer
     page.keyboard.press("Escape")
     expect(lines).to_have_count(0)
     expect(guide).to_have_count(0)
+    # Should not have opened edit form panel
+    expect(page.locator(".panel").get_by_text("Feature properties")).to_be_hidden()
 
 
 def test_can_draw_multi(live_server, page, tilelayer):

umap/tests/integration/test_edit_datalayer.py

@@ -80,7 +80,7 @@ def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
     expect(markers).to_have_count(1)
     page.get_by_role("link", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Edit", exact=True).click()
-    page.get_by_role("heading", name="Advanced actions").click()
+    page.get_by_text("Advanced actions").click()
     page.get_by_role("button", name="Clone").click()
     expect(layers).to_have_count(2)
     expect(markers).to_have_count(2)
@@ -104,7 +104,7 @@ def test_can_change_icon_class(live_server, openmap, page):
     page.get_by_role("link", 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_role("heading", name="Shape properties").click()
+    page.get_by_text("Shape properties").click()
     page.locator(".umap-field-iconClass a.define").click()
     page.get_by_text("Circle").click()
     expect(page.locator(".umap-circle-icon")).to_be_visible()
@@ -165,14 +165,14 @@ def test_can_restore_version(live_server, openmap, page, datalayer):
     marker = page.locator(".leaflet-marker-icon")
     expect(marker).to_have_class(re.compile(".*umap-ball-icon.*"))
     marker.click(modifiers=["Shift"])
-    page.get_by_role("heading", name="Shape properties").click()
+    page.get_by_text("Shape properties").click()
     page.locator("#umap-feature-shape-properties").get_by_text("Default").click()
     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.locator(".panel.right").get_by_title("Edit", exact=True).click()
-    page.get_by_role("heading", name="Versions").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()
     expect(marker).to_have_class(re.compile(".*umap-ball-icon.*"))
@@ -182,4 +182,33 @@ def test_can_edit_layer_on_ctrl_shift_click(live_server, openmap, page, datalaye
     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()
+    expect(page.get_by_text("Layer properties")).to_be_visible()
+
+
+def test_deleting_datalayer_should_remove_from_browser_and_layers_list(
+    live_server, openmap, datalayer, page
+):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    panel = page.locator(".panel.left")
+    edit_panel = page.locator(".panel.right")
+    page.get_by_title("See layers").click()
+    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()
+    expect(panel.get_by_text("test datalayer")).to_be_hidden()
+    expect(edit_panel.get_by_text("test datalayer")).to_be_hidden()
+
+
+def test_deleting_datalayer_should_remove_from_caption(
+    live_server, openmap, datalayer, page
+):
+    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()
+    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()
+    expect(panel.get_by_text("test datalayer")).to_be_hidden()

umap/tests/integration/test_edit_map.py

@@ -58,7 +58,7 @@ def test_zoomcontrol_impacts_ui(live_server, page, tilelayer):
     expect(zoom_out).to_be_visible()
 
     # Hide them
-    page.get_by_role("heading", name="User interface options").click()
+    page.get_by_text("User interface options").click()
     hide_zoom_controls = (
         page.locator("div")
         .filter(has_text=re.compile(r"^Display the zoom control"))
@@ -90,7 +90,7 @@ def test_map_color_impacts_data(live_server, page, tilelayer):
     expect(marker_pane_p1).to_have_count(1)
 
     # Change the default color
-    page.get_by_role("heading", name="Shape properties").click()
+    page.get_by_text("Shape properties").click()
     page.locator("#umap-feature-shape-properties").get_by_text("define").first.click()
     page.get_by_title("Lime", exact=True).click()
 
@@ -108,7 +108,7 @@ def test_limitbounds_impacts_ui(live_server, page, tilelayer):
     expect(gear_icon).to_be_visible()
     gear_icon.click()
 
-    page.get_by_role("heading", name="Limit bounds").click()
+    page.get_by_text("Limit bounds").click()
     default_zoom_url = f"{live_server.url}/en/map/new/#5/51.110/7.053"
     page.goto(default_zoom_url)
     page.get_by_role("button", name="Use current bounds").click()
@@ -183,7 +183,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("heading", name="Default properties").click()
+    page.get_by_text("Default properties").click()
 
     # Click "define"
     page.locator(".panel .umap-field-sortKey .define").click()

umap/tests/integration/test_edit_marker.py

@@ -36,7 +36,7 @@ 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()
+    expect(page.get_by_text("Layer properties")).to_be_visible()
 
 
 def test_marker_style_should_have_precedence(live_server, openmap, page, bootstrap):
@@ -45,7 +45,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
     # 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.get_by_text("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)"
@@ -57,7 +57,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
 
     # 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.get_by_text("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(
@@ -67,7 +67,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.locator(".panel").get_by_title("Edit", exact=True).click()
-    page.get_by_role("heading", name="Shape properties").click()
+    page.get_by_text("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(
@@ -87,12 +87,12 @@ def test_should_update_open_popup_on_edit(live_server, openmap, page, bootstrap)
     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("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()
+    expect(page.get_by_text("test marker edited")).to_be_visible()
 
 
 def test_should_follow_datalayer_style_when_changing_datalayer(

umap/tests/integration/test_edit_polygon.py

@@ -50,7 +50,7 @@ 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()
+    expect(page.get_by_text("Layer properties")).to_be_visible()
 
 
 def test_marker_style_should_have_precedence(live_server, openmap, page, bootstrap):
@@ -59,7 +59,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
     # 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.get_by_text("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()
@@ -67,7 +67,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
 
     # 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.get_by_text("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(
@@ -77,7 +77,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.locator(".panel").get_by_title("Edit", exact=True).click()
-    page.get_by_role("heading", name="Shape properties").click()
+    page.get_by_text("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(
@@ -99,7 +99,7 @@ def test_can_remove_stroke(live_server, openmap, page, bootstrap):
     )
     page.locator("path").click()
     page.get_by_role("link", name="Toggle edit mode").click()
-    page.get_by_role("heading", name="Shape properties").click()
+    page.get_by_text("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(
@@ -111,7 +111,7 @@ def test_can_remove_stroke(live_server, openmap, page, bootstrap):
 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.get_by_text("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(

umap/tests/integration/test_facets_browser.py

@@ -1,4 +1,5 @@
 import copy
+import re
 
 import pytest
 from playwright.sync_api import expect
@@ -93,7 +94,7 @@ DATALAYER_DATA3 = {
 
 
 def test_simple_facet_search(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "facet"
+    map.settings["properties"]["onLoadPanel"] = "datafilters"
     map.settings["properties"]["facetKey"] = "mytype|My type,mynumber|My Number|number"
     map.settings["properties"]["showLabel"] = True
     map.save()
@@ -101,7 +102,9 @@ def test_simple_facet_search(live_server, page, map):
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
     DataLayerFactory(map=map, data=DATALAYER_DATA3)
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/48.948/1.670")
-    panel = page.locator(".umap-facet-search")
+    panel = page.locator(".panel.left.on")
+    expect(panel).to_have_class(re.compile(".*expanded.*"))
+    expect(panel.locator(".umap-browser")).to_be_visible()
     # From a non browsable datalayer, should not be impacted
     paths = page.locator(".leaflet-overlay-pane path")
     expect(paths).to_be_visible()
@@ -117,17 +120,28 @@ def test_simple_facet_search(live_server, page, map):
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(4)
     # Tooltips
-    expect(page.get_by_text("Point 1")).to_be_visible()
-    expect(page.get_by_text("Point 2")).to_be_visible()
-    expect(page.get_by_text("Point 3")).to_be_visible()
-    expect(page.get_by_text("Point 4")).to_be_visible()
+    expect(page.get_by_role("tooltip", name="Point 1")).to_be_visible()
+    expect(page.get_by_role("tooltip", name="Point 2")).to_be_visible()
+    expect(page.get_by_role("tooltip", name="Point 3")).to_be_visible()
+    expect(page.get_by_role("tooltip", name="Point 4")).to_be_visible()
+
+    # Datalist
+    expect(panel.get_by_text("Point 1")).to_be_visible()
+    expect(panel.get_by_text("Point 2")).to_be_visible()
+    expect(panel.get_by_text("Point 3")).to_be_visible()
+    expect(panel.get_by_text("Point 4")).to_be_visible()
+
     # Now let's filter
     odd.click()
     expect(markers).to_have_count(2)
-    expect(page.get_by_text("Point 2")).to_be_hidden()
-    expect(page.get_by_text("Point 4")).to_be_hidden()
-    expect(page.get_by_text("Point 1")).to_be_visible()
-    expect(page.get_by_text("Point 3")).to_be_visible()
+    expect(page.get_by_role("tooltip", name="Point 2")).to_be_hidden()
+    expect(page.get_by_role("tooltip", name="Point 4")).to_be_hidden()
+    expect(page.get_by_role("tooltip", name="Point 1")).to_be_visible()
+    expect(page.get_by_role("tooltip", name="Point 3")).to_be_visible()
+    expect(panel.get_by_text("Point 2")).to_be_hidden()
+    expect(panel.get_by_text("Point 4")).to_be_hidden()
+    expect(panel.get_by_text("Point 1")).to_be_visible()
+    expect(panel.get_by_text("Point 3")).to_be_visible()
     expect(paths).to_be_visible
     # Now let's filter
     odd.click()
@@ -156,7 +170,7 @@ def test_simple_facet_search(live_server, page, map):
 
 
 def test_date_facet_search(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "facet"
+    map.settings["properties"]["onLoadPanel"] = "datafilters"
     map.settings["properties"]["facetKey"] = "mydate|Date filter|date"
     map.save()
     DataLayerFactory(map=map, data=DATALAYER_DATA1)
@@ -174,7 +188,7 @@ def test_date_facet_search(live_server, page, map):
 
 
 def test_choice_with_empty_value(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "facet"
+    map.settings["properties"]["onLoadPanel"] = "datafilters"
     map.settings["properties"]["facetKey"] = "mytype|My type"
     map.save()
     data = copy.deepcopy(DATALAYER_DATA1)
@@ -191,7 +205,7 @@ def test_choice_with_empty_value(live_server, page, map):
 
 
 def test_number_with_zero_value(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "facet"
+    map.settings["properties"]["onLoadPanel"] = "datafilters"
     map.settings["properties"]["facetKey"] = "mynumber|Filter|number"
     map.save()
     data = copy.deepcopy(DATALAYER_DATA1)
@@ -205,3 +219,61 @@ def test_number_with_zero_value(live_server, page, map):
     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)
+
+
+def test_facets_search_are_persistent_when_closing_panel(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "datafilters"
+    map.settings["properties"]["facetKey"] = "mytype|My type,mynumber|My Number|number"
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA1)
+    DataLayerFactory(map=map, data=DATALAYER_DATA2)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/48.948/1.670")
+    panel = page.locator(".umap-browser")
+
+    # Facet values
+    odd = page.get_by_label("odd")
+    markers = page.locator(".leaflet-marker-icon")
+    expect(markers).to_have_count(4)
+
+    # Datalist in the browser
+    expect(panel.get_by_text("Point 1")).to_be_visible()
+    expect(panel.get_by_text("Point 2")).to_be_visible()
+    expect(panel.get_by_text("Point 3")).to_be_visible()
+    expect(panel.get_by_text("Point 4")).to_be_visible()
+
+    # Now let's filter
+    odd.click()
+    expect(page.locator("summary")).to_have_attribute("data-badge", " ")
+    expect(page.locator(".umap-control-browse")).to_have_attribute("data-badge", " ")
+    expect(markers).to_have_count(2)
+    expect(panel.get_by_text("Point 2")).to_be_hidden()
+    expect(panel.get_by_text("Point 4")).to_be_hidden()
+    expect(panel.get_by_text("Point 1")).to_be_visible()
+    expect(panel.get_by_text("Point 3")).to_be_visible()
+
+    # Let's filter using the number facet
+    expect(panel.get_by_label("Min")).to_have_value("10")
+    expect(panel.get_by_label("Max")).to_have_value("14")
+    page.get_by_label("Min").fill("13")
+    page.keyboard.press("Tab")  # Move out of the input, so the "change" event is sent
+    expect(panel.get_by_label("Min")).to_have_attribute("data-modified", "true")
+    expect(markers).to_have_count(1)
+    expect(panel.get_by_text("Point 2")).to_be_hidden()
+    expect(panel.get_by_text("Point 4")).to_be_hidden()
+    expect(panel.get_by_text("Point 1")).to_be_hidden()
+    expect(panel.get_by_text("Point 3")).to_be_visible()
+
+    # Close panel
+    expect(panel.locator("summary")).to_have_attribute("data-badge", " ")
+    expect(page.locator(".umap-control-browse")).to_have_attribute("data-badge", " ")
+    page.get_by_role("listitem", name="Close").click()
+    page.get_by_role("button", name="See layers").click()
+    expect(panel.get_by_label("Min")).to_have_value("13")
+    expect(panel.get_by_label("Min")).to_have_attribute("data-modified", "true")
+    expect(panel.get_by_label("odd")).to_be_checked()
+
+    # Datalist in the browser should be inchanged
+    expect(panel.get_by_text("Point 2")).to_be_hidden()
+    expect(panel.get_by_text("Point 4")).to_be_hidden()
+    expect(panel.get_by_text("Point 1")).to_be_hidden()
+    expect(panel.get_by_text("Point 3")).to_be_visible()

umap/tests/integration/test_map.py

@@ -188,21 +188,6 @@ def test_remote_layer_should_not_be_used_as_datalayer_for_created_features(
     expect(layers).to_have_count(2)
 
 
-def test_can_hide_datalayer_from_caption(openmap, live_server, datalayer, page):
-    # Add another DataLayer
-    other = DataLayerFactory(map=openmap, name="Hidden", settings={"inCaption": False})
-    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    toggle = page.get_by_text("About").first
-    expect(toggle).to_be_visible()
-    toggle.click()
-    layers = page.locator(".umap-caption .datalayer-legend")
-    expect(layers).to_have_count(1)
-    found = page.locator(".panel.left.on").get_by_text(datalayer.name)
-    expect(found).to_be_visible()
-    hidden = page.locator(".panel.left.on").get_by_text(other.name)
-    expect(hidden).to_be_hidden()
-
-
 def test_minimap_on_load(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.locator(".leaflet-control-minimap")).to_be_hidden()

umap/tests/integration/test_view_marker.py

@@ -1,3 +1,4 @@
+import re
 from copy import deepcopy
 
 import pytest
@@ -62,3 +63,19 @@ def test_should_display_tooltip_with_variable(live_server, map, page, bootstrap)
     map.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.get_by_text("Foo test marker")).to_be_visible()
+
+
+def test_should_open_popup_panel_on_click(live_server, map, page, bootstrap):
+    map.settings["properties"]["popupShape"] = "Panel"
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    panel = page.locator(".panel.left.on")
+    expect(panel).to_be_hidden()
+    page.locator(".leaflet-marker-icon").click()
+    expect(panel).to_be_visible()
+    expect(panel).to_have_class(re.compile(".*expanded.*"))
+    expect(panel.get_by_role("heading", name="test marker")).to_be_visible()
+    expect(panel.get_by_text("Some description")).to_be_visible()
+    # Close popup
+    page.locator("#map").click()
+    expect(panel).to_be_hidden()

{umap_project-2.2.2.dist-info → umap_project-2.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: umap-project
-Version: 2.2.2
+Version: 2.3.1
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>
@@ -19,7 +19,7 @@ Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.0.4
+Requires-Dist: django==5.0.6
 Requires-Dist: pillow==10.3.0
 Requires-Dist: psycopg==3.1.18
 Requires-Dist: rcssmin==1.1.2
@@ -29,12 +29,13 @@ Requires-Dist: social-auth-app-django==5.4.1
 Requires-Dist: social-auth-core==4.5.4
 Provides-Extra: dev
 Requires-Dist: djlint==1.34.1; extra == 'dev'
-Requires-Dist: hatch==1.9.7; extra == 'dev'
+Requires-Dist: hatch==1.10.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.18; extra == 'dev'
-Requires-Dist: mkdocs==1.5.3; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.23; extra == 'dev'
+Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
+Requires-Dist: mkdocs==1.6.0; extra == 'dev'
 Requires-Dist: pymdown-extensions==10.8.1; extra == 'dev'
-Requires-Dist: ruff==0.4.2; extra == 'dev'
+Requires-Dist: ruff==0.4.3; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.25.1; extra == 'docker'
@@ -42,7 +43,7 @@ Provides-Extra: test
 Requires-Dist: factory-boy==3.2.1; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.8.0; extra == 'test'
-Requires-Dist: pytest-playwright==0.4.4; extra == 'test'
+Requires-Dist: pytest-playwright==0.5.0; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==8.2.0; extra == 'test'
 Description-Content-Type: text/markdown