umap-project 3.3.6__py3-none-any.whl → 3.4.0b0__py3-none-any.whl

umap/tests/integration/test_import.py

@@ -22,9 +22,8 @@ def test_layers_list_is_updated(live_server, tilelayer, page):
     page.locator("[name=layer-id]").select_option(label="Import in a new layer")
     page.get_by_role("button", name="Manage layers").click()
     page.get_by_role("button", name="Add a layer").click()
-    page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("foobar")
-    page.wait_for_timeout(300)  # Time for the input debounce.
+    page.wait_for_timeout(300)  # Wait for the input throttling.
     page.get_by_role("button", name=f"Import data ({modifier}+I)").click()
     # Should still work
     page.locator("[name=layer-id]").select_option(label="Import in a new layer")
@@ -108,9 +107,7 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
     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()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.json"
     textarea.fill(path.read_text())
@@ -133,9 +130,7 @@ def test_import_invalid_data(tilelayer, live_server, page):
     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()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     textarea.fill("invalid data")
     for format in ["geojson", "csv", "gpx", "kml", "georss", "osm", "umap"]:
@@ -153,9 +148,7 @@ def test_import_kml_from_textarea(tilelayer, live_server, page):
     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()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.kml"
     textarea.fill(path.read_text())
@@ -177,9 +170,7 @@ def test_import_gpx_from_textarea(tilelayer, live_server, page, settings):
     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()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.gpx"
     textarea.fill(path.read_text())
@@ -234,9 +225,7 @@ def test_import_osm_from_textarea(tilelayer, live_server, page):
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
-    button = page.get_by_title("Import data")
-    expect(button).to_be_visible()
-    button.click()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data_osm.json"
     textarea.fill(path.read_text())
@@ -254,9 +243,7 @@ def test_import_csv_from_textarea(tilelayer, live_server, page):
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
-    button = page.get_by_title("Import data")
-    expect(button).to_be_visible()
-    button.click()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
@@ -422,9 +409,7 @@ def test_import_geometry_collection(live_server, page, tilelayer):
     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()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -477,9 +462,7 @@ def test_import_geometry_collection_in_feature(live_server, page, tilelayer):
     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()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -513,9 +496,7 @@ def test_import_multipolygon(live_server, page, tilelayer):
     paths = page.locator("path")
     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()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -545,9 +526,7 @@ def test_import_multipolyline(live_server, page, tilelayer):
     paths = page.locator("path")
     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()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -577,9 +556,7 @@ def test_import_false_multipoint(live_server, page, tilelayer):
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
-    button = page.get_by_title("Import data")
-    expect(button).to_be_visible()
-    button.click()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
@@ -712,7 +689,7 @@ def test_import_csv_with_wkt_geom(tilelayer, live_server, page, settings):
     page.get_by_title("Import data").click()
     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"
+        "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"
     )
     page.locator('select[name="format"]').select_option("csv")
     page.get_by_role("button", name="Import data", exact=True).click()
@@ -1056,9 +1033,7 @@ def test_import_osm_relation(tilelayer, live_server, page):
     paths = page.locator("path")
     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()
+    page.get_by_title("Import data").click()
     textarea = page.locator(".umap-import textarea")
     file_path = Path(__file__).parent.parent / "fixtures/test_import_osm_relation.json"
     textarea.fill(file_path.read_text())
@@ -1076,9 +1051,7 @@ def test_import_georss_from_textarea(tilelayer, live_server, page):
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(0)
     expect(layers).to_have_count(0)
-    button = page.get_by_title("Import data")
-    expect(button).to_be_visible()
-    button.click()
+    page.get_by_title("Import data").click()
     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_remote_data.py

@@ -1,11 +1,15 @@
+import json
+import re
+from pathlib import Path
+
 from playwright.sync_api import expect
 
-from umap.models import Map
+from umap.models import DataLayer, Map
 
 from ..base import DataLayerFactory
 
 
