umap-project 2.7.3__py3-none-any.whl → 2.8.0__py3-none-any.whl

umap/tests/integration/test_edit_datalayer.py

@@ -120,7 +120,7 @@ def test_can_change_name(live_server, openmap, page, datalayer):
     page.locator('input[name="name"]').press("Control+a")
     page.locator('input[name="name"]').fill("new name")
     expect(page.locator(".umap-browser .datalayer")).to_contain_text("new name")
-    expect(page.locator(".umap-is-dirty")).to_be_visible()
+    expect(page.locator("body")).to_have_class(re.compile(".*umap-is-dirty.*"))
     with page.expect_response(re.compile(".*/datalayer/update/.*")):
         page.get_by_role("button", name="Save").click()
     saved = DataLayer.objects.last()
@@ -129,32 +129,43 @@ def test_can_change_name(live_server, openmap, page, datalayer):
 
 
 def test_can_create_new_datalayer(live_server, openmap, page, datalayer):
+    """
+    Test the creation and editing of a new datalayer.
+
+    This test verifies that:
+    1. A new datalayer can be created and saved.
+    2. The newly created datalayer appears in the UI and is saved in the database.
+    3. Editing the same datalayer updates it instead of creating a new one.
+    4. The UI reflects the changes and the database is updated correctly.
+    5. The 'dirty' state of the map is managed correctly during these operations.
+    """
+
     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="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()
