umap-project 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

umap/tests/integration/test_browser.py

@@ -4,8 +4,6 @@ from time import sleep
 import pytest
 from playwright.sync_api import expect
 
-from umap.models import Map
-
 from ..base import DataLayerFactory
 
 pytestmark = pytest.mark.django_db
@@ -247,10 +245,8 @@ def test_should_sort_features_in_natural_order(live_server, map, page):
     expect(features.nth(2)).to_have_text("100. a line")
 
 
-def test_should_redraw_list_on_feature_delete(live_server, map, page, bootstrap):
-    map.edit_status = Map.ANONYMOUS
-    map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+def test_should_redraw_list_on_feature_delete(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
     # Enable edit
     page.get_by_role("button", name="Edit").click()
     buttons = page.locator(".umap-browse-data li .feature-delete")
@@ -305,11 +301,8 @@ def test_should_allow_to_toggle_datalayer_visibility(live_server, map, page, boo
     expect(paths).to_have_count(0)
 
 
-def test_should_have_edit_buttons_in_edit_mode(live_server, map, page, bootstrap):
-    # Faster than doing a login
-    map.edit_status = Map.ANONYMOUS
-    map.save()
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+def test_should_have_edit_buttons_in_edit_mode(live_server, openmap, page, bootstrap):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
     browser = page.locator("#umap-ui-container")
     edit_layer = browser.get_by_title("Edit", exact=True)
     in_table = browser.get_by_title("Edit properties in a table")

umap/tests/integration/test_choropleth.py

@@ -0,0 +1,89 @@
+import json
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+
+def test_basic_choropleth_map_with_default_color(map, live_server, page):
+    path = Path(__file__).parent.parent / "fixtures/choropleth_region_chomage.geojson"
+    data = json.loads(path.read_text())
+    DataLayerFactory(data=data, map=map)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    # Hauts-de-France
+    expect(page.locator("path[fill='#08519c']")).to_have_count(1)
+    # Occitanie
+    expect(page.locator("path[fill='#3182bd']")).to_have_count(1)
+    # Grand-Est, PACA
+    expect(page.locator("path[fill='#6baed6']")).to_have_count(2)
+    # Bourgogne-Franche-Comté, Centre-Val-de-Loire, IdF, Normandie, Corse, Nouvelle-Aquitaine
+    expect(page.locator("path[fill='#bdd7e7']")).to_have_count(6)
+    # Bretagne, Pays de la Loire, AURA
+    expect(page.locator("path[fill='#eff3ff']")).to_have_count(3)
+
+
+def test_basic_choropleth_map_with_custom_brewer(openmap, live_server, page):
+    path = Path(__file__).parent.parent / "fixtures/choropleth_region_chomage.geojson"
+    data = json.loads(path.read_text())
+
+    # Change brewer at load
+    data["_umap_options"]["choropleth"]["brewer"] = "Reds"
+    DataLayerFactory(data=data, map=openmap)
+
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
+    # Hauts-de-France
+    expect(page.locator("path[fill='#a50f15']")).to_have_count(1)
+    # Occitanie
+    expect(page.locator("path[fill='#de2d26']")).to_have_count(1)
+    # Grand-Est, PACA
+    expect(page.locator("path[fill='#fb6a4a']")).to_have_count(2)
+    # Bourgogne-Franche-Comté, Centre-Val-de-Loire, IdF, Normandie, Corse, Nouvelle-Aquitaine
+    expect(page.locator("path[fill='#fcae91']")).to_have_count(6)
+    # Bretagne, Pays de la Loire, AURA
+    expect(page.locator("path[fill='#fee5d9']")).to_have_count(3)
+
+    # Now change brewer from UI
+    page.get_by_role("button", name="Edit").click()
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator("#umap-ui-container").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="Choropleth: settings").click()
+    page.locator('select[name="brewer"]').select_option("Greens")
+
+    # Hauts-de-France
+    expect(page.locator("path[fill='#006d2c']")).to_have_count(1)
+    # Occitanie
+    expect(page.locator("path[fill='#31a354']")).to_have_count(1)
+    # Grand-Est, PACA
+    expect(page.locator("path[fill='#74c476']")).to_have_count(2)
+    # Bourgogne-Franche-Comté, Centre-Val-de-Loire, IdF, Normandie, Corse, Nouvelle-Aquitaine
+    expect(page.locator("path[fill='#bae4b3']")).to_have_count(6)
+    # Bretagne, Pays de la Loire, AURA
+    expect(page.locator("path[fill='#edf8e9']")).to_have_count(3)
+
+
+def test_basic_choropleth_map_with_custom_classes(openmap, live_server, page):
+    path = Path(__file__).parent.parent / "fixtures/choropleth_region_chomage.geojson"
+    data = json.loads(path.read_text())
+
+    # Change brewer at load
+    data["_umap_options"]["choropleth"]["classes"] = 6
+    DataLayerFactory(data=data, map=openmap)
+
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
+
+    # Hauts-de-France
+    expect(page.locator("path[fill='#08519c']")).to_have_count(1)
+    # Occitanie
+    expect(page.locator("path[fill='#3182bd']")).to_have_count(1)
+    # PACA
+    expect(page.locator("path[fill='#6baed6']")).to_have_count(1)
+    # Grand-Est
+    expect(page.locator("path[fill='#9ecae1']")).to_have_count(1)
+    # Bourgogne-Franche-Comté, Centre-Val-de-Loire, IdF, Normandie, Corse, Nouvelle-Aquitaine
+    expect(page.locator("path[fill='#c6dbef']")).to_have_count(6)
+    # Bretagne, Pays de la Loire, AURA
+    expect(page.locator("path[fill='#eff3ff']")).to_have_count(3)

umap/tests/integration/test_collaborative_editing.py

@@ -1,9 +1,11 @@
+import json
 import re
+from pathlib import Path
 from time import sleep
 
 from playwright.sync_api import expect
 
-from umap.models import DataLayer
+from umap.models import DataLayer, Map
 
 from ..base import DataLayerFactory, MapFactory
 
@@ -265,3 +267,30 @@ def test_same_second_edit_doesnt_conflict(context, live_server, tilelayer):
         "id": str(datalayer.pk),
         "permissions": {"edit_status": 1},
     }
