umap-project 2.9.0b0__py3-none-any.whl → 2.9.2__py3-none-any.whl

umap/tests/integration/test_websocket_sync.py

@@ -59,7 +59,7 @@ def test_websocket_connection_can_sync_markers(new_page, asgi_live_server, tilel
     peerA.wait_for_timeout(300)
 
     peerB.locator(".leaflet-marker-icon").first.click()
-    peerB.get_by_role("link", name="Toggle edit mode (⇧+Click)").click()
+    peerB.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     expect(peerB.locator('input[name="name"]')).to_have_value("Synced name")
 
     a_first_marker = peerA.locator("div:nth-child(4) > div:nth-child(2)").first
@@ -107,9 +107,7 @@ def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilel
     b_map_el = peerB.locator("#map")
 
     # Click on the Draw a polygon button on a new map.
-    create_line = peerA.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polygon"
-    )
+    create_line = peerA.locator(".umap-edit-bar ").get_by_title("Draw a polygon")
     create_line.click()
 
     a_polygons = peerA.locator(".leaflet-overlay-pane path[fill='DarkBlue']")
@@ -124,11 +122,11 @@ def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilel
     map.click(position={"x": 100, "y": 100})
     map.click(position={"x": 100, "y": 100})
 
-    # It is created on peerA, but not yet synced
+    # It is created on peerA, and should be on peerB
     expect(a_polygons).to_have_count(1)
-    expect(b_polygons).to_have_count(0)
+    expect(b_polygons).to_have_count(1)
 
-    # Escaping the edition syncs
+    # Escaping the edition should not duplicate
     peerA.keyboard.press("Escape")
     expect(a_polygons).to_have_count(1)
     expect(b_polygons).to_have_count(1)
@@ -141,7 +139,7 @@ def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilel
     assert b_polygon_bbox_t1 == a_polygon_bbox_t1
 
     b_polygon.click()
-    peerB.get_by_role("link", name="Toggle edit mode (⇧+Click)").click()
+    peerB.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
 
     edited_vertex = peerB.locator("div:nth-child(6)").first
     edited_vertex.drag_to(b_map_el, target_position={"x": 233, "y": 126})
@@ -155,7 +153,7 @@ def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilel
 
     # Move the polygon on peer B and check it moved also on peer A
     b_polygon.click()
-    peerB.get_by_role("link", name="Toggle edit mode (⇧+Click)").click()
+    peerB.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
 
     b_polygon.drag_to(b_map_el, target_position={"x": 400, "y": 400})
     peerB.keyboard.press("Escape")