+    page.locator('input[name="name"]').fill("Layer A")
+    expect(page.get_by_text("Layer A")).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"
+    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.locator(".panel.right").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.locator('input[name="name"]').fill("Layer A with a new name")
+    expect(page.get_by_text("Layer A 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"
+    assert saved.name == "Layer A with a new name"
     expect(page.locator(".umap-is-dirty")).to_be_hidden()
 
 
@@ -210,3 +221,14 @@ def test_deleting_datalayer_should_remove_from_caption(
     page.locator(".panel.right").get_by_title("Delete layer").click()
     page.get_by_role("button", name="OK").click()
     expect(panel.get_by_text("test datalayer")).to_be_hidden()
+
+
+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_text("test datalayer").click()
+    page.get_by_text("test datalayer").fill("test datalayer foobar")
+    page.get_by_role("button", name="Open browser").click()
+    expect(
+        page.locator(".panel.left").get_by_text("test datalayer foobar")
+    ).to_be_visible()

umap/tests/integration/test_import.py

@@ -9,7 +9,6 @@ from playwright.sync_api import expect
 
 from umap.models import DataLayer
 
-from ..base import mock_tiles
 from .helpers import save_and_get_json
 
 pytestmark = pytest.mark.django_db
@@ -71,9 +70,8 @@ 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):
-    page.route("https://tile.openstreetmap.fr/hot/**", mock_tiles)
-
     settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_role("button", name="Open browser").click()
@@ -94,11 +92,11 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
     expect(
         page.locator('img[src="https://tile.openstreetmap.fr/hot/6/32/21.png"]')
     ).to_be_visible()
-    # Should not have imported umap_id, while in the file options
-    assert not page.evaluate("U.MAP.options.umap_id")
+    # Should not have imported id, while in the file options
+    assert not page.evaluate("U.MAP.properties.id")
     with page.expect_response(re.compile(r".*/datalayer/create/.*")):
         page.get_by_role("button", name="Save").click()
-    assert page.evaluate("U.MAP.options.umap_id")
+    assert page.evaluate("U.MAP.properties.id")
 
 
 def test_import_geojson_from_textarea(tilelayer, live_server, page):
@@ -607,6 +605,7 @@ def test_overpass_import_with_bbox(page, live_server, tilelayer, settings):
     }
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_role("link", 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")
     page.get_by_role("button", name="Choose this data").click()
@@ -657,6 +656,7 @@ def test_overpass_import_retains_boundary(page, live_server, tilelayer, settings
     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 helpers").click()
     page.get_by_role("button", name="Overpass").click()
     page.get_by_placeholder("amenity=drinking_water").fill("building")
     page.get_by_placeholder("Type area name, or let empty").click()
@@ -669,6 +669,7 @@ def test_overpass_import_retains_boundary(page, live_server, tilelayer, settings
     expect(page.get_by_placeholder("Provide an URL here")).to_have_value(
         "https://my.overpass.io/interpreter?data=[out:json];nwr[building](area:3601393025);out geom;"
     )
+    page.get_by_role("button", name="Import helpers").click()
     page.get_by_role("button", name="Overpass").click()
     expect(page.locator("#area")).to_contain_text(
         "Bray-sur-Seine, Seine-et-Marne, Île-de-France, France"
@@ -710,6 +711,7 @@ def test_import_from_datasets(page, live_server, tilelayer, settings):
     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 helpers").click()
     page.get_by_role("button", name="Datasets").click()
     page.get_by_role("dialog").get_by_role("combobox").select_option(
         "https://remote.org/data.json"
@@ -762,3 +764,23 @@ def test_import_georss_from_textarea(tilelayer, live_server, page):
     # A layer has been created
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(1)
+
+
+def test_import_from_multiple_files(live_server, page, tilelayer):
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Import data").click()
+    file_input = page.locator("input[type='file']")
+    with page.expect_file_chooser() as fc_info:
+        file_input.click()
+    file_chooser = fc_info.value
+    FIXTURES = Path(__file__).parent.parent / "fixtures"
+    paths = [
+        FIXTURES / "test_upload_data.json",
+        FIXTURES / "test_upload_simple_marker.json",
+    ]
+    file_chooser.set_files(paths)
+    markers = page.locator(".leaflet-marker-icon")
+    expect(markers).to_have_count(0)
+    page.get_by_role("button", name="Import data", exact=True).click()
+    # Two in one file, one in the other
+    expect(markers).to_have_count(3)

umap/tests/integration/test_optimistic_merge.py

@@ -49,6 +49,7 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "name": "test datalayer",
         "editMode": "advanced",
         "inCaption": True,
+        "id": str(datalayer.pk),
     }
 
     # Now navigate to this map from another tab
@@ -78,12 +79,14 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         sleep(1)
     # No change after the save
     expect(marker_pane_p2).to_have_count(2)
-    assert DataLayer.objects.get(pk=datalayer.pk).settings == {
+    datalayer_v2 = DataLayer.objects.get(pk=datalayer.pk)
+    assert datalayer_v2.settings == {
         "browsable": True,
         "displayOnLoad": True,
         "name": "test datalayer",
         "inCaption": True,
         "editMode": "advanced",
+        "id": str(datalayer.pk),
     }
 
     # Now create another marker in the first tab
@@ -94,7 +97,8 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         save_p1.click()
     # Should now get the other marker too
     expect(marker_pane_p1).to_have_count(3)
-    assert DataLayer.objects.get(pk=datalayer.pk).settings == {
+    datalayer_v3 = DataLayer.objects.get(pk=datalayer.pk)
+    assert datalayer_v3.settings == {
         "browsable": True,
         "displayOnLoad": True,
         "name": "test datalayer",
@@ -112,7 +116,8 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         save_p1.click()
         sleep(1)
     # Should now get the other marker too
-    assert DataLayer.objects.get(pk=datalayer.pk).settings == {
+    datalayer_v4 = DataLayer.objects.get(pk=datalayer.pk)
+    assert datalayer_v4.settings == {
         "browsable": True,
         "displayOnLoad": True,
         "name": "test datalayer",
@@ -132,7 +137,8 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         save_p2.click()
         sleep(1)
     # Should now get the other markers too
-    assert DataLayer.objects.get(pk=datalayer.pk).settings == {
+    datalayer_v5 = DataLayer.objects.get(pk=datalayer.pk)
+    assert datalayer_v5.settings == {
         "browsable": True,
         "displayOnLoad": True,
         "name": "test datalayer",
@@ -276,21 +282,38 @@ def test_should_display_alert_on_conflict(context, live_server, datalayer, openm
     page_two = context.new_page()
     page_two.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
 
+    # Change name on page one and save
     page_one.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
-    page_one.locator('input[name="name"]').fill("new name")
+    page_one.locator('input[name="name"]').fill("name from page one")
     with page_one.expect_response(re.compile(r".*/datalayer/update/.*")):
         page_one.get_by_role("button", name="Save").click()
 
+    # Change name on page two and save
     page_two.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
-    page_two.locator('input[name="name"]').fill("custom name")
+    page_two.locator('input[name="name"]').fill("name from page two")
+
+    # Map should be in dirty status
+    expect(page_two.get_by_text("Cancel edits")).to_be_visible()
     with page_two.expect_response(re.compile(r".*/datalayer/update/.*")):
         page_two.get_by_role("button", name="Save").click()
+
+    # Make sure data is unchanged on the server
     saved = DataLayer.objects.last()
     data = json.loads(Path(saved.geojson.path).read_text())
-    assert data["features"][0]["properties"]["name"] == "new name"
+    assert data["features"][0]["properties"]["name"] == "name from page one"
+
+    # We should have an alert with some actions
     expect(page_two.get_by_text("Whoops! Other contributor(s) changed")).to_be_visible()
+    # Map should still be in dirty status
+    expect(page_two.get_by_text("Cancel edits")).to_be_visible()
+
+    # Override data from page two
     with page_two.expect_response(re.compile(r".*/datalayer/update/.*")):
         page_two.get_by_text("Keep your changes and loose theirs").click()
+
+    # Make sure server has page two data
     saved = DataLayer.objects.last()
     data = json.loads(Path(saved.geojson.path).read_text())
-    assert data["features"][0]["properties"]["name"] == "custom name"
+    assert data["features"][0]["properties"]["name"] == "name from page two"
+    # Map should not be in dirty status anymore
+    expect(page_two.get_by_text("Cancel edits")).to_be_hidden()

umap/tests/integration/test_owned_map.py

@@ -61,8 +61,12 @@ def test_owner_permissions_form(map, datalayer, live_server, login):
     edit_permissions = page.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_visible()
     edit_permissions.click()
-    select = page.locator(".umap-field-share_status select")
-    expect(select).to_be_visible()
+    expect(page.locator(".umap-field-share_status select")).to_be_visible()
+    options = [
+        int(option.get_attribute("value"))
+        for option in page.locator(".umap-field-share_status select option").all()
+    ]
+    assert options == [Map.DRAFT, Map.PUBLIC, Map.OPEN, Map.PRIVATE]
     # expect(select).to_have_value(Map.PUBLIC)  # Does not work
     owner_field = page.locator(".umap-field-owner")
     expect(owner_field).to_be_visible()
@@ -137,7 +141,7 @@ def test_owner_has_delete_map_button(map, live_server, login):
     delete.click()
     with page.expect_navigation():
         page.get_by_role("button", name="OK").click()
-    assert Map.objects.all().count() == 0
+    assert Map.objects.get(pk=map.pk).share_status == Map.DELETED
 
 
 def test_editor_do_not_have_delete_map_button(map, live_server, login, user):
@@ -181,29 +185,31 @@ def test_can_change_perms_after_create(tilelayer, live_server, login, user):
     page.get_by_title("Manage layers").click()
     page.get_by_title("Add a layer").click()
     page.locator("input[name=name]").fill("Layer 1")
-    save = page.get_by_role("button", name="Save")
-    expect(save).to_be_visible()
+    expect(
+        page.get_by_role("button", name="Visibility: Draft (private)")
+    ).to_be_visible()
+    expect(page.get_by_role("button", name="Save", exact=True)).to_be_hidden()
     with page.expect_response(re.compile(r".*/map/create/")):
-        save.click()
+        page.get_by_role("button", name="Save draft", exact=True).click()
     edit_permissions = page.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_visible()
     edit_permissions.click()
-    select = page.locator(".umap-field-share_status select")
-    expect(select).to_be_visible()
-    option = page.locator("select[name='share_status'] option:checked")
-    expect(option).to_have_text("Everyone (public)")
-    owner_field = page.locator(".umap-field-owner")
-    expect(owner_field).to_be_visible()
-    editors_field = page.locator(".umap-field-editors input")
-    expect(editors_field).to_be_visible()
-    datalayer_label = page.get_by_text('Who can edit "Layer 1"')
-    expect(datalayer_label).to_be_visible()
+    expect(page.locator(".umap-field-share_status select")).to_be_visible()
+    expect(page.locator("select[name='share_status'] option:checked")).to_have_text(
+        "Draft (private)"
+    )
+    expect(page.locator(".umap-field-owner")).to_be_visible()
+    expect(page.locator(".umap-field-editors input")).to_be_visible()
+    expect(page.get_by_text('Who can edit "Layer 1"')).to_be_visible()
     options = page.locator(".datalayer-permissions select[name='edit_status'] option")
     expect(options).to_have_count(4)
     option = page.locator(
         ".datalayer-permissions select[name='edit_status'] option:checked"
     )
     expect(option).to_have_text("Inherit")
+    page.locator('select[name="share_status"]').select_option("1")
+    expect(page.get_by_role("button", name="Save draft", exact=True)).to_be_hidden()
+    expect(page.get_by_role("button", name="Save", exact=True)).to_be_visible()
 
 
 def test_can_change_owner(map, live_server, login, user):

umap/tests/integration/test_popup.py

@@ -0,0 +1,44 @@
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+OSM_DATA = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "geometry": {"type": "Point", "coordinates": [2.49, 48.79]},
+            "properties": {
+                "amenity": "restaurant",
+                "cuisine": "italian",
+                "name": "A Casa di Nonna",
+                "panoramax": "d811b398-d930-4cf8-95a2-0c29c34d9fca",
+                "phone": "+33 1 48 89 54 12",
+                "takeaway:covid19": "yes",
+                "wheelchair": "no",
+                "id": "node/1130849864",
+            },
+            "id": "AzMjk",
+        },
+    ],
+    "_umap_options": {
+        "popupTemplate": "OSM",
+    },
+}
+
+
+def test_openstreetmap_popup(live_server, map, page):
+    DataLayerFactory(map=map, data=OSM_DATA)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#18/48.79/2.49")
+    expect(page.locator(".umap-icon-active")).to_be_hidden()
+    page.locator(".leaflet-marker-icon").click()
+    expect(page.get_by_role("heading", name="A Casa di Nonna")).to_be_visible()
+    expect(page.get_by_text("+33 1 48 89 54 12")).to_be_visible()
+    img = page.locator(".umap-popup-content img")
+    expect(img).to_have_attribute(
+        "src",
+        "https://api.panoramax.xyz/api/pictures/d811b398-d930-4cf8-95a2-0c29c34d9fca/sd.jpg",
+    )

umap/tests/integration/test_save.py

@@ -0,0 +1,35 @@
+import re
+
+
+def test_reseting_map_would_remove_from_save_queue(
+    live_server, openmap, page, datalayer
+):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.get_by_role("link", name="Edit map name and caption").click()
+    requests = []
+
+    def register_request(request):
+        if request.url.endswith(".png"):
+            return
+        requests.append((request.method, request.url))
+
+    page.on("request", register_request)
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').fill("new name")
+    page.get_by_role("button", name="Cancel edits").click()
+    page.get_by_role("button", name="OK").click()
+    page.wait_for_timeout(500)
+    page.get_by_role("button", name="Edit").click()
+    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Edit", exact=True).click()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').fill("new datalayer name")
+    with page.expect_response(re.compile(".*/datalayer/update/.*")):
+        page.get_by_role("button", name="Save").click()
+    assert len(requests) == 1
+    assert requests == [
+        (
+            "POST",
+            f"{live_server.url}/en/map/{openmap.pk}/datalayer/update/{datalayer.pk}/",
+        ),
+    ]

umap/tests/integration/test_view_marker.py

@@ -57,6 +57,18 @@ def test_should_handle_locale_var_in_description(live_server, map, page):
     expect(link).to_have_attribute("href", "https://domain.org/?locale=en")
 
 
+def test_should_use_custom_label_key_in_popup_default_template(live_server, map, page):
+    data = deepcopy(DATALAYER_DATA)
+    data["features"][0]["properties"] = {
+        "libellé": "my custom label",
+    }
+    data["_umap_options"] = {"labelKey": "libellé"}
+    DataLayerFactory(map=map, data=data)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.locator(".leaflet-marker-icon").click()
+    expect(page.locator(".umap-popup h4")).to_have_text("my custom label")
+
+
 def test_should_display_tooltip_with_variable(live_server, map, page, bootstrap):
     map.settings["properties"]["showLabel"] = True
     map.settings["properties"]["labelKey"] = "Foo {name}"