+
+
+def test_should_display_alert_on_conflict(context, live_server, datalayer, openmap):
+    # Open the map on two pages.
+    page_one = context.new_page()
+    page_one.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page_two = context.new_page()
+    page_two.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+
+    page_one.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
+    page_one.locator('input[name="name"]').fill("new name")
+    with page_one.expect_response(re.compile(r".*/datalayer/update/.*")):
+        page_one.get_by_role("button", name="Save").click()
+
+    page_two.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
+    page_two.locator('input[name="name"]').fill("custom name")
+    with page_two.expect_response(re.compile(r".*/datalayer/update/.*")):
+        page_two.get_by_role("button", name="Save").click()
+    saved = DataLayer.objects.last()
+    data = json.loads(Path(saved.geojson.path).read_text())
+    assert data["features"][0]["properties"]["name"] == "new name"
+    expect(page_two.get_by_text("Woops! Someone else seems to")).to_be_visible()
+    with page_two.expect_response(re.compile(r".*/datalayer/update/.*")):
+        page_two.get_by_role("button", name="Save anyway").click()
+    saved = DataLayer.objects.last()
+    data = json.loads(Path(saved.geojson.path).read_text())
+    assert data["features"][0]["properties"]["name"] == "custom name"

umap/tests/integration/test_datalayer.py

