umap-project 3.0.4__py3-none-any.whl → 3.0.6__py3-none-any.whl

umap/tests/integration/test_basics.py

@@ -61,13 +61,21 @@ def test_cannot_put_script_tag_in_datalayer_name_or_description(
     page.locator(".umap-field-description textarea").fill(
         '<p>before <script>alert("attack")</script> after</p>'
     )
-    page.get_by_role("button", name="Save").click()
+    page.wait_for_timeout(300)  # Wait for debounce
+    with page.expect_response(re.compile(".*/datalayer/create/.*")):
+        page.get_by_role("button", name="Save").click()
     page.get_by_role("button", name="About").click()
     # Title should contain raw HTML (we are using textContent)
     expect(page.get_by_text('<script>alert("attack")</script>')).to_be_visible()
     # Description should contain escaped HTML
     expect(page.get_by_text("before after")).to_be_visible()
 
+    # Reload the map
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
+    page.get_by_role("button", name="About").click()
+    expect(page.get_by_text('<script>alert("attack")</script>')).to_be_visible()
+    expect(page.get_by_text("before after")).to_be_visible()
+
 
 def test_login_from_map_page(live_server, page, tilelayer, settings, user, context):
     settings.ENABLE_ACCOUNT_LOGIN = True

umap/tests/integration/test_browser.py

@@ -465,19 +465,19 @@ def test_main_toolbox_toggle_all_layers(live_server, map, page):
     expect(page.locator(".datalayer.off")).to_have_count(1)
 
     # Click on button
-    page.locator(".umap-browser [data-ref=toggle]").click()
+    page.locator(".umap-browser").get_by_title("Show/hide all layers").click()
     # Should have hidden the two other layers
     expect(page.locator(".datalayer.off")).to_have_count(3)
     expect(markers).to_have_count(0)
 
     # Click again
-    page.locator(".umap-browser [data-ref=toggle]").click()
+    page.locator(".umap-browser").get_by_title("Show/hide all layers").click()
     # Should shown all layers
     expect(page.locator(".datalayer.off")).to_have_count(0)
     expect(markers).to_have_count(3)
 
     # Click again
-    page.locator(".umap-browser [data-ref=toggle]").click()
+    page.locator(".umap-browser").get_by_title("Show/hide all layers").click()
     # Should hidden again all layers
     expect(page.locator(".datalayer.off")).to_have_count(3)
     expect(markers).to_have_count(0)

umap/tests/integration/test_conditional_rules.py

@@ -281,10 +281,10 @@ def test_can_deactive_rule_from_list(live_server, page, openmap):
     page.get_by_role("button", name="Edit").click()
     page.get_by_role("button", name="Map advanced properties").click()
     page.get_by_text("Conditional style rules").click()
-    page.get_by_role("button", name="Show/hide layer").click()
+    page.get_by_role("button", name="Toggle rule").click()
     colors = getColors(markers)
     assert colors.count("rgb(240, 248, 255)") == 0
-    page.get_by_role("button", name="Show/hide layer").click()
+    page.get_by_role("button", name="Toggle rule").click()
     colors = getColors(markers)
     assert colors.count("rgb(240, 248, 255)") == 3
 

umap/tests/integration/test_datalayer.py

@@ -1,5 +1,4 @@
 import json
-import os
 import re
 
 import pytest

umap/tests/integration/test_edit_map.py

@@ -175,14 +175,14 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
 
     # By default, features are sorted by name  (Third, Second, First)
     page.get_by_role("button", name="Open browser").click()
-    page.get_by_role("heading", name="Show/hide layer").locator("i").click()
+    page.locator(".umap-browser .datalayer-name").click()
 
     first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)
     second_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(1)
     third_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(2)
-    assert "X Third" == first_listed_feature.text_content()
-    assert "Y Second" == second_listed_feature.text_content()
-    assert "Z First" == third_listed_feature.text_content()
+    assert "X Third" == first_listed_feature.text_content().strip()
+    assert "Y Second" == second_listed_feature.text_content().strip()
+    assert "Z First" == third_listed_feature.text_content().strip()
 
     # Change the default sortkey to be "key"
     page.get_by_role("button", name="Edit").click()
@@ -201,9 +201,9 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
     first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)
     second_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(1)
     third_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(2)
