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

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

umap/tests/integration/test_view_polyline.py

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 import pytest
 from playwright.sync_api import expect
 
@@ -49,3 +51,258 @@ def test_should_open_popup_on_click(live_server, map, page, bootstrap):
     # Close popup
     page.locator("#map").click()
     expect(line).to_have_attribute("stroke-opacity", "0.5")
+
+
+def test_can_use_measure_on_name(live_server, map, page):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"name": "linestring"},
+                "geometry": {
+                    "type": "LineString",
+                    "coordinates": [
+                        [11.25, 53.585984],
+                        [10.151367, 52.975108],
+                    ],
+                },
+            },
+            {
+                "type": "Feature",
+                "properties": {"name": "multilinestring"},
+                "geometry": {
+                    "type": "MultiLineString",
+                    "coordinates": [[[8, 53], [13, 52]], [[12, 51], [15, 52]]],
+                },
+            },
+        ],
+    }
+    map.settings["properties"]["labelKey"] = "{name} ({measure})"
+    map.settings["properties"]["onLoadPanel"] = "databrowser"
+    map.save()
+    DataLayerFactory(map=map, data=data)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/10/50")
+    expect(page.get_by_text("linestring (99.7 km)")).to_be_visible()
+    expect(page.get_by_text("multilinestring (592 km)")).to_be_visible()
+
+
+def test_can_use_gain_and_loss(live_server, map, page):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "geometry": {
+                    "type": "LineString",
+                    "coordinates": [
+                        [8.420888, 39.327819, 12.1],
+                        [8.420915, 39.327745, 12.9],
+                        [8.420906, 39.327543, 14.8],
+                        [8.420876, 39.327312, 17],
+                        [8.420754, 39.327023, 16.8],
+                        [8.420609, 39.326776, 16.6],
+                        [8.42051, 39.326467, 16.4],
+                        [8.420409, 39.326254, 16.3],
+                        [8.420367, 39.326108, 16.2],
+                        [8.420287, 39.326044, 16.2],
+                        [8.420294, 39.325794, 15.1],
+                        [8.419974, 39.325549, 12.5],
+                        [8.419887, 39.325508, 11.9],
+                        [8.419702, 39.325343, 10.3],
+                        [8.419574, 39.325289, 9.4],
+                        [8.41943, 39.325183, 8.2],
+                        [8.419393, 39.325127, 7.8],
+                        [8.419297, 39.325108, 7.2],
+                        [8.419179, 39.325014, 6.2],
+                        [8.419179, 39.324979, 6.1],
+                        [8.419179, 39.324979, 6.1],
+                        [8.419182, 39.324653, 6],
+                        [8.419129, 39.324508, 5.9],
+                        [8.419074, 39.324482, 5.9],
+                        [8.419007, 39.324362, 5.8],
+                        [8.418957, 39.324324, 5.8],
+                        [8.418944, 39.324291, 5.8],
+                        [8.418947, 39.324233, 5.8],
+                        [8.418967, 39.324196, 5.7],
+                        [8.41895, 39.324126, 5.6],
+                        [8.418838, 39.323996, 5.4],
+                        [8.418814, 39.323774, 5],
+                        [8.418931, 39.323546, 10.1],
+                        [8.41896, 39.323444, 12.3],
+                        [8.418971, 39.323232, 16.9],
+                        [8.419068, 39.322974, 13.5],
+                        [8.41914, 39.322946, 12.7],
+                        [8.419245, 39.322895, 12.3],
+                        [8.419342, 39.322857, 11.9],
+                        [8.419492, 39.322855, 11.3],
+                        [8.419591, 39.322768, 11.1],
+                        [8.419672, 39.322724, 11],
+                        [8.419776, 39.322704, 10.9],
+                        [8.419823, 39.322711, 10.8],
+                        [8.41971, 39.322631, 8.5],
+                        [8.419668, 39.322581, 7.3],
+                        [8.419653, 39.322537, 6.3],
+                        [8.419628, 39.32243, 5.3],
+                        [8.419629, 39.322384, 5.4],
+                        [8.419656, 39.322346, 5.5],
+                        [8.419703, 39.322304, 5.6],
+                        [8.419802, 39.322305, 5.7],
+                        [8.419868, 39.32228, 5.8],
+                        [8.419994, 39.322223, 6.1],
+                        [8.420066, 39.322174, 6.2],
+                        [8.42013, 39.32211, 6.4],
+                        [8.420142, 39.322013, 6.5],
+                        [8.420167, 39.321924, 6.7],
+                        [8.420188, 39.321788, 7],
+                        [8.420269, 39.32165, 7.3],
+                        [8.420342, 39.321625, 7.4],
+                        [8.420427, 39.321609, 7.5],
+                        [8.420645, 39.321582, 7.8],
+                        [8.420753, 39.321699, 8.1],
+                        [8.420881, 39.321801, 8.4],
+                        [8.421082, 39.321898, 8.7],
+                        [8.421184, 39.321868, 8.9],
+                        [8.421351, 39.321877, 9.1],
+                        [8.421451, 39.321834, 8.2],
+                        [8.421545, 39.321811, 7.5],
+                        [8.421815, 39.321691, 5.1],
+                        [8.421877, 39.321632, 4.3],
+                        [8.42196, 39.321602, 3.7],
+                        [8.422083, 39.321621, 4.5],
+                        [8.422462, 39.321579, 8.7],
+                        [8.422875, 39.321691, 13.5],
+                        [8.423069, 39.321732, 15.7],
+                        [8.423231, 39.321687, 17.6],
+                        [8.423405, 39.321726, 19.6],
+                        [8.423626, 39.321719, 22.1],
+                        [8.424103, 39.321776, 27.4],
+                        [8.424214, 39.321746, 28.7],
+                        [8.424402, 39.321632, 27.5],
+                        [8.424486, 39.321559, 26.8],
+                        [8.424524, 39.321501, 26.3],
+                        [8.424916, 39.321097, 22.6],
+                        [8.424969, 39.321007, 21.9],
+                        [8.425387, 39.320766, 19],
+                        [8.425489, 39.320645, 20.4],
+                        [8.425621, 39.320556, 22.1],
+                        [8.425699, 39.320574, 22.8],
+                        [8.425774, 39.320511, 23.9],
+                        [8.425831, 39.320336, 19.6],
+                        [8.425822, 39.32021, 16.1],
+                        [8.42575, 39.320086, 12.4],
+                        [8.425788, 39.320004, 10],
+                        [8.425946, 39.319822, 10.7],
+                        [8.426039, 39.319781, 11],
+                        [8.426264, 39.319776, 11.8],
+                        [8.426305, 39.319718, 12],
+                        [8.426362, 39.319433, 6.8],
+                        [8.426414, 39.31936, 5.3],
+                        [8.426422, 39.319161, 1.6],
+                        [8.426449, 39.319085, 0.2],
+                        [8.426568, 39.31904, 0.4],
+                        [8.426608, 39.318981, 1.8],
+                        [8.426714, 39.318923, 3.8],
+                        [8.427072, 39.318862, 9.6],
+                        [8.427204, 39.31886, 11.7],
+                        [8.427359, 39.318896, 14.3],
+                        [8.427434, 39.31895, 15.9],
+                        [8.427519, 39.318968, 17.3],
+                        [8.427558, 39.318972, 18.4],
+                        [8.427616, 39.318991, 19.2],
+                        [8.427685, 39.319082, 21.3],
+                        [8.42773, 39.31921, 25.1],
+                        [8.427914, 39.319306, 29.9],
+                        [8.42849, 39.319358, 46.7],
+                        [8.429645, 39.319309, 79.8],
+                        [8.430532, 39.319314, 85],
+                        [8.430582, 39.319297, 85.2],
+                        [8.430808, 39.319195, 84.8],
+                        [8.43098, 39.319076, 84.5],
+                        [8.431138, 39.318999, 84.2],
+                        [8.431283, 39.318985, 84],
+                        [8.431288, 39.318946, 84.8],
+                        [8.431373, 39.318825, 87.6],
+                        [8.431411, 39.318796, 87.9],
+                        [8.431678, 39.318827, 87.1],
+                        [8.431773, 39.318752, 88.3],
+                        [8.431854, 39.318552, 90.7],
+                        [8.431832, 39.31847, 91.7],
+                        [8.431959, 39.318284, 94.1],
+                        [8.431968, 39.318034, 97],
+                        [8.43207, 39.31791, 98.7],
+                        [8.432118, 39.317736, 100.8],
+                        [8.432263, 39.317582, 103],
+                        [8.432291, 39.317263, 106.7],
+                        [8.432279, 39.316848, 111.5],
+                        [8.432358, 39.31652, 115.3],
+                        [8.432327, 39.316486, 115.8],
+                        [8.432336, 39.316437, 116.4],
+                        [8.432287, 39.316409, 116.4],
+                        [8.432257, 39.316391, 116.2],
+                        [8.432179, 39.316251, 115.4],
+                        [8.432156, 39.316183, 115.6],
+                        [8.43223, 39.316138, 116.5],
+                        [8.43223, 39.316043, 117.7],
+                        [8.432274, 39.315918, 119.4],
+                        [8.432254, 39.315799, 121],
+                        [8.432377, 39.315713, 122.6],
+                        [8.43248, 39.315542, 125.1],
+                        [8.43257, 39.315451, 126],
+                        [8.432652, 39.315352, 127],
+                        [8.432724, 39.315291, 127.7],
+                        [8.432779, 39.315208, 128.5],
+                        [8.432863, 39.315109, 129.5],
+                        [8.432945, 39.315038, 130.3],
+                        [8.433002, 39.315014, 130.7],
+                        [8.433092, 39.315007, 131.3],
+                        [8.43318, 39.315012, 131.9],
+                        [8.433295, 39.315111, 133],
+                        [8.433346, 39.315126, 133.4],
+                        [8.43338, 39.315113, 133.6],
+                        [8.433404, 39.31509, 133.8],
+                        [8.433408, 39.315058, 132.4],
+                        [8.433422, 39.31498, 131.6],
+                        [8.43347, 39.314876, 130.3],
+                        [8.433562, 39.314771, 128.2],
+                        [8.433817, 39.314543, 123],
+                        [8.434004, 39.314434, 119.9],
+                        [8.434262, 39.314344, 121.2],
+                        [8.434729, 39.314236, 123.9],
+                        [8.435085, 39.31388, 127.2],
+                        [8.435254, 39.313808, 128.4],
+                        [8.435388, 39.313779, 128.4],
+                        [8.435547, 39.313774, 129.9],
+                        [8.4357, 39.313825, 131.6],
+                        [8.435802, 39.313882, 132.8],
+                        [8.435866, 39.313979, 134.1],
+                        [8.435902, 39.314064, 135.2],
+                        [8.435973, 39.314103, 136],
+                        [8.436062, 39.314107, 136.9],
+                        [8.436143, 39.314101, 137.7],
+                        [8.436215, 39.313989, 137.7],
+                        [8.436162, 39.313752, 137.5],
+                        [8.436209, 39.313402, 137.2],
+                        [8.436413, 39.313182, 137],
+                        [8.436559, 39.313127, 136.9],
+                        [8.43664, 39.313115, 136.8],
+                        [8.436682, 39.313058, 137.7],
+                        [8.436798, 39.312789, 139.1],
+                        [8.436706, 39.312486, 140.7],
+                        [8.436703, 39.312448, 141],
+                    ],
+                },
+                "properties": {"name": "some track"},
+                "id": "MzMTI",
+            }
+        ],
+        "_umap_options": {"popupContentTemplate": "{name}\n⭧ {gain} m\n⭨ {loss} m"},
+    }
+    DataLayerFactory(map=map, data=data)
+    page.goto(
+        f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=databrowser#16/39.3201/8.4278"
+    )
+    # We can't make PW to click on the path, so let's use the browser for that
+    page.get_by_text("some track").click()
+    expect(page.get_by_text("⭧ 211 m")).to_be_visible()
+    expect(page.get_by_text("⭨ 82 m")).to_be_visible()