-def test_dynamic_remote_data(page, live_server, tilelayer, map):
+def intercept_remote_data(page):
     data = [
         {
             "type": "FeatureCollection",
@@ -38,6 +42,13 @@ def test_dynamic_remote_data(page, live_server, tilelayer, map):
     def handle(route):
         route.fulfill(json=data.pop())
 
+    # Intercept the route to the proxy
+    page.route("https://remote.org/data.json", handle)
+    page.on("request", lambda *a, **k: print(a, k))
+
+
+def test_dynamic_remote_data(page, live_server, tilelayer, map):
+    intercept_remote_data(page)
     settings = {
         "remoteData": {
             "url": "https://remote.org/data.json",
@@ -55,8 +66,6 @@ def test_dynamic_remote_data(page, live_server, tilelayer, map):
     }
     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()
@@ -77,3 +86,50 @@ def test_dynamic_remote_data(page, live_server, tilelayer, map):
     # Map must not be dirty
     page.get_by_role("button", name="Edit").click()
     expect(page.locator(".edit-undo")).to_be_disabled()
+
+
+def test_create_remote_data_layer(page, live_server, tilelayer, settings):
+    settings.UMAP_ALLOW_ANONYMOUS = True
+    intercept_remote_data(page)
+    page.goto(f"{live_server.url}/en/map/new#6/11.2707/4.3375")
+    page.get_by_role("button", name="Manage layers").click()
+    page.get_by_role("button", name="Add a layer").click()
+    page.get_by_text("Remote data").click()
+    page.locator('.panel input[name="url"]').fill("https://remote.org/data.json")
+    # We have a setTimeout on each input to throttle, so wait for it
+    page.wait_for_timeout(300)
+    page.locator('select[name="format"]').select_option("geojson")
+    # with page.expect_response(re.compile("https://remote.org/data.json")):
+    page.get_by_role("button", name="Verify remote URL").click()
+    expect(page.locator(".leaflet-marker-icon")).to_have_count(1)
+    with page.expect_response(re.compile(".*/datalayer/create/.*")):
+        page.get_by_role("button", name="Save draft", exact=True).click()
+    datalayer = DataLayer.objects.last()
+    data = json.loads(Path(datalayer.geojson.path).read_text())
+    assert data == {
+        "_umap_options": {
+            "browsable": True,
+            "displayOnLoad": True,
+            "editMode": "advanced",
+            "fields": [
+                {
+                    "key": "name",
+                    "type": "String",
+                },
+                {
+                    "key": "description",
+                    "type": "Text",
+                },
+            ],
+            "id": str(datalayer.pk),
+            "inCaption": True,
+            "name": "Layer 1",
+            "rank": 0,
+            "remoteData": {
+                "format": "geojson",
+                "url": "https://remote.org/data.json",
+            },
+        },
+        "features": [],
+        "type": "FeatureCollection",
+    }

umap/tests/integration/test_share.py

@@ -18,10 +18,10 @@ def test_iframe_code_can_contain_datalayers(map, live_server, datalayer, page):
     expect(textarea).not_to_have_text(re.compile(f"datalayers={datalayer.pk}"))
     # Open options
     page.get_by_text("Embed and link options").click()
-    page.get_by_title("Keep current visible layers").click()
+    page.get_by_text("Keep current visible layers").click()
     expect(textarea).to_have_text(re.compile(f"datalayers={datalayer.pk}"))
     # Now click again
-    page.get_by_title("Keep current visible layers").click()
+    page.get_by_text("Keep current visible layers").click()
     expect(textarea).not_to_have_text(re.compile(f"datalayers={datalayer.pk}"))
 
 
@@ -33,8 +33,8 @@ def test_iframe_code_can_contain_feature(map, live_server, datalayer, page):
     expect(textarea).not_to_have_text(re.compile("feature=Here"))
     # Open options
     page.get_by_text("Embed and link options").click()
-    page.get_by_title("Open current feature on load").click()
+    page.get_by_text("Open current feature on load").click()
     expect(textarea).to_have_text(re.compile("feature=Here"))
     # Click again to deactivate it
-    page.get_by_title("Open current feature on load").click()
+    page.get_by_text("Open current feature on load").click()
     expect(textarea).not_to_have_text(re.compile("feature=Here"))

umap/tests/integration/test_tableeditor.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 from playwright.sync_api import expect
 
-from umap.models import DataLayer
+from umap.models import DataLayer, Map
 
 from ..base import DataLayerFactory
 
@@ -79,7 +79,7 @@ def test_table_editor(live_server, openmap, datalayer, page):
     page.wait_for_timeout(300)  # Time for the input debounce.
     page.keyboard.press("Enter")
     page.locator("thead button[data-property=name]").click()
-    page.get_by_role("button", name="Delete this column").click()
+    page.get_by_role("button", name="Delete this field").click()
     page.locator("dialog").get_by_role("button", name="OK").click()
     with page.expect_response(re.compile(r".*/datalayer/update/.*")):
         page.get_by_role("button", name="Save").click()
@@ -116,14 +116,14 @@ def test_cannot_add_property_with_a_dot(live_server, openmap, datalayer, page):
     expect(page.locator("table th button[data-property=name]")).to_have_count(1)
 
 
-def test_rename_property(live_server, openmap, page):
+def test_rename_field(live_server, openmap, page):
     DataLayerFactory(map=openmap, data=DATALAYER_DATA)
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
     page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(page.locator("table th button[data-property=mytype]")).to_have_count(1)
     page.locator("thead button[data-property=mytype]").click()
-    page.get_by_text("Rename this column").click()
+    page.get_by_text("Edit this field").click()
     page.locator("dialog").locator("input").fill("mynewtype")
     page.get_by_role("button", name="OK").click()
     expect(page.locator("table th button[data-property=mynewtype]")).to_have_count(1)
@@ -142,14 +142,14 @@ def test_rename_property(live_server, openmap, page):
     expect(page.locator(".panel.right .umap-field-mytype")).to_be_visible()
 
 
-def test_delete_property(live_server, openmap, page):
+def test_delete_field(live_server, openmap, page):
     DataLayerFactory(map=openmap, data=DATALAYER_DATA)
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
     page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(page.locator("table th button[data-property=mytype]")).to_have_count(1)
     page.locator("thead button[data-property=mytype]").click()
-    page.get_by_text("Delete this column").click()
+    page.get_by_text("Delete this field").click()
     page.get_by_role("button", name="OK").click()
     expect(page.locator("table th button[data-property=mytype]")).to_have_count(0)
 
@@ -202,7 +202,8 @@ def test_filter_and_delete_rows(live_server, openmap, page):
     expect(table.locator("tbody tr")).to_have_count(4)
     expect(page.locator(".leaflet-marker-icon")).to_have_count(4)
     table.locator("thead button[data-property=mytype]").click()
-    page.get_by_role("button", name="Add filter for this column").click()
+    page.get_by_role("button", name="Add filter for this field").click()
+    page.get_by_role("button", name="OK").click()
     expect(panel).to_be_visible()
     panel.get_by_label("even").check()
     table.locator("thead").get_by_role("checkbox").check()
@@ -214,3 +215,26 @@ def test_filter_and_delete_rows(live_server, openmap, page):
     expect(table.get_by_text("Point 3")).to_be_visible()
     expect(table.get_by_text("Point 2")).to_be_hidden()
     expect(table.get_by_text("Point 4")).to_be_hidden()
+
+
+def test_add_filter_on_map_field(live_server, openmap, page):
+    openmap.settings["properties"]["fields"] = [{"key": "mynumber", "type": "Number"}]
+    openmap.save()
+    table = page.locator(".panel.full table")
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
+    page.get_by_role("button", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit properties in a table").click()
+    table.locator("thead button[data-property=mynumber]").click()
+    page.get_by_role("button", name="Add filter for this field").click()
+    expect(page.locator("dialog").get_by_label("Min/Max", exact=True)).to_be_checked()
+    page.locator("dialog").get_by_label("human readable name").fill("My Fun Filter")
+    page.wait_for_timeout(300)  # Throttling…
+    page.get_by_role("button", name="OK").click()
+    expect(page.locator(".panel.left.on").get_by_text("My Fun Filter")).to_be_visible()
+    with page.expect_response(re.compile("./update/settings/.*")):
+        page.get_by_role("button", name="Save").click()
+    saved = Map.objects.first()
+    assert saved.settings["properties"]["filters"] == [
+        {"fieldKey": "mynumber", "widget": "MinMax", "label": "My Fun Filter"}
+    ]

umap/tests/integration/test_websocket_sync.py

@@ -227,7 +227,9 @@ def test_websocket_connection_can_sync_datalayer_properties(
     peerA.locator("body").press("Escape")
 
     peerB.get_by_role("button", name="Manage layers").click()
-    peerB.locator(".panel.right").get_by_role("button", name="Edit").first.click()
+    peerB.locator(".panel.right").get_by_role(
+        "button", name="Edit", exact=True
+    ).first.click()
     expect(peerB.locator('input[name="name"]')).to_have_value("synced layer!")
     expect(peerB.get_by_role("combobox")).to_have_value("Choropleth")
 

umap/tests/test_dashboard.py

@@ -99,3 +99,13 @@ def test_user_dashboard_search_empty(client, map):
     body = response.content.decode()
     assert map.name not in body
     assert "No map found." in body
+
+
+def test_user_dashboard_filter_by_tag(client, map):
+    new_map = MapFactory(name="A map about bicycle", owner=map.owner, tags=["cycling"])
+    client.login(username=map.owner.username, password="123123")
+    response = client.get(f"{reverse('user_dashboard')}?tags=cycling")
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert map.name not in body
+    assert new_map.name in body

umap/urls.py

@@ -124,6 +124,7 @@ i18n_urls += decorated_patterns(
     path("me/teams", views.UserTeams.as_view(), name="user_teams"),
     path("me/templates", views.UserTemplates.as_view(), name="user_templates"),
     path("team/create/", views.TeamNew.as_view(), name="team_new"),
+    path("whoami", views.WhoAmI.as_view(), name="whoami"),
 )
 
 if settings.UMAP_ALLOW_EDIT_PROFILE:

umap/views.py

@@ -585,6 +585,11 @@ class SessionMixin:
         }
 
 
+class WhoAmI(SessionMixin, View):
+    def get(self, request, *args, **kwargs):
+        return simple_json_response(user=self.get_user_data())
+
+
 class FormLessEditMixin:
     http_method_names = [
         "post",

{umap_project-3.3.6.dist-info → umap_project-3.4.0b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.3.6
+Version: 3.4.0b0
 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.2.5
+Requires-Dist: django==5.2.7
 Requires-Dist: pillow==11.3.0
-Requires-Dist: psycopg==3.2.9
+Requires-Dist: psycopg==3.2.10
 Requires-Dist: rcssmin==1.2.1
 Requires-Dist: requests==2.32.5
 Requires-Dist: rjsmin==1.2.4
@@ -29,32 +29,32 @@ Requires-Dist: social-auth-app-django==5.4.3
 Requires-Dist: social-auth-core==4.5.6
 Provides-Extra: dev
 Requires-Dist: djlint==1.36.4; extra == 'dev'
-Requires-Dist: hatch==1.14.1; extra == 'dev'
+Requires-Dist: hatch==1.14.2; extra == 'dev'
 Requires-Dist: isort==6.0.1; extra == 'dev'
-Requires-Dist: mkdocs-material==9.6.18; extra == 'dev'
+Requires-Dist: mkdocs-material==9.6.21; 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.12.11; extra == 'dev'
+Requires-Dist: ruff==0.14.0; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
-Requires-Dist: uvicorn==0.35.0; extra == 'docker'
+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.7; extra == 'sync'
+Requires-Dist: pydantic==2.11.9; extra == 'sync'
 Requires-Dist: redis==6.4.0; extra == 'sync'
 Requires-Dist: websockets==15.0.1; extra == 'sync'
 Provides-Extra: test
 Requires-Dist: daphne==4.2.1; extra == 'test'
 Requires-Dist: factory-boy==3.3.3; extra == 'test'
-Requires-Dist: moto[s3]==5.1.11; extra == 'test'
+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.0; extra == 'test'
-Requires-Dist: pytest-rerunfailures==15.1; extra == 'test'
+Requires-Dist: pytest-playwright==0.7.1; extra == 'test'
+Requires-Dist: pytest-rerunfailures==16.0.1; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
-Requires-Dist: pytest==8.4.1; extra == 'test'
+Requires-Dist: pytest==8.4.2; extra == 'test'
 Description-Content-Type: text/markdown
 
 [![Matrix](https://img.shields.io/matrix/umap:matrix.org?server_fqdn=matrix.org&logo=matrix)](https://matrix.to/#/#umap:matrix.org)