-    assert "Z First" == first_listed_feature.text_content()
-    assert "Y Second" == second_listed_feature.text_content()
-    assert "X Third" == third_listed_feature.text_content()
+    assert "Z First" == first_listed_feature.text_content().strip()
+    assert "Y Second" == second_listed_feature.text_content().strip()
+    assert "X Third" == third_listed_feature.text_content().strip()
 
 
 def test_hover_tooltip_setting_should_be_persistent(live_server, map, page):

umap/tests/integration/test_facets_browser.py

@@ -243,7 +243,7 @@ def test_facets_search_are_persistent_when_closing_panel(live_server, page, map)
 
     # Now let's filter
     odd.click()
-    expect(page.locator("summary")).to_have_attribute("data-badge", " ")
+    expect(page.locator(".filters summary")).to_have_attribute("data-badge", " ")
     expect(page.locator(".umap-control-browse")).to_have_attribute("data-badge", " ")
     expect(markers).to_have_count(2)
     expect(panel.get_by_text("Point 2")).to_be_hidden()
@@ -264,7 +264,7 @@ def test_facets_search_are_persistent_when_closing_panel(live_server, page, map)
     expect(panel.get_by_text("Point 3")).to_be_visible()
 
     # Close panel
-    expect(panel.locator("summary")).to_have_attribute("data-badge", " ")
+    expect(panel.locator(".filters summary")).to_have_attribute("data-badge", " ")
     expect(page.locator(".umap-control-browse")).to_have_attribute("data-badge", " ")
     panel.get_by_role("button", name="Close").click()
     page.get_by_role("button", name="Open browser").click()

umap/tests/integration/test_heatmap.py