umap/tests/integration/test_websocket_sync.py

@@ -3,7 +3,7 @@ import re
 import pytest
 from playwright.sync_api import expect
 
-from umap.models import Map
+from umap.models import DataLayer, Map
 
 from ..base import DataLayerFactory, MapFactory
 
@@ -161,7 +161,7 @@ def test_websocket_connection_can_sync_polygons(
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_map_properties(
-    context, live_server, websocket_server, tilelayer
+    new_page, live_server, websocket_server, tilelayer
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -169,9 +169,9 @@ def test_websocket_connection_can_sync_map_properties(
     DataLayerFactory(map=map, data={})
 
     # Create two tabs
-    peerA = context.new_page()
+    peerA = new_page()
     peerA.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
-    peerB = context.new_page()
+    peerB = new_page()
     peerB.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
 
     # Name change is synced
@@ -193,7 +193,7 @@ def test_websocket_connection_can_sync_map_properties(
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_datalayer_properties(
-    context, live_server, websocket_server, tilelayer
+    new_page, live_server, websocket_server, tilelayer
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -201,9 +201,9 @@ def test_websocket_connection_can_sync_datalayer_properties(
     DataLayerFactory(map=map, data={})
 
     # Create two tabs
-    peerA = context.new_page()
+    peerA = new_page()
     peerA.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
-    peerB = context.new_page()
+    peerB = new_page()
     peerB.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
 
     # Layer addition, name and type are synced
@@ -215,7 +215,7 @@ def test_websocket_connection_can_sync_datalayer_properties(
     peerA.locator("body").press("Escape")
 
     peerB.get_by_role("link", name="Manage layers").click()
-    peerB.get_by_role("button", name="Edit").first.click()
+    peerB.locator(".panel.right").get_by_role("button", name="Edit").first.click()
     expect(peerB.locator('input[name="name"]')).to_have_value("synced layer!")
     expect(peerB.get_by_role("combobox")).to_have_value("Choropleth")
 
@@ -267,7 +267,7 @@ def test_websocket_connection_can_sync_cloned_polygons(
     b_polygon = peerB.locator("path")
 
     # Clone on peer B and save
-    b_polygon.click(button="right")
+    b_polygon.click(button="right", delay=200)
     peerB.get_by_role("button", name="Clone this feature").click()
 
     expect(peerB.locator("path")).to_have_count(2)
@@ -343,3 +343,75 @@ def test_websocket_connection_can_sync_late_joining_peer(
 
     # Clean up: close edit mode
     peerB.locator("body").press("Escape")
+
+
+@pytest.mark.xdist_group(name="websockets")
+def test_should_sync_datalayers(new_page, live_server, websocket_server, tilelayer):
+    map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
+    map.settings["properties"]["syncEnabled"] = True
+    map.save()
+
+    assert not DataLayer.objects.count()
+
+    # Create two tabs
+    peerA = new_page("Page A")
+    peerA.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    peerB = new_page("Page B")
+    peerB.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+
+    # Create a new layer from peerA
+    peerA.get_by_role("link", name="Manage layers").click()
+    peerA.get_by_role("button", name="Add a layer").click()
+
+    # Check layer has been sync to peerB
+    peerB.get_by_role("button", name="Open browser").click()
+    expect(peerB.get_by_text("Layer 1")).to_be_visible()
+
+    # Draw a marker in layer 1 from peerA
+    peerA.get_by_role("link", name="Draw a marker (Ctrl+M)").click()
+    peerA.locator("#map").click()
+
+    # Check marker is visible from peerB
+    expect(peerB.locator(".leaflet-marker-icon")).to_be_visible()
+
+    # Save layer to the server
+    with peerA.expect_response(re.compile(".*/datalayer/create/.*")):
+        peerA.get_by_role("button", name="Save").click()
+
+    assert DataLayer.objects.count() == 1
+
+    # Create another layer from peerA and draw a marker on it (without saving to server)
+    peerA.get_by_role("link", name="Manage layers").click()
+    peerA.get_by_role("button", name="Add a layer").click()
+    peerA.get_by_role("link", name="Draw a marker (Ctrl+M)").click()
+    peerA.locator("#map").click()
+
+    # Make sure this new marker is in Layer 2 for peerB
+    expect(peerB.get_by_text("Layer 2")).to_be_visible()
+    peerB.locator(".panel.left").get_by_role("button", name="Show/hide layer").nth(
+        1
+    ).click()
+    expect(peerB.locator(".leaflet-marker-icon")).to_be_visible()
+
+    # Now draw a marker from peerB
+    peerB.get_by_role("link", name="Draw a marker (Ctrl+M)").click()
+    peerB.locator("#map").click()
+    peerB.locator('input[name="name"]').fill("marker from peerB")
+
+    # Save from peer B
+    with peerB.expect_response(re.compile(".*/datalayer/create/.*")):
+        peerB.get_by_role("button", name="Save").click()
+
+    assert DataLayer.objects.count() == 2
+
+    # Check this new marker is visible from peerA
+    peerA.get_by_role("button", name="Open browser").click()
+    peerA.locator(".panel.left").get_by_role("button", name="Show/hide layer").nth(
+        1
+    ).click()
+
+    # Now peerA saves the layer 2 to the server
+    with peerA.expect_response(re.compile(".*/datalayer/update/.*")):
+        peerA.get_by_role("button", name="Save").click()
+
+    assert DataLayer.objects.count() == 2