umap-project 2.3.0__py3-none-any.whl → 2.4.0__py3-none-any.whl

umap/tests/integration/test_conditional_rules.py

@@ -0,0 +1,201 @@
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+
+def getColors(elements):
+    return [
+        el.evaluate("e => window.getComputedStyle(e).backgroundColor")
+        for el in elements.all()
+    ]
+
+
+DATALAYER_DATA1 = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "mytype": "even",
+                "name": "Point 2",
+                "mynumber": 10,
+                "myboolean": True,
+                "mydate": "2024/04/14 12:19:17",
+            },
+            "geometry": {"type": "Point", "coordinates": [0.065918, 48.385442]},
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "mytype": "odd",
+                "name": "Point 1",
+                "mynumber": 12,
+                "myboolean": False,
+                "mydate": "2024/03/13 12:20:20",
+            },
+            "geometry": {"type": "Point", "coordinates": [3.55957, 49.767074]},
+        },
+    ],
+    "_umap_options": {
+        "name": "Calque 1",
+    },
+}
+
+
+DATALAYER_DATA2 = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "mytype": "even",
+                "name": "Point 4",
+                "mynumber": 10,
+                "myboolean": "true",
+                "mydate": "2024/08/18 13:14:15",
+            },
+            "geometry": {"type": "Point", "coordinates": [0.856934, 45.290347]},
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "mytype": "odd",
+                "name": "Point 3",
+                "mynumber": 14,
+                "mydate": "2024-04-14T10:19:17.000Z",
+            },
+            "geometry": {"type": "Point", "coordinates": [4.372559, 47.945786]},
+        },
+    ],
+    "_umap_options": {
+        "name": "Calque 2",
+    },
+}
+
+
+def test_simple_equal_rule_at_load(live_server, page, map):
+    map.settings["properties"]["rules"] = [
+        {"condition": "mytype=odd", "options": {"color": "aliceblue"}}
+    ]
+    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")
+    markers = page.locator(".leaflet-marker-icon .icon_container")
+    expect(markers).to_have_count(4)
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 2
+
+
+def test_simple_not_equal_rule_at_load(live_server, page, map):
+    map.settings["properties"]["rules"] = [
+        {"condition": "mytype!=even", "options": {"color": "aliceblue"}}
+    ]
+    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")
+    markers = page.locator(".leaflet-marker-icon .icon_container")
+    expect(markers).to_have_count(4)
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 2
+
+
+def test_gt_rule_with_number_at_load(live_server, page, map):
+    map.settings["properties"]["rules"] = [
+        {"condition": "mynumber>10", "options": {"color": "aliceblue"}}
+    ]
+    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")
+    markers = page.locator(".leaflet-marker-icon .icon_container")
+    expect(markers).to_have_count(4)
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 2
+
+
+def test_lt_rule_with_number_at_load(live_server, page, map):
+    map.settings["properties"]["rules"] = [
+        {"condition": "mynumber<14", "options": {"color": "aliceblue"}}
+    ]
+    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")
+    markers = page.locator(".leaflet-marker-icon .icon_container")
+    expect(markers).to_have_count(4)
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 3
+
+
+def test_lt_rule_with_float_at_load(live_server, page, map):
+    map.settings["properties"]["rules"] = [
+        {"condition": "mynumber<12.3", "options": {"color": "aliceblue"}}
+    ]
+    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")
+    markers = page.locator(".leaflet-marker-icon .icon_container")
+    expect(markers).to_have_count(4)
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 3
+
+
+def test_equal_rule_with_boolean_at_load(live_server, page, map):
+    map.settings["properties"]["rules"] = [
+        {"condition": "myboolean=true", "options": {"color": "aliceblue"}}
+    ]
+    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")
+    markers = page.locator(".leaflet-marker-icon .icon_container")
+    expect(markers).to_have_count(4)
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 2
+
+
+def test_can_create_new_rule(live_server, page, openmap):
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA1)
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA2)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}#6/48.948/1.670")
+    markers = page.locator(".leaflet-marker-icon .icon_container")
+    expect(markers).to_have_count(4)
+    page.get_by_role("button", name="Edit").click()
+    page.get_by_role("link", 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()
+    page.locator("input[name=condition]").fill("mytype=odd")
+    page.locator(".umap-field-color .define").first.click()
+    page.get_by_title("AliceBlue").first.click()
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 2
+
+
+def test_can_deactive_rule_from_list(live_server, page, openmap):
+    openmap.settings["properties"]["rules"] = [
+        {"condition": "mytype=odd", "options": {"color": "aliceblue"}}
+    ]
+    openmap.save()
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA1)
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA2)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}#6/48.948/1.670")
+    markers = page.locator(".leaflet-marker-icon .icon_container")
+    expect(markers).to_have_count(4)
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 2
+    page.get_by_role("button", name="Edit").click()
+    page.get_by_role("link", 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)
+    assert colors.count("rgb(240, 248, 255)") == 0
+    page.get_by_role("button", name="Show/hide layer").click()
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 2

