umap-project 3.4.0b2__py3-none-any.whl → 3.4.0b3__py3-none-any.whl

umap/tests/integration/test_map_preview.py

@@ -58,7 +58,7 @@ def test_map_preview_can_load_remote_geojson(page, live_server, tilelayer):
     expect(markers).to_have_count(1)
 
 
-def test_map_preview_can_load_mutiple_remote_geojson(page, live_server, tilelayer):
+def test_map_preview_can_load_multiple_remote_geojson(page, live_server, tilelayer):
     def handle(route):
         if "2" in route.request.url:
             route.fulfill(json=GEOJSON2)

umap/tests/integration/test_picto.py

@@ -136,7 +136,7 @@ def test_can_change_picto_at_marker_level(openmap, live_server, page, pictos):
     expect(define).to_be_visible()
     expect(undefine).to_be_hidden()
     define.click()
-    # Map has an icon defined, so it shuold open on Recent tab
+    # Map has an icon defined, so it should open on Recent tab
     symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(page.get_by_text("Recent")).to_be_visible()
     expect(symbols).to_have_count(1)

umap/tests/integration/test_save.py

@@ -1,7 +1,7 @@
 import re
 
 
-def test_reseting_map_would_remove_from_save_queue(
+def test_resetting_map_would_remove_from_save_queue(
     live_server, openmap, page, datalayer
 ):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")

umap/tests/integration/test_websocket_sync.py

@@ -25,7 +25,9 @@ def setup_function():
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_websocket_connection_can_sync_markers(new_page, asgi_live_server, tilelayer):
+def test_websocket_connection_can_sync_markers(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -34,8 +36,10 @@ def test_websocket_connection_can_sync_markers(new_page, asgi_live_server, tilel
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     a_marker_pane = peerA.locator(".leaflet-marker-pane > div")
     b_marker_pane = peerB.locator(".leaflet-marker-pane > div")
@@ -91,17 +95,21 @@ def test_websocket_connection_can_sync_markers(new_page, asgi_live_server, tilel
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilelayer):
+def test_websocket_connection_can_sync_polygons(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
     DataLayerFactory(map=map, data={})
 
     # Create two tabs
-    peerA = context.new_page()
+    peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
-    peerB = context.new_page()
+    wait_for_loaded(peerA)
+    peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     b_map_el = peerB.locator("#map")
 
@@ -171,7 +179,7 @@ def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilel
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_map_properties(
-    new_page, asgi_live_server, tilelayer
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -181,8 +189,10 @@ def test_websocket_connection_can_sync_map_properties(
     # Create two tabs
     peerA = new_page()
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page()
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Name change is synced
     peerA.get_by_role("button", name="Edit map name and caption").click()
@@ -205,7 +215,7 @@ def test_websocket_connection_can_sync_map_properties(
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_datalayer_properties(
-    new_page, asgi_live_server, tilelayer
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -215,8 +225,10 @@ def test_websocket_connection_can_sync_datalayer_properties(
     # Create two tabs
     peerA = new_page()
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page()
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Layer addition, name and type are synced
     peerA.get_by_role("button", name="Manage layers").click()
@@ -236,7 +248,7 @@ def test_websocket_connection_can_sync_datalayer_properties(
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_cloned_polygons(
-    context, asgi_live_server, tilelayer
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -244,10 +256,12 @@ def test_websocket_connection_can_sync_cloned_polygons(
     DataLayerFactory(map=map, data={})
 
     # Create two tabs
-    peerA = context.new_page()
+    peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
-    peerB = context.new_page()
+    wait_for_loaded(peerA)
+    peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     b_map_el = peerB.locator("#map")
 
@@ -297,7 +311,7 @@ def test_websocket_connection_can_sync_cloned_polygons(
 
 @pytest.mark.xdist_group(name="websockets")
 def test_websocket_connection_can_sync_late_joining_peer(
-    new_page, asgi_live_server, tilelayer
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
 ):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
@@ -307,6 +321,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
     # Create first peer (A) and have it join immediately
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
 
     # Add a marker from peer A
     a_create_marker = peerA.get_by_title("Draw a marker")
@@ -333,6 +348,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
     # Now create peer B and have it join
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Check if peer B has received all the updates
     b_marker_pane = peerB.locator(".leaflet-marker-pane > div")
@@ -357,7 +373,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
+def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer, wait_for_loaded):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -367,8 +383,10 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Create a new layer from peerA
     peerA.get_by_role("button", name="Manage layers").click()
@@ -398,7 +416,7 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
     peerA.locator("#map").click()
 
     # Make sure this new marker is in Layer 2 for peerB
-    # Show features for this layer in the brower.
+    # Show features for this layer in the browser.
     peerB.locator("summary").filter(has_text="Layer 2").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(
@@ -433,7 +451,9 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_sync_datalayers_delete(new_page, asgi_live_server, tilelayer):
+def test_should_sync_datalayers_delete(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -473,8 +493,10 @@ def test_should_sync_datalayers_delete(new_page, asgi_live_server, tilelayer):
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     peerA.get_by_role("button", name="Open browser").click()
     expect(peerA.locator(".panel").get_by_text("datalayer 1")).to_be_visible()
@@ -496,10 +518,13 @@ def test_should_sync_datalayers_delete(new_page, asgi_live_server, tilelayer):
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user):
+def test_create_and_sync_map(
+    new_page, asgi_live_server, tilelayer, login, user, wait_for_loaded
+):
     # Create a syncable map with peerA
     peerA = login(user, prefix="Page A")
     peerA.goto(f"{asgi_live_server.url}/en/map/new/")
+    wait_for_loaded(peerA)
     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/.*")):
@@ -519,6 +544,7 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
     # Open map and go to edit mode with peer B
     peerB = new_page("Page B")
     peerB.goto(peerA.url)
+    wait_for_loaded(peerB)
     peerB.get_by_role("button", name="Edit").click()
 
     # Create a marker from peerA
@@ -568,7 +594,9 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_saved_datalayer_are_not_duplicated(new_page, asgi_live_server, tilelayer):
+def test_saved_datalayer_are_not_duplicated(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -576,6 +604,7 @@ def test_saved_datalayer_are_not_duplicated(new_page, asgi_live_server, tilelaye
     # Create one tab
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     # Create a new datalayer
     peerA.get_by_title("Manage layers").click()
     peerA.get_by_title("Add a layer").click()
@@ -588,6 +617,7 @@ def test_saved_datalayer_are_not_duplicated(new_page, asgi_live_server, tilelaye
     # Now load the map from another tab
     peerB = new_page("Page B")
     peerB.goto(peerA.url)
+    wait_for_loaded(peerB)
     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()
@@ -596,7 +626,9 @@ def test_saved_datalayer_are_not_duplicated(new_page, asgi_live_server, tilelaye
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_sync_saved_status(new_page, asgi_live_server, tilelayer):
+def test_should_sync_saved_status(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -604,8 +636,10 @@ def test_should_sync_saved_status(new_page, asgi_live_server, tilelayer):
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Create a new marker from peerA
     peerA.get_by_title("Draw a marker").click()
@@ -639,7 +673,9 @@ def test_should_sync_saved_status(new_page, asgi_live_server, tilelayer):
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_sync_line_on_escape(new_page, asgi_live_server, tilelayer):
+def test_should_sync_line_on_escape(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -647,8 +683,10 @@ def test_should_sync_line_on_escape(new_page, asgi_live_server, tilelayer):
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Create a new marker from peerA
     peerA.get_by_title("Draw a polyline").click()
@@ -662,7 +700,7 @@ def test_should_sync_line_on_escape(new_page, asgi_live_server, tilelayer):
 
 @pytest.mark.xdist_group(name="websockets")
 def test_should_sync_datalayer_clear(
-    new_page, asgi_live_server, tilelayer, map, datalayer
+    new_page, asgi_live_server, tilelayer, map, datalayer, wait_for_loaded
 ):
     map.settings["properties"]["syncEnabled"] = True
     map.edit_status = Map.ANONYMOUS
@@ -671,8 +709,10 @@ def test_should_sync_datalayer_clear(
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
     expect(peerA.locator(".leaflet-marker-icon")).to_have_count(1)
     expect(peerB.locator(".leaflet-marker-icon")).to_have_count(1)
 
@@ -691,7 +731,9 @@ def test_should_sync_datalayer_clear(
 
 
 @pytest.mark.xdist_group(name="websockets")
-def test_should_save_remote_dirty_datalayers(new_page, asgi_live_server, tilelayer):
+def test_should_save_remote_dirty_datalayers(
+    new_page, asgi_live_server, tilelayer, wait_for_loaded
+):
     map = MapFactory(name="sync", edit_status=Map.ANONYMOUS)
     map.settings["properties"]["syncEnabled"] = True
     map.save()
@@ -701,8 +743,10 @@ def test_should_save_remote_dirty_datalayers(new_page, asgi_live_server, tilelay
     # Create two tabs
     peerA = new_page("Page A")
     peerA.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerA)
     peerB = new_page("Page B")
     peerB.goto(f"{asgi_live_server.url}{map.get_absolute_url()}?edit")
+    wait_for_loaded(peerB)
 
     # Create a new layer from peerA
     peerA.get_by_role("button", name="Manage layers").click()

umap/tests/test_dashboard.py

@@ -68,7 +68,7 @@ def test_user_dashboard_display_user_team_maps(client, map, team, user, share_st
 
 def test_user_dashboard_display_user_maps_distinct(client, map):
     # cf https://github.com/umap-project/umap/issues/1325
-    anonymap = MapFactory(name="Map witout owner should not appear")
+    anonymap = MapFactory(name="Map without owner should not appear")
     user1 = UserFactory(username="user1")
     user2 = UserFactory(username="user2")
     map.editors.add(user1)

umap/tests/test_statics.py

@@ -32,9 +32,9 @@ def test_collectstatic_ran_successfully_with_hashes(settings, staticfiles):
     assert "hash" in json_manifest.keys()
     assert "umap/base.css" in json_manifest["paths"]
     # Hash + the dot ("umap/base.<hash>.css").
-    md5_hash_lenght = 12 + 1
+    md5_hash_length = 12 + 1
     # The value of the manifest must contain the hash (length).
     assert (
         len(json_manifest["paths"]["umap/base.css"])
-        == len("umap/base.css") + md5_hash_lenght
+        == len("umap/base.css") + md5_hash_length
     )

umap/tests/test_views.py

@@ -73,7 +73,7 @@ def test_POST_raises():
         validate_url(request)
 
 
-def test_unkown_domain_raises():
+def test_unknown_domain_raises():
     request = get("http://xlkjdkjsdlkjfd.com")
     with pytest.raises(AssertionError):
         validate_url(request)

umap/utils.py

@@ -80,7 +80,7 @@ def get_uri_template(urlname, args=None, prefix="", module=None):
             result, params = possibility[0]
             return _convert(result, params)
         else:
-            # If there are optionnal arguments passed, use them to try to find
+            # If there are optional arguments passed, use them to try to find
             # the correct pattern.
             # First, we need to build a list with all the arguments
             seen_params = []

{umap_project-3.4.0b2.dist-info → umap_project-3.4.0b3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.4.0b2
+Version: 3.4.0b3
 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>
@@ -21,7 +21,7 @@ Requires-Dist: django-environ==0.12.0
 Requires-Dist: django-probes==1.7.0
 Requires-Dist: django==5.2.7
 Requires-Dist: pillow==11.3.0
-Requires-Dist: psycopg==3.2.10
+Requires-Dist: psycopg==3.2.11
 Requires-Dist: rcssmin==1.2.1
 Requires-Dist: requests==2.32.5
 Requires-Dist: rjsmin==1.2.4
@@ -42,7 +42,7 @@ Requires-Dist: uvicorn==0.37.0; extra == 'docker'
 Provides-Extra: s3
 Requires-Dist: django-storages[s3]==1.14.6; extra == 's3'
 Provides-Extra: sync
-Requires-Dist: pydantic==2.11.9; extra == 'sync'
+Requires-Dist: pydantic==2.12.3; extra == 'sync'
 Requires-Dist: redis==6.4.0; extra == 'sync'
 Requires-Dist: websockets==15.0.1; extra == 'sync'
 Provides-Extra: test
@@ -52,7 +52,7 @@ Requires-Dist: moto[s3]==5.1.14; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.11.1; extra == 'test'
 Requires-Dist: pytest-playwright==0.7.1; extra == 'test'
-Requires-Dist: pytest-rerunfailures==16.0.1; extra == 'test'
+Requires-Dist: pytest-rerunfailures==16.1; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==8.4.2; extra == 'test'
 Description-Content-Type: text/markdown