@@ -0,0 +1,130 @@
+import json
+
+import pytest
+from django.core.files.base import ContentFile
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+
+def set_options(datalayer, **options):
+    # For now we need to change both the DB and the FS…
+    datalayer.settings.update(options)
+    data = json.load(datalayer.geojson.file)
+    data["_umap_options"].update(**options)
+    datalayer.geojson = ContentFile(json.dumps(data), "foo.json")
+    datalayer.save()
+
+
+def test_honour_displayOnLoad_false(map, live_server, datalayer, page):
+    set_options(datalayer, displayOnLoad=False)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
+    layers = page.locator(".umap-browse-datalayers li")
+    markers = page.locator(".leaflet-marker-icon")
+    layers_off = page.locator(".umap-browse-datalayers li.off")
+    expect(layers).to_have_count(1)
+    expect(layers_off).to_have_count(1)
+    page.get_by_role("button", name="See data layers").click()
+    page.get_by_label("Zoom in").click()
+    expect(markers).to_be_hidden()
+    page.get_by_title("Show/hide layer").click()
+    expect(layers_off).to_have_count(0)
+    expect(markers).to_be_visible()
+
+
+def test_should_honour_fromZoom(live_server, map, datalayer, page):
+    set_options(datalayer, displayOnLoad=True, fromZoom=6)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#5/48.55/14.68")
+    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_hidden()
+    page.get_by_label("Zoom in").click()
+    expect(markers).to_be_visible()
+    page.get_by_label("Zoom in").click()
+    expect(markers).to_be_visible()
+
+
+def test_should_honour_toZoom(live_server, map, datalayer, page):
+    set_options(datalayer, displayOnLoad=True, toZoom=6)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#7/48.55/14.68")
+    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()
+    page.get_by_label("Zoom in").click()
+    expect(markers).to_be_visible()
+    page.get_by_label("Zoom in").click()
+    # FIXME does not work (but works when using PWDEBUG=1), not sure why
+    # may be a race condition related to css transition
+    # expect(markers).to_be_hidden()
+
+
+def test_should_honour_color_variable(live_server, map, page):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"mycolor": "aliceblue", "name": "Point 4"},
+                "geometry": {"type": "Point", "coordinates": [0.856934, 45.290347]},
+            },
+            {
+                "type": "Feature",
+                "properties": {"name": "a polygon", "mycolor": "tomato"},
+                "geometry": {
+                    "type": "Polygon",
+                    "coordinates": [
+                        [
+                            [2.12, 49.57],
+                            [1.08, 49.02],
+                            [2.51, 47.55],
+                            [3.19, 48.77],
+                            [2.12, 49.57],
+                        ]
+                    ],
+                },
+            },
+        ],
+        "_umap_options": {
+            "name": "Calque 2",
+            "color": "{mycolor}",
+            "fillColor": "{mycolor}",
+        },
+    }
+    DataLayerFactory(map=map, data=data)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.locator(".leaflet-overlay-pane path[fill='tomato']"))
+    markers = page.locator(".leaflet-marker-icon .icon_container")
+    expect(markers).to_have_css("background-color", "rgb(240, 248, 255)")
+
+
+def test_datalayers_in_query_string(live_server, datalayer, map, page):
+    with_old_id = DataLayerFactory(old_id=134, map=map, name="with old id")
+    set_options(with_old_id, name="with old id")
+    visible = page.locator(".leaflet-control-browse li:not(.off) span")
+    hidden = page.locator(".leaflet-control-browse li.off span")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(visible).to_have_count(2)
+    expect(hidden).to_have_count(0)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?datalayers={datalayer.pk}")
+    expect(visible).to_have_count(1)
+    expect(visible).to_have_text(datalayer.name)
+    expect(hidden).to_have_count(1)
+    expect(hidden).to_have_text(with_old_id.name)
+    page.goto(
+        f"{live_server.url}{map.get_absolute_url()}?datalayers={with_old_id.old_id}"
+    )
+    expect(visible).to_have_count(1)
+    expect(visible).to_have_text(with_old_id.name)
+    expect(hidden).to_have_count(1)
+    expect(hidden).to_have_text(datalayer.name)

umap/tests/integration/test_edit_datalayer.py

@@ -1,5 +1,11 @@
+import re
+
 from playwright.sync_api import expect
 
