umap-project 3.4.0b3__py3-none-any.whl → 3.4.2__py3-none-any.whl

umap/tests/integration/test_import.py

@@ -75,6 +75,7 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_role("button", name="Open browser").click()
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.umap"
     textarea.fill(path.read_text())
@@ -108,6 +109,7 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.json"
     textarea.fill(path.read_text())
@@ -131,6 +133,7 @@ def test_import_invalid_data(tilelayer, live_server, page):
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill("invalid data")
     for format in ["geojson", "csv", "gpx", "kml", "georss", "osm", "umap"]:
@@ -149,6 +152,7 @@ def test_import_kml_from_textarea(tilelayer, live_server, page):
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.kml"
     textarea.fill(path.read_text())
@@ -171,6 +175,7 @@ def test_import_gpx_from_textarea(tilelayer, live_server, page, settings):
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.gpx"
     textarea.fill(path.read_text())
@@ -226,6 +231,7 @@ def test_import_osm_from_textarea(tilelayer, live_server, page):
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data_osm.json"
     textarea.fill(path.read_text())
@@ -244,6 +250,7 @@ def test_import_csv_from_textarea(tilelayer, live_server, page):
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
@@ -263,6 +270,7 @@ def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap)
     expect(layers).to_have_count(1)
     page.get_by_role("button", name="Edit").click()
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
@@ -284,6 +292,7 @@ def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
     expect(layers).to_have_count(1)
     page.get_by_role("button", name="Edit").click()
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
@@ -305,6 +314,7 @@ def test_can_import_in_new_datalayer(live_server, datalayer, page, openmap):
     expect(layers).to_have_count(1)
     page.get_by_role("button", name="Edit").click()
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
@@ -351,6 +361,7 @@ def test_should_remove_dot_in_property_names(live_server, page, settings, tilela
     }
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -410,6 +421,7 @@ def test_import_geometry_collection(live_server, page, tilelayer):
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -463,6 +475,7 @@ def test_import_geometry_collection_in_feature(live_server, page, tilelayer):
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -497,6 +510,7 @@ def test_import_multipolygon(live_server, page, tilelayer):
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -527,6 +541,7 @@ def test_import_multipolyline(live_server, page, tilelayer):
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -557,6 +572,7 @@ def test_import_false_multipoint(live_server, page, tilelayer):
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -621,6 +637,7 @@ def test_should_not_import_empty_coordinates(live_server, page, tilelayer):
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_title("Open browser").click()
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -636,6 +653,7 @@ def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill("a,b,c\n12.23,48.34,mypoint\n12.23,48.34,mypoint2")
     page.locator('select[name="format"]').select_option("csv")