@@ -0,0 +1,41 @@
+import json
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+
+def test_heatmap(map, live_server, page):
+    path = Path(__file__).parent.parent / "fixtures/heatmap_data.json"
+    data = json.loads(path.read_text())
+    DataLayerFactory(data=data, map=map)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.locator("canvas.leaflet-heatmap-layer")).to_be_visible()
+
+
+def test_can_create_heatmap_after_import(live_server, page, tilelayer, settings):
+    settings.UMAP_ALLOW_ANONYMOUS = True
+    page.goto(f"{live_server.url}/en/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
+    path = Path(__file__).parent.parent / "fixtures/heatmap_data.json"
+    file_chooser.set_files(path)
+    page.get_by_role("button", name="Import data", exact=True).click()
+    page.get_by_role("button", name="Manage layers").click()
+    page.get_by_role("button", name="Edit", exact=True).click()
+    page.get_by_role("combobox").select_option("Heat")
+    page.get_by_role("button", name="Save draft").click()
+    expect(page.locator("canvas.leaflet-heatmap-layer")).to_be_visible()
+
+    # Test we can delete it and save
+    page.get_by_text("Advanced actions").click()
+    page.get_by_role("button", name="Delete").click()
+    page.get_by_role("button", name="Save draft").click()
+    expect(page.locator("canvas.leaflet-heatmap-layer")).to_be_hidden()

umap/tests/integration/test_import.py

@@ -435,6 +435,63 @@ def test_import_geometry_collection(live_server, page, tilelayer):
     expect(paths).to_have_count(2)
 
 
+def test_import_geometry_collection_in_feature(live_server, page, tilelayer):
+    data = {
+        "type": "Feature",
+        "properties": {"name": "foobar"},
+        "geometry": {
+            "type": "GeometryCollection",
+            "geometries": [
+                {"type": "Point", "coordinates": [-80.6608, 35.0493]},
+                {
+                    "type": "Polygon",
+                    "coordinates": [
+                        [
+                            [-80.6645, 35.0449],
+                            [-80.6634, 35.0460],
+                            [-80.6625, 35.0455],
+                            [-80.6638, 35.0442],
+                            [-80.6645, 35.0449],
+                        ]
+                    ],
+                },
+                {
+                    "type": "LineString",
+                    "coordinates": [
+                        [-80.66237, 35.05950],
+                        [-80.66269, 35.05926],
+                        [-80.66284, 35.05893],
+                        [-80.66308, 35.05833],
+                        [-80.66385, 35.04387],
+                        [-80.66303, 35.04371],
+                    ],
+                },
+            ],
+        },
+    }
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Open browser").click()
+    layers = page.locator(".umap-browser .datalayer")
+    markers = page.locator(".leaflet-marker-icon")
+    paths = page.locator("path")
+    expect(markers).to_have_count(0)
+    expect(paths).to_have_count(0)
+    expect(layers).to_have_count(0)
+    button = page.get_by_title("Import data")
+    expect(button).to_be_visible()
+    button.click()
+    textarea = page.locator(".umap-import textarea")
+    textarea.fill(json.dumps(data))
+    page.locator('select[name="format"]').select_option("geojson")
+    page.get_by_role("button", name="Import data", exact=True).click()
+    # A layer has been created
+    expect(layers).to_have_count(1)
+    expect(markers).to_have_count(1)
+    expect(paths).to_have_count(2)
+    # Geometries are treated as separate features.
+    expect(page.get_by_text("foobar")).to_have_count(3)
+
+
 def test_import_multipolygon(live_server, page, tilelayer):
     data = {
         "type": "Feature",
@@ -847,7 +904,7 @@ def test_import_from_datasets(page, live_server, tilelayer, settings):
     page.get_by_role("button", name="Import data", exact=True).click()
     expect(page.locator(".leaflet-marker-icon")).to_be_visible()
     page.get_by_role("button", name="Open browser").click()
-    expect(page.locator("h5").get_by_text("Good data")).to_be_visible()
+    expect(page.locator("summary").get_by_text("Good data")).to_be_visible()
 
 
 def test_import_osm_relation(tilelayer, live_server, page):

umap/tests/integration/test_map.py

@@ -1,4 +1,3 @@
-import os
 import re
 
 import pytest
@@ -46,7 +45,7 @@ def test_default_view_without_datalayer_should_use_default_center(
     page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     # Hash is defined, so map is initialized
     expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+"))
-    layers = page.locator(".umap-browser .datalayer h5")
+    layers = page.locator(".umap-browser .datalayer summary")
     expect(layers).to_have_count(1)
 
 
@@ -60,7 +59,7 @@ def test_default_view_latest_without_datalayer_should_use_default_center(
     page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     # Hash is defined, so map is initialized
     expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+"))
-    layers = page.locator(".umap-browser .datalayer h5")
+    layers = page.locator(".umap-browser .datalayer summary")
     expect(layers).to_have_count(1)
 
 
@@ -74,7 +73,7 @@ def test_default_view_data_without_datalayer_should_use_default_center(
     page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     # Hash is defined, so map is initialized
     expect(page).to_have_url(re.compile(r".*#7/48\..+/13\..+"))
-    layers = page.locator(".umap-browser .datalayer h5")
+    layers = page.locator(".umap-browser .datalayer summary")
     expect(layers).to_have_count(1)
 
 
@@ -84,7 +83,7 @@ def test_default_view_latest_with_marker(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     # Hash is defined, so map is initialized
     expect(page).to_have_url(re.compile(r".*#7/48\..+/14\..+"))
-    layers = page.locator(".umap-browser .datalayer h5")
+    layers = page.locator(".umap-browser .datalayer summary")
     expect(layers).to_have_count(1)
     expect(page.locator(".leaflet-popup")).to_be_visible()
 
@@ -113,7 +112,7 @@ def test_default_view_latest_with_line(map, live_server, page):
     map.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     expect(page).to_have_url(re.compile(r".*#8/48\..+/2\..+"))
-    layers = page.locator(".umap-browser .datalayer h5")
+    layers = page.locator(".umap-browser .datalayer summary")
     expect(layers).to_have_count(1)
 
 
@@ -144,7 +143,7 @@ def test_default_view_latest_with_polygon(map, live_server, page):
     map.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     expect(page).to_have_url(re.compile(r".*#8/48\..+/2\..+"))
-    layers = page.locator(".umap-browser .datalayer h5")
+    layers = page.locator(".umap-browser .datalayer summary")
     expect(layers).to_have_count(1)
 
 
@@ -173,7 +172,7 @@ def test_remote_layer_should_not_be_used_as_datalayer_for_created_features(
     toggle = page.get_by_role("button", name="Open browser")
     expect(toggle).to_be_visible()
     toggle.click()
-    layers = page.locator(".umap-browser .datalayer h5")
+    layers = page.locator(".umap-browser .datalayer summary")
     expect(layers).to_have_count(1)
     map_el = page.locator("#map")
     add_marker = page.get_by_title("Draw a marker")

umap/tests/integration/test_optimistic_merge.py

@@ -50,6 +50,8 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "editMode": "advanced",
         "inCaption": True,
         "id": str(datalayer.pk),
+        "rank": 0,
+        "remoteData": {},
     }
 
     # Now navigate to this map from another tab
@@ -87,6 +89,8 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "inCaption": True,
         "editMode": "advanced",
         "id": str(datalayer.pk),
+        "rank": 0,
+        "remoteData": {},
     }
 
     # Now create another marker in the first tab
@@ -105,7 +109,8 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "inCaption": True,
         "editMode": "advanced",
         "id": str(datalayer.pk),
-        "permissions": {"edit_status": 1},
+        "rank": 0,
+        "remoteData": {},
     }
 
     # And again
@@ -124,7 +129,8 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "inCaption": True,
         "editMode": "advanced",
         "id": str(datalayer.pk),
-        "permissions": {"edit_status": 1},
+        "rank": 0,
+        "remoteData": {},
     }
     expect(marker_pane_p1).to_have_count(4)
 
@@ -145,7 +151,8 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "inCaption": True,
         "editMode": "advanced",
         "id": str(datalayer.pk),
-        "permissions": {"edit_status": 1},
+        "rank": 0,
+        "remoteData": {},
     }
     expect(marker_pane_p2).to_have_count(5)
 
@@ -271,7 +278,8 @@ def test_same_second_edit_doesnt_conflict(context, live_server, tilelayer):
         "inCaption": True,
         "editMode": "advanced",
         "id": str(datalayer.pk),
-        "permissions": {"edit_status": 1},
+        "rank": 0,
+        "remoteData": {},
     }
 
 

umap/tests/integration/test_querystring.py

@@ -63,5 +63,5 @@ def test_zoom_control(map, live_server, datalayer, page):
     expect(control).to_be_visible()
     page.goto(f"{live_server.url}{map.get_absolute_url()}?zoomControl=null")
     expect(control).to_be_hidden()
-    page.get_by_title("More controls").click()
+    page.locator(".umap-control-more").click()
     expect(control).to_be_visible()

umap/tests/integration/test_remote_data.py

@@ -0,0 +1,79 @@
+from playwright.sync_api import expect
+
+from umap.models import Map
+
+from ..base import DataLayerFactory
+
+
+def test_dynamic_remote_data(page, live_server, tilelayer, map):
+    data = [
+        {
+            "type": "FeatureCollection",
+            "features": [
+                {
+                    "type": "Feature",
+                    "properties": {"name": "Point 2"},
+                    "geometry": {
+                        "type": "Point",
+                        "coordinates": [4.3375, 11.2707],
+                    },
+                }
+            ],
+        },
+        {
+            "type": "FeatureCollection",
+            "features": [
+                {
+                    "type": "Feature",
+                    "properties": {"name": "Point 1"},
+                    "geometry": {
+                        "type": "Point",
+                        "coordinates": [4.3375, 12.2707],
+                    },
+                }
+            ],
+        },
+    ]
+
+    def handle(route):
+        route.fulfill(json=data.pop())
+
+    settings = {
+        "remoteData": {
+            "url": "https://remote.org/data.json",
+            "format": "geojson",
+            "dynamic": True,
+        },
+        "showLabel": True,
+    }
+    DataLayerFactory(map=map, settings=settings)
+    map.edit_status = Map.ANONYMOUS
+    map.settings["properties"]["zoom"] = 6
+    map.settings["geometry"] = {
+        "type": "Point",
+        "coordinates": [5, 12],
+    }
+    map.save()
+
+    # Intercept the route to the proxy
+    page.route("https://remote.org/data.json", handle)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+
+    expect(page.get_by_role("tooltip", name="Point 1")).to_be_visible()
+
+    # Now drag the map
+    map_el = page.locator("#map")
+    map_el.drag_to(
+        map_el,
+        source_position={"x": 100, "y": 100},
+        target_position={"x": 110, "y": 110},
+    )
+
+    expect(page.get_by_role("tooltip", name="Point 2")).to_be_visible()
+    # Needed otherwise it found two (!) tooltip with name "Point 1"…
+    page.wait_for_timeout(300)
+    expect(page.get_by_role("tooltip", name="Point 1")).to_be_hidden()
+
+    # Map must not be dirty
+    page.get_by_role("button", name="Edit").click()
+    expect(page.locator(".edit-undo")).to_be_disabled()

umap/tests/integration/test_websocket_sync.py

@@ -397,7 +397,7 @@ def test_should_sync_datalayers(new_page, asgi_live_server, tilelayer):
 
     # Make sure this new marker is in Layer 2 for peerB
     # Show features for this layer in the brower.
-    peerB.get_by_role("heading", name="Layer 2").locator(".datalayer-name").click()
+    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(
         1
@@ -534,7 +534,7 @@ def test_create_and_sync_map(new_page, asgi_live_server, tilelayer, login, user)
 
     # 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()
+    expect(peerB.locator("summary").get_by_text("Layer 1")).to_be_visible()
     peerB.get_by_role("button", name="Close").click()
 
     # Save and quit edit mode again

umap/urls.py

@@ -205,6 +205,7 @@ urlpatterns += i18n_patterns(
 )
 urlpatterns += (
     path("stats/", cache_page(60 * 60)(views.stats), name="stats"),
+    path("design_system/", views.design_system, name="design_system"),
     path(
         "favicon.ico",
         cache_control(max_age=60 * 60 * 24, immutable=True, public=True)(

umap/views.py

@@ -668,7 +668,7 @@ class MapDetailMixin(SessionMixin):
             geojson["properties"] = {}
         geojson["properties"].update(properties)
         geojson["properties"]["datalayers"] = self.get_datalayers()
-        context["map_settings"] = json_dumps(geojson, indent=settings.DEBUG)
+        context["map_settings"] = json_dumps(geojson, indent=settings.DEBUG or None)
         self.set_preconnect(geojson["properties"], context)
         return context
 
@@ -1410,6 +1410,13 @@ def stats(request):
     )
 
 
+class DesignSystem(TemplateView):
+    template_name = "umap/design_system.html"
+
+
+design_system = DesignSystem.as_view()
+
+
 @require_GET
 @cache_control(max_age=60 * 60 * 24, immutable=True, public=True)  # One day.
 def webmanifest(request):

{umap_project-3.0.4.dist-info → umap_project-3.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.0.4
+Version: 3.0.6
 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,9 +19,9 @@ 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.8
-Requires-Dist: pillow==11.1.0
-Requires-Dist: psycopg==3.2.6
+Requires-Dist: django==5.2.1
+Requires-Dist: pillow==11.2.1
+Requires-Dist: psycopg==3.2.8
 Requires-Dist: rcssmin==1.2.1
 Requires-Dist: requests==2.32.3
 Requires-Dist: rjsmin==1.2.4
@@ -31,26 +31,26 @@ Provides-Extra: dev
 Requires-Dist: djlint==1.36.4; extra == 'dev'
 Requires-Dist: hatch==1.14.1; extra == 'dev'
 Requires-Dist: isort==6.0.1; extra == 'dev'
-Requires-Dist: mkdocs-material==9.6.10; extra == 'dev'
+Requires-Dist: mkdocs-material==9.6.12; 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.3; extra == 'dev'
-Requires-Dist: ruff==0.11.4; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.15; extra == 'dev'
+Requires-Dist: ruff==0.11.9; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
-Requires-Dist: uvicorn==0.34.0; extra == 'docker'
+Requires-Dist: uvicorn==0.34.2; extra == 'docker'
 Provides-Extra: s3
 Requires-Dist: django-storages[s3]==1.14.6; extra == 's3'
 Provides-Extra: sync
-Requires-Dist: pydantic==2.11.2; extra == 'sync'
+Requires-Dist: pydantic==2.11.4; extra == 'sync'
 Requires-Dist: redis==5.2.1; extra == 'sync'
 Requires-Dist: websockets==15.0.1; extra == 'sync'
 Provides-Extra: test
 Requires-Dist: daphne==4.1.2; extra == 'test'
 Requires-Dist: factory-boy==3.3.3; extra == 'test'
-Requires-Dist: moto[s3]==5.1.3; extra == 'test'
+Requires-Dist: moto[s3]==5.1.4; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
-Requires-Dist: pytest-django==4.10.0; extra == 'test'
+Requires-Dist: pytest-django==4.11.1; 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'