+from umap.models import DataLayer
+
+from ..base import DataLayerFactory
+
 
 def test_should_have_fieldset_for_layer_type_properties(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
@@ -44,3 +50,131 @@ def test_should_have_fieldset_for_layer_type_properties(page, live_server, tilel
     expect(choropleth_header).to_be_hidden()
     expect(heat_header).to_be_hidden()
     expect(cluster_header).to_be_hidden()
+
+
+def test_cancel_deleting_datalayer_should_restore(
+    live_server, openmap, datalayer, page
+):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    layers = page.locator(".umap-browse-datalayers li")
+    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.once("dialog", lambda dialog: dialog.accept())
+    page.locator("#umap-ui-container").get_by_title("Delete layer").click()
+    expect(markers).to_have_count(0)
+    page.get_by_role("button", name="See data layers").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()
+    expect(markers).to_have_count(1)
+    expect(
+        page.locator(".leaflet-control-browse").get_by_text("test datalayer")
+    ).to_be_visible()
+
+
+def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    layers = page.locator(".umap-browse-datalayers li")
+    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.locator("#umap-ui-container").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="Advanced actions").click()
+    page.get_by_role("button", name="Clone").click()
+    expect(layers).to_have_count(2)
+    expect(markers).to_have_count(2)
+
+
+def test_can_change_icon_class(live_server, openmap, page):
+    # Faster than doing a login
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"name": "Point 4"},
+                "geometry": {"type": "Point", "coordinates": [0.856934, 45.290347]},
+            },
+        ],
+    }
+    DataLayerFactory(map=openmap, data=data)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    expect(page.locator(".umap-div-icon")).to_be_visible()
+    page.get_by_role("link", name="Manage layers").click()
+    expect(page.locator(".umap-circle-icon")).to_be_hidden()
+    page.locator("#umap-ui-container").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="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()
+    expect(page.locator(".umap-div-icon")).to_be_hidden()
+
+
+def test_can_change_name(live_server, openmap, page, datalayer):
+    page.goto(
+        f"{live_server.url}{openmap.get_absolute_url()}?edit&datalayersControl=expanded"
+    )
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator("#umap-ui-container").get_by_title("Edit", exact=True).click()
+    expect(page.locator(".umap-is-dirty")).to_be_hidden()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').press("Control+a")
+    page.locator('input[name="name"]').fill("new name")
+    expect(page.locator(".leaflet-control-browse li span")).to_contain_text("new name")
+    expect(page.locator(".umap-is-dirty")).to_be_visible()
+    with page.expect_response(re.compile(".*/datalayer/update/.*")):
+        page.get_by_role("button", name="Save").click()
+    saved = DataLayer.objects.last()
+    assert saved.name == "new name"
+    expect(page.locator(".umap-is-dirty")).to_be_hidden()
+
+
+def test_can_create_new_datalayer(live_server, openmap, page, datalayer):
+    page.goto(
+        f"{live_server.url}{openmap.get_absolute_url()}?edit&datalayersControl=expanded"
+    )
+    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Add a layer").click()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').fill("my new layer")
+    expect(page.get_by_text("my new layer")).to_be_visible()
+    with page.expect_response(re.compile(".*/datalayer/create/.*")):
+        page.get_by_role("button", name="Save").click()
+    assert DataLayer.objects.count() == 2
+    saved = DataLayer.objects.last()
+    assert saved.name == "my new layer"
+    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.locator("#umap-ui-container").get_by_title("Edit", exact=True).first.click()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').fill("my new layer with a new name")
+    expect(page.get_by_text("my new layer with a new name")).to_be_visible()
+    page.get_by_role("button", name="Save").click()
+    with page.expect_response(re.compile(".*/datalayer/update/.*")):
+        page.get_by_role("button", name="Save").click()
+    assert DataLayer.objects.count() == 2
+    saved = DataLayer.objects.last()
+    assert saved.name == "my new layer with a new name"
+    expect(page.locator(".umap-is-dirty")).to_be_hidden()
+
+
+def test_can_restore_version(live_server, openmap, page, datalayer):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    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.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("#umap-ui-container").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="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.*"))

umap/tests/integration/test_edit_map.py

@@ -0,0 +1,15 @@
+from playwright.sync_api import expect
+
+
+def test_can_edit_name(page, live_server, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    page.get_by_title("Edit map properties").click()
+    name_input = page.locator('.map-metadata input[name="name"]')
+    expect(name_input).to_be_visible()
+    name_input.click()
+    name_input.press("Control+a")
+    name_input.fill("New map name")
+    expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
+        "New map name"
+    )

umap/tests/integration/test_facets_browser.py

@@ -46,6 +46,30 @@ DATALAYER_DATA2 = {
 }
 
 
+DATALAYER_DATA3 = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {"name": "a polygon"},
+            "geometry": {
+                "type": "Polygon",
+                "coordinates": [
+                    [
+                        [2.12, 49.57],
+                        [1.08, 49.02],
+                        [2.51, 47.55],
+                        [3.19, 48.77],
+                        [2.12, 49.57],
+                    ]
+                ],
+            },
+        },
+    ],
+    "_umap_options": {"name": "Calque 2", "browsable": False},
+}
+
+
 @pytest.fixture
 def bootstrap(map, live_server):
     map.settings["properties"]["onLoadPanel"] = "facet"
@@ -54,11 +78,15 @@ def bootstrap(map, live_server):
     map.save()
     DataLayerFactory(map=map, data=DATALAYER_DATA1)
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
+    DataLayerFactory(map=map, data=DATALAYER_DATA3)
 
 
 def test_simple_facet_search(live_server, page, bootstrap, map):
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
     panel = page.locator(".umap-facet-search")
+    # From a non browsable datalayer, should not be impacted
+    paths = page.locator(".leaflet-overlay-pane path")
+    expect(paths).to_be_visible
     expect(panel).to_be_visible()
     # Facet name
     expect(page.get_by_text("My type")).to_be_visible()
@@ -67,6 +95,7 @@ def test_simple_facet_search(live_server, page, bootstrap, map):
     odd = page.get_by_text("odd")
     expect(oven).to_be_visible()
     expect(odd).to_be_visible()
+    expect(paths).to_be_visible
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(4)
     # Tooltips
@@ -81,6 +110,8 @@ def test_simple_facet_search(live_server, page, bootstrap, map):
     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(paths).to_be_visible
     # Now let's filter
     odd.click()
     expect(markers).to_have_count(4)
+    expect(paths).to_be_visible