@@ -653,6 +671,7 @@ def test_import_csv_with_commas_in_latlon(tilelayer, live_server, page, settings
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill("lat;lon;foobar\n12,24;48,34;mypoint\n12,23;48,35;mypoint2")
     page.locator('select[name="format"]').select_option("csv")
@@ -687,6 +706,7 @@ def test_import_csv_with_wkt_geom(tilelayer, live_server, page, settings):
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill(
         "Geom;foobar\nPOLYGON ((-64.8 32.3, -65.5 18.3, -80.3 25.2, -64.8 32.3));mypoly\nPOINT(48.35 12.23);mypoint"
@@ -740,6 +760,7 @@ def test_import_csv_with_geojson_geom(tilelayer, live_server, page, settings):
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     textarea.fill(
         "geojson;foobar\n"
@@ -1034,6 +1055,7 @@ def test_import_osm_relation(tilelayer, live_server, page):
     expect(paths).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     file_path = Path(__file__).parent.parent / "fixtures/test_import_osm_relation.json"
     textarea.fill(file_path.read_text())
@@ -1052,6 +1074,7 @@ def test_import_georss_from_textarea(tilelayer, live_server, page):
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
     page.get_by_title("Import data").click()
+    page.wait_for_timeout(300)  # Time for the panel animation to finish
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_georss.xml"
     textarea.fill(path.read_text())

umap/tests/integration/test_map.py

@@ -147,14 +147,14 @@ def test_default_view_latest_with_polygon(map, live_server, page):
     expect(layers).to_have_count(1)
 
 
-def test_default_view_locate(browser, live_server, map):
+def test_default_view_locate(browser, live_server, map, new_page):
     context = browser.new_context(
         geolocation={"longitude": 8.52967, "latitude": 39.16267},
         permissions=["geolocation"],
     )
     map.settings["properties"]["defaultView"] = "locate"
     map.save()
-    page = context.new_page()
+    page = new_page(custom_context=context)
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page).to_have_url(re.compile(r".*#18/39\.16267/8\.52967"))
 

umap/tests/integration/test_owned_map.py

@@ -183,7 +183,7 @@ def test_can_change_perms_after_create(tilelayer, live_server, login, user):
     page.goto(f"{live_server.url}/en/map/new")
     # Create a layer
     page.get_by_title("Manage layers").click()
-    page.get_by_title("Add a layer").click()
+    page.get_by_role("button", name="Add a layer").click()
     page.locator("input[name=name]").fill("Layer 1")
     expect(
         page.get_by_role("button", name="Visibility: Draft (private)")
@@ -217,7 +217,7 @@ def test_can_change_owner(map, live_server, login, user):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
     edit_permissions = page.get_by_title("Update permissions and editors")
     edit_permissions.click()
-    close = page.locator(".umap-field-owner .close")
+    close = page.locator(".umap-field-owner .icon-close")
     close.click()
     input = page.locator("input.edit-owner")
     with page.expect_response(re.compile(r".*/agnocomplete/.*")):

umap/tests/integration/test_popup.py

@@ -42,3 +42,34 @@ def test_openstreetmap_popup(live_server, map, page):
         "src",
         "https://api.panoramax.xyz/api/pictures/d811b398-d930-4cf8-95a2-0c29c34d9fca/sd.jpg",
     )
+
+
+def test_table_popup(live_server, map, page):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "geometry": {"type": "Point", "coordinates": [2.49, 48.79]},
+                "properties": {
+                    "url": "https://restaurant.org",
+                    "formatted": "with **bold**",
+                },
+                "id": "AzMjk",
+            },
+        ],
+        "_umap_options": {
+            "popupTemplate": "Table",
+            "fields": [
+                {"key": "url", "type": "String"},
+                {"key": "formatted", "type": "Text"},
+            ],
+        },
+    }
+    DataLayerFactory(map=map, data=data)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#18/48.79/2.49")
+    page.locator(".leaflet-marker-icon").click()
+    expect(page.get_by_role("link", name="https://restaurant.org")).to_be_visible()
+    expect(page.get_by_role("cell", name="with bold").locator("strong")).to_have_text(
+        "bold"
+    )

umap/tests/integration/test_remote_data.py