umap/tests/integration/test_dashboard.py

@@ -28,7 +28,7 @@ def test_owner_can_delete_map_after_confirmation(map, live_server, login):
 def test_dashboard_map_preview(map, live_server, datalayer, login):
     page = login(map.owner)
     page.goto(f"{live_server.url}/en/me")
-    dialog = page.locator("dialog")
+    dialog = page.get_by_role("dialog")
     expect(dialog).to_be_hidden()
     button = page.get_by_role("button", name="Open preview")
     expect(button).to_be_visible()

umap/tests/integration/test_datalayer.py

@@ -27,7 +27,7 @@ def test_honour_displayOnLoad_false(map, live_server, datalayer, page):
     layers_off = page.locator(".umap-browser .datalayer.off")
     expect(layers).to_have_count(1)
     expect(layers_off).to_have_count(1)
-    page.get_by_role("button", name="See layers").click()
+    page.get_by_role("button", name="Open browser").click()
     page.get_by_label("Zoom in").click()
     expect(markers).to_be_hidden()
     page.get_by_title("Show/hide layer").click()
@@ -41,7 +41,7 @@ def test_should_honour_fromZoom(live_server, map, datalayer, page):
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_be_hidden()
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/48.55/14.68")
-    markers = page.locator(".leaflet-marker-icon")
+    page.wait_for_timeout(500)
     expect(markers).to_be_visible()
     page.get_by_label("Zoom out").click()
     expect(markers).to_be_hidden()
@@ -57,7 +57,6 @@ def test_should_honour_toZoom(live_server, map, datalayer, page):
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_be_hidden()
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/48.55/14.68")
-    markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_be_visible()
     page.get_by_label("Zoom out").click()
     expect(markers).to_be_visible()

umap/tests/integration/test_edit_datalayer.py

@@ -54,7 +54,7 @@ def test_cancel_deleting_datalayer_should_restore(
     live_server, openmap, datalayer, page
 ):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)
@@ -63,7 +63,7 @@ def test_cancel_deleting_datalayer_should_restore(
     page.once("dialog", lambda dialog: dialog.accept())
     page.locator(".panel.right").get_by_title("Delete layer").click()
     expect(markers).to_have_count(0)
-    page.get_by_role("button", name="See layers").click()
+    page.get_by_role("button", name="Open browser").click()
     expect(page.get_by_text("test datalayer")).to_be_hidden()
     page.once("dialog", lambda dialog: dialog.accept())
     page.get_by_role("button", name="Cancel edits").click()
@@ -73,7 +73,7 @@ def test_cancel_deleting_datalayer_should_restore(
 
 def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)
@@ -183,3 +183,32 @@ def test_can_edit_layer_on_ctrl_shift_click(live_server, openmap, page, datalaye
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     page.locator(".leaflet-marker-icon").click(modifiers=[modifier, "Shift"])
     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("Open browser").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

@@ -170,7 +170,7 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
 
     # By default, features are sorted by name  (Third, Second, First)
-    page.get_by_role("button", name="See layers").click()
+    page.get_by_role("button", name="Open browser").click()
     page.get_by_role("heading", name="Show/hide layer").locator("i").click()
 
     first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)

umap/tests/integration/test_facets_browser.py

@@ -1,4 +1,5 @@
 import copy
+import re
 
 import pytest
 from playwright.sync_api import expect
@@ -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-browser")
+    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()
@@ -225,7 +228,7 @@ def test_facets_search_are_persistent_when_closing_panel(live_server, page, map)
     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")
+    panel = page.locator(".panel.left")
 
     # Facet values
     odd = page.get_by_label("odd")
@@ -263,8 +266,8 @@ def test_facets_search_are_persistent_when_closing_panel(live_server, page, map)
     # 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()
+    panel.get_by_role("button", name="Close").click()
+    page.get_by_role("button", name="Open browser").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()