@@ -189,14 +187,14 @@ def test_websocket_connection_can_sync_map_properties(
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
 
     # Name change is synced
-    peerA.get_by_role("link", name="Edit map name and caption").click()
+    peerA.get_by_role("button", name="Edit map name and caption").click()
     peerA.locator('input[name="name"]').click()
     peerA.locator('input[name="name"]').fill("it syncs!")
 
     expect(peerB.locator(".map-name").last).to_have_text("it syncs!")
 
     # Zoom control is synced
-    peerB.get_by_role("link", name="Map advanced properties").click()
+    peerB.get_by_role("button", name="Map advanced properties").click()
     peerB.locator("summary").filter(has_text="User interface options").click()
     switch = peerB.locator("div.formbox").filter(
         has_text=re.compile("Display the zoom control")
@@ -223,14 +221,14 @@ def test_websocket_connection_can_sync_datalayer_properties(
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
 
     # Layer addition, name and type are synced
-    peerA.get_by_role("link", name="Manage layers").click()
+    peerA.get_by_role("button", name="Manage layers").click()
     peerA.get_by_role("button", name="Add a layer").click()
     peerA.locator('input[name="name"]').click()
     peerA.locator('input[name="name"]').fill("synced layer!")
     peerA.get_by_role("combobox").select_option("Choropleth")
     peerA.locator("body").press("Escape")
 
-    peerB.get_by_role("link", name="Manage layers").click()
+    peerB.get_by_role("button", name="Manage layers").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")
@@ -254,9 +252,7 @@ def test_websocket_connection_can_sync_cloned_polygons(
     b_map_el = peerB.locator("#map")
 
     # Click on the Draw a polygon button on a new map.
-    create_line = peerA.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polygon"
-    )
+    create_line = peerA.locator(".umap-edit-bar ").get_by_title("Draw a polygon")
     create_line.click()
 
     a_polygons = peerA.locator(".leaflet-overlay-pane path[fill='DarkBlue']")
@@ -324,9 +320,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
     peerA.wait_for_timeout(300)
 
     # Add a polygon from peer A
-    create_polygon = peerA.locator(".leaflet-control-toolbar ").get_by_title(
-        "Draw a polygon"
-    )
+    create_polygon = peerA.locator(".umap-edit-bar ").get_by_title("Draw a polygon")
     create_polygon.click()
 
     a_map_el.click(position={"x": 200, "y": 200})
@@ -349,7 +343,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
 
     # Verify marker properties
     peerB.locator(".leaflet-marker-icon").first.click()
-    peerB.get_by_role("link", name="Toggle edit mode (⇧+Click)").click()
+    peerB.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     expect(peerB.locator('input[name="name"]')).to_have_value("First marker")
 
     # Verify polygon exists (we've already checked the count)
@@ -377,7 +371,7 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
     peerB.goto(f"{asgi_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="Manage layers").click()
     peerA.get_by_role("button", name="Add a layer").click()
 
     # Check layer has been sync to peerB
@@ -385,7 +379,7 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
     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.get_by_role("button", name="Draw a marker (Ctrl+M)").click()
     peerA.locator("#map").click()
 
     # Check marker is visible from peerB
@@ -398,20 +392,22 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
     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="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.get_by_role("button", 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()
+    # Show features for this layer in the brower.
+    peerB.get_by_role("heading", name="Layer 2").locator(".datalayer-name").click()
+    expect(peerB.locator("li").filter(has_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.get_by_role("button", name="Draw a marker (Ctrl+M)").click()
     peerB.locator("#map").click()
     peerB.locator('input[name="name"]').fill("marker from peerB")
 
@@ -427,9 +423,11 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
         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()
+    # Peer A should not be in dirty state
+    expect(peerA.locator("body")).not_to_have_class(re.compile(".*umap-is-dirty.*"))
+
+    # Peer A should only have two markers
+    expect(peerA.locator(".leaflet-marker-icon")).to_have_count(2)
 
     assert DataLayer.objects.count() == 2
 
@@ -503,15 +501,15 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
     # Create a syncable map with peerA
     peerA = login(user, prefix="Page A")
     peerA.goto(f"{asgi_live_server.url}/en/map/new/")
-    peerA.get_by_role("link", name="Map advanced properties").click()
+    peerA.get_by_role("button", name="Map advanced properties").click()
     expect(peerA.get_by_text("Real-time collaboration", exact=True)).to_be_hidden()
     with peerA.expect_response(re.compile("./map/create/.*")):
         peerA.get_by_role("button", name="Save Draft").click()
-    peerA.get_by_role("link", name="Map advanced properties").click()
+    peerA.get_by_role("button", name="Map advanced properties").click()
     expect(peerA.get_by_text("Real-time collaboration", exact=True)).to_be_visible()
     peerA.get_by_text("Real-time collaboration", exact=True).click()
     peerA.get_by_text("Enable real-time").click()
-    peerA.get_by_role("link", name="Update permissions and editors").click()
+    peerA.get_by_role("button", name="Update permissions and editors").click()
     peerA.locator('select[name="share_status"]').select_option(str(Map.PUBLIC))
     with peerA.expect_response(re.compile("./update/settings/.*")):
         peerA.get_by_role("button", name="Save").click()
@@ -537,6 +535,11 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
     expect(markersA).to_have_count(1)
     expect(markersB).to_have_count(1)
 
+    # Make sure only one layer has been created on peer B
+    peerB.get_by_role("button", name="Open browser").click()
+    expect(peerB.locator("h5").get_by_text("Layer 1")).to_be_visible()
+    peerB.get_by_role("button", name="Close").click()
+
     # Save and quit edit mode again
     with peerA.expect_response(re.compile("./datalayer/create/.*")):
         peerA.get_by_role("button", name="Save").click()
@@ -563,3 +566,96 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
     peerA.get_by_role("button", name="Edit").click()
     expect(markersA).to_have_count(2)
     expect(markersB).to_have_count(2)
+
+
+@pytest.mark.xdist_group(name="websockets")
+def test_saved_datalayer_are_not_duplicated(new_page, asgi_live_server, tilelayer):
+    map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
+    map.settings["properties"]["syncEnabled"] = True
+    map.save()
+
+    # Create one tab
+    peerA = new_page("Page A")
+    peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    # Create a new datalayer
+    peerA.get_by_title("Manage layers").click()
+    peerA.get_by_title("Add a layer").click()
+    peerA.locator("#map").click(position={"x": 220, "y": 220})
+    # Save layer to the server, so now the datalayer exist on the server AND
+    # is still in the live operations of peer A
+    with peerA.expect_response(re.compile(".*/datalayer/create/.*")):
+        peerA.get_by_role("button", name="Save").click()
+
+    # Now load the map from another tab
+    peerB = new_page("Page B")
+    peerB.goto(peerA.url)
+    peerB.get_by_role("button", name="Open browser").click()
+    expect(peerB.get_by_text("Layer 1")).to_be_visible()
+    peerB.get_by_role("button", name="Edit").click()
+    peerA.wait_for_timeout(300)  # Let the synchro roll on.
+    expect(peerB.get_by_text("Layer 1")).to_be_visible()
+
+
+@pytest.mark.xdist_group(name="websockets")
+def test_should_sync_saved_status(new_page, asgi_live_server, tilelayer):
+    map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
+    map.settings["properties"]["syncEnabled"] = True
+    map.save()
+
+    # Create two tabs
+    peerA = new_page("Page A")
+    peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    peerB = new_page("Page B")
+    peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+
+    # Create a new marker from peerA
+    peerA.get_by_title("Draw a marker").click()
+    peerA.locator("#map").click(position={"x": 220, "y": 220})
+
+    # Peer A should be in dirty state
+    expect(peerA.locator("body")).to_have_class(re.compile(".*umap-is-dirty.*"))
+
+    # Peer B should not be in dirty state
+    expect(peerB.locator("body")).not_to_have_class(re.compile(".*umap-is-dirty.*"))
+
+    # Create a new marker from peerB
+    peerB.get_by_title("Draw a marker").click()
+    peerB.locator("#map").click(position={"x": 200, "y": 250})
+
+    # Peer B should be in dirty state
+    expect(peerB.locator("body")).to_have_class(re.compile(".*umap-is-dirty.*"))
+
+    # Peer A should still be in dirty state
+    expect(peerA.locator("body")).to_have_class(re.compile(".*umap-is-dirty.*"))
+
+    # Save layer to the server from peerA
+    with peerA.expect_response(re.compile(".*/datalayer/create/.*")):
+        peerA.get_by_role("button", name="Save").click()
+
+    # Peer B should not be in dirty state
+    expect(peerB.locator("body")).not_to_have_class(re.compile(".*umap-is-dirty.*"))
+
+    # Peer A should not be in dirty state
+    expect(peerA.locator("body")).not_to_have_class(re.compile(".*umap-is-dirty.*"))
+
+
+@pytest.mark.xdist_group(name="websockets")
+def test_should_sync_line_on_escape(new_page, asgi_live_server, tilelayer):
+    map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
+    map.settings["properties"]["syncEnabled"] = True
+    map.save()
+
+    # Create two tabs
+    peerA = new_page("Page A")
+    peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    peerB = new_page("Page B")
+    peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+
+    # Create a new marker from peerA
+    peerA.get_by_title("Draw a polyline").click()
+    peerA.locator("#map").click(position={"x": 220, "y": 220})
+    peerA.locator("#map").click(position={"x": 200, "y": 200})
+    peerA.locator("body").press("Escape")
+
+    expect(peerA.locator("path")).to_have_count(1)
+    expect(peerB.locator("path")).to_have_count(1)

umap/utils.py

@@ -27,7 +27,10 @@ def _urls_for_js():
     Return templated URLs prepared for javascript.
     """
     urls = {}
-    for module in ["umap.urls", "umap.sync.app"]:
+    modules = ["umap.urls"]
+    if settings.WEBSOCKET_ENABLED:
+        modules.append("umap.sync.app")
+    for module in modules:
         names = _get_url_names(module)
         urls.update(
             dict(zip(names, [get_uri_template(url, module=module) for url in names]))

umap/views.py

@@ -1421,16 +1421,7 @@ class LoginPopupEnd(TemplateView):
     template_name = "umap/login_popup_end.html"
 
     def get(self, *args, **kwargs):
-        backend = self.request.session[BACKEND_SESSION_KEY]
+        backend = self.request.session.get(BACKEND_SESSION_KEY)
         if backend in settings.DEPRECATED_AUTHENTICATION_BACKENDS:
-            name = backend.split(".")[-1]
-            messages.error(
-                self.request,
-                _(
-                    "Using “%(name)s” to authenticate is deprecated. "
-                    "Please configure another provider in your profile page."
-                )
-                % {"name": name},
-            )
             return HttpResponseRedirect(reverse("user_profile"))
         return super().get(*args, **kwargs)

{umap_project-2.9.0b0.dist-info → umap_project-2.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 2.9.0b0
+Version: 2.9.2
 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,23 +19,23 @@ Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-environ==0.12.0
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.1.5
+Requires-Dist: django==5.1.6
 Requires-Dist: pillow==11.1.0
 Requires-Dist: psycopg==3.2.4
-Requires-Dist: rcssmin==1.2.0
+Requires-Dist: rcssmin==1.2.1
 Requires-Dist: requests==2.32.3
-Requires-Dist: rjsmin==1.2.3
+Requires-Dist: rjsmin==1.2.4
 Requires-Dist: social-auth-app-django==5.4.2
 Requires-Dist: social-auth-core==4.5.4
 Provides-Extra: dev
 Requires-Dist: djlint==1.36.4; extra == 'dev'
 Requires-Dist: hatch==1.14.0; extra == 'dev'
-Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.50; extra == 'dev'
-Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
+Requires-Dist: isort==6.0.1; extra == 'dev'
+Requires-Dist: mkdocs-material==9.6.4; extra == 'dev'
+Requires-Dist: mkdocs-static-i18n==1.3.0; extra == 'dev'
 Requires-Dist: mkdocs==1.6.1; extra == 'dev'
-Requires-Dist: pymdown-extensions==10.14.1; extra == 'dev'
-Requires-Dist: ruff==0.9.3; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.14.3; extra == 'dev'
+Requires-Dist: ruff==0.9.9; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.28; extra == 'docker'
@@ -46,11 +46,11 @@ Requires-Dist: pydantic==2.10.6; extra == 'sync'
 Requires-Dist: redis==5.2.1; extra == 'sync'
 Provides-Extra: test
 Requires-Dist: daphne==4.1.2; extra == 'test'
-Requires-Dist: factory-boy==3.3.1; extra == 'test'
-Requires-Dist: moto[s3]==5.0.27; extra == 'test'
+Requires-Dist: factory-boy==3.3.3; extra == 'test'
+Requires-Dist: moto[s3]==5.0.28; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
-Requires-Dist: pytest-django==4.9.0; extra == 'test'
-Requires-Dist: pytest-playwright==0.6.2; extra == 'test'
+Requires-Dist: pytest-django==4.10.0; extra == 'test'
+Requires-Dist: pytest-playwright==0.7.0; extra == 'test'
 Requires-Dist: pytest-rerunfailures==15.0; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==8.3.4; extra == 'test'