@@ -16,7 +16,7 @@ def intercept_remote_data(page):
             "features": [
                 {
                     "type": "Feature",
-                    "properties": {"name": "Point 2"},
+                    "properties": {"name": "Point 2", "foobar": "bla"},
                     "geometry": {
                         "type": "Point",
                         "coordinates": [4.3375, 11.2707],
@@ -29,7 +29,7 @@ def intercept_remote_data(page):
             "features": [
                 {
                     "type": "Feature",
-                    "properties": {"name": "Point 1"},
+                    "properties": {"name": "Point 1", "foobar": "baz"},
                     "geometry": {
                         "type": "Point",
                         "coordinates": [4.3375, 12.2707],
@@ -117,8 +117,8 @@ def test_create_remote_data_layer(page, live_server, tilelayer, settings):
                     "type": "String",
                 },
                 {
-                    "key": "description",
-                    "type": "Text",
+                    "key": "foobar",
+                    "type": "String",
                 },
             ],
             "id": str(datalayer.pk),

umap/tests/integration/test_search.py

@@ -0,0 +1,41 @@
+from playwright.sync_api import expect
+
+
+def test_reverse_search(live_server, page, tilelayer):
+    photon_response = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {
+                    "osm_type": "N",
+                    "osm_id": 5055853416,
+                    "osm_key": "place",
+                    "osm_value": "locality",
+                    "type": "locality",
+                    "postcode": "10200",
+                    "countrycode": "FR",
+                    "name": "Le Haut Sentier",
+                    "country": "France",
+                    "city": "Thors",
+                    "state": "Grand Est",
+                    "county": "Aube",
+                },
+                "geometry": {"type": "Point", "coordinates": [4.7995256, 48.2985251]},
+            }
+        ],
+    }
+    page.goto(f"{live_server.url}/en/map/new")
+
+    def handle_search(route):
+        route.fulfill(json=photon_response)
+
+    # Intercept the route
+    page.route(
+        "https://photon.komoot.io/reverse/?limit=1&lat=48.3&lon=4.8",
+        handle_search,
+    )
+    page.get_by_role("button", name="Search location").click()
+    page.get_by_role("searchbox", name="Type a place name or").fill("48.3 4.8")
+    expect(page.get_by_text("48.3 4.8")).to_be_visible()
+    expect(page.get_by_text("Le Haut Sentier")).to_be_visible()

umap/tests/integration/test_share.py

@@ -8,7 +8,7 @@ pytestmark = pytest.mark.django_db
 
 def test_iframe_code_can_contain_datalayers(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
-    textarea = page.locator(".umap-share-iframe")
+    textarea = page.get_by_label("Iframe")
     expect(textarea).to_be_visible()
     expect(textarea).to_have_text(re.compile('src="'))
     expect(textarea).to_have_text(re.compile('href="'))
@@ -28,7 +28,7 @@ def test_iframe_code_can_contain_datalayers(map, live_server, datalayer, page):
 def test_iframe_code_can_contain_feature(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
     page.locator(".icon-container").click()
-    textarea = page.locator(".umap-share-iframe")
+    textarea = page.get_by_label("Iframe")
     expect(textarea).to_be_visible()
     expect(textarea).not_to_have_text(re.compile("feature=Here"))
     # Open options

umap/tests/integration/test_team.py

@@ -39,7 +39,7 @@ def test_can_remove_user_from_team(live_server, map, user, user2, team, login):
         page.get_by_role("link", name="My teams").click()
     with page.expect_navigation():
         page.get_by_role("link", name="Edit").click()
-    page.locator("li").filter(has_text="Averell").locator(".close").click()
+    page.locator("li").filter(has_text="Averell").locator(".icon-close").click()
     page.get_by_role("button", name="Save").click()
     assert Team.objects.count() == 1
     modified = Team.objects.first()

umap/tests/integration/test_websocket_sync.py

@@ -53,6 +53,7 @@ def test_websocket_connection_can_sync_markers(
 
     a_map_el = peerA.locator("#map")
     a_map_el.click(position={"x": 220, "y": 220})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     expect(a_marker_pane).to_have_count(1)
     expect(b_marker_pane).to_have_count(1)
     # Peer B should not be in state dirty
@@ -330,6 +331,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
 
     a_map_el = peerA.locator("#map")
     a_map_el.click(position={"x": 220, "y": 220})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     peerA.locator("body").type("First marker")
     peerA.locator("body").press("Escape")
     peerA.wait_for_timeout(300)
@@ -555,8 +557,10 @@ def test_create_and_sync_map(
 
     # Add a marker from peer A
     peerA.get_by_role("button", name="Edit").click()
+    peerA.wait_for_timeout(300)  # Time for the animation to finish
     peerA.get_by_title("Draw a marker").click()
     peerA.locator("#map").click(position={"x": 220, "y": 220})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     expect(markersA).to_have_count(1)
     expect(markersB).to_have_count(1)
 
@@ -582,6 +586,7 @@ def test_create_and_sync_map(
     # Add a marker from peer B
     peerB.get_by_title("Draw a marker").click()
     peerB.locator("#map").click(position={"x": 200, "y": 200})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     expect(markersB).to_have_count(2)
     expect(markersA).to_have_count(1)
     with peerB.expect_response(re.compile("./datalayer/update/.*")):
@@ -607,7 +612,7 @@ def test_saved_datalayer_are_not_duplicated(
     wait_for_loaded(peerA)
     # Create a new datalayer
     peerA.get_by_title("Manage layers").click()
-    peerA.get_by_title("Add a layer").click()
+    peerA.get_by_role("button", name="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

umap/tests/test_utils.py

@@ -1,3 +1,4 @@
+import stat
 from pathlib import Path
 
 import pytest
@@ -5,7 +6,8 @@ import pytest
 from umap.utils import gzip_file, normalize_string
 
 
-def test_gzip_file():
+def test_gzip_file(settings):
+    settings.FILE_UPLOAD_PERMISSIONS = 0o666
     # Let's use any old file so we can check that the date of the gzip file is set.
     src = Path(__file__).parent / "settings.py"
     dest = Path("/tmp/test_settings.py.gz")
@@ -14,6 +16,7 @@ def test_gzip_file():
     dest_stat = dest.stat()
     dest.unlink()
     assert src_stat.st_mtime == dest_stat.st_mtime
+    assert stat.filemode(dest_stat.st_mode) == "-rw-rw-rw-"
 
 
 @pytest.mark.parametrize(

umap/utils.py

@@ -150,6 +150,7 @@ def gzip_file(from_path, to_path):
         with gzip.open(to_path, "wb") as f_out:
             f_out.writelines(f_in)
     os.utime(to_path, ns=(stat.st_mtime_ns, stat.st_mtime_ns))
+    os.chmod(to_path, settings.FILE_UPLOAD_PERMISSIONS)
 
 
 def is_ajax(request):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.4.0b3
+Version: 3.4.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,31 +19,31 @@ 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.2.7
-Requires-Dist: pillow==11.3.0
-Requires-Dist: psycopg==3.2.11
-Requires-Dist: rcssmin==1.2.1
+Requires-Dist: django==5.2.8
+Requires-Dist: pillow==12.0.0
+Requires-Dist: psycopg==3.2.13
+Requires-Dist: rcssmin==1.2.2
 Requires-Dist: requests==2.32.5
-Requires-Dist: rjsmin==1.2.4
-Requires-Dist: social-auth-app-django==5.4.3
-Requires-Dist: social-auth-core==4.5.6
+Requires-Dist: rjsmin==1.2.5
+Requires-Dist: social-auth-app-django==5.6.0
+Requires-Dist: social-auth-core==4.8.1
 Provides-Extra: dev
 Requires-Dist: djlint==1.36.4; extra == 'dev'
-Requires-Dist: hatch==1.14.2; extra == 'dev'
-Requires-Dist: isort==6.0.1; extra == 'dev'
-Requires-Dist: mkdocs-material==9.6.21; extra == 'dev'
+Requires-Dist: hatch==1.15.1; extra == 'dev'
+Requires-Dist: isort==7.0.0; extra == 'dev'
+Requires-Dist: mkdocs-material==9.7.0; 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.16.1; extra == 'dev'
-Requires-Dist: ruff==0.14.0; extra == 'dev'
-Requires-Dist: vermin==1.6.0; extra == 'dev'
+Requires-Dist: ruff==0.14.5; extra == 'dev'
+Requires-Dist: vermin==1.7.0; extra == 'dev'
 Provides-Extra: docker
-Requires-Dist: uvicorn==0.37.0; extra == 'docker'
+Requires-Dist: uvicorn==0.38.0; extra == 'docker'
 Provides-Extra: s3
 Requires-Dist: django-storages[s3]==1.14.6; extra == 's3'
 Provides-Extra: sync
 Requires-Dist: pydantic==2.12.3; extra == 'sync'
-Requires-Dist: redis==6.4.0; extra == 'sync'
+Requires-Dist: redis==7.1.0; extra == 'sync'
 Requires-Dist: websockets==15.0.1; extra == 'sync'
 Provides-Extra: test
 Requires-Dist: daphne==4.2.1; extra == 'test'