umap-project 2.4.1__py3-none-any.whl → 2.5.0__py3-none-any.whl

umap/tests/integration/test_edit_datalayer.py

@@ -67,6 +67,7 @@ def test_cancel_deleting_datalayer_should_restore(
     expect(page.get_by_text("test datalayer")).to_be_hidden()
     page.once("dialog", lambda dialog: dialog.accept())
     page.get_by_role("button", name="Cancel edits").click()
+    page.locator("dialog").get_by_role("button", name="OK").click()
     expect(markers).to_have_count(1)
     expect(page.locator(".umap-browser").get_by_text("test datalayer")).to_be_visible()
 

umap/tests/integration/test_edit_polygon.py

@@ -117,8 +117,8 @@ def test_should_reset_style_on_cancel(live_server, openmap, page, bootstrap):
     expect(page.locator(".leaflet-overlay-pane path[fill='GoldenRod']")).to_have_count(
         1
     )
-    page.once("dialog", lambda dialog: dialog.accept())
     page.get_by_role("button", name="Cancel edits").click()
+    page.locator("dialog").get_by_role("button", name="OK").click()
     expect(page.locator(".leaflet-overlay-pane path[fill='DarkBlue']")).to_have_count(1)
 
 

umap/tests/integration/test_export_map.py

@@ -218,8 +218,7 @@ def test_gpx_export(map, live_server, bootstrap, page):
     download.save_as(path)
     assert (
         path.read_text()
-        == """<gpx xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd" version="1.1" creator="togpx"><metadata/><wpt lat="52.57635" lon="-0.274658"><name>test</name><desc>name=test
-description=Some description</desc></wpt><trk><name>name poly</name><desc>name=name poly</desc><trkseg><trkpt lat="53.585984" lon="11.25"/><trkpt lat="52.975108" lon="10.151367"/><trkpt lat="52.167194" lon="12.689209"/><trkpt lat="53.199452" lon="14.084473"/><trkpt lat="53.618579" lon="12.634277"/><trkpt lat="53.585984" lon="11.25"/><trkpt lat="53.585984" lon="11.25"/></trkseg></trk><trk><name>test</name><desc>name=test</desc><trkseg><trkpt lat="54.476422" lon="-0.571289"/><trkpt lat="54.610255" lon="0.439453"/><trkpt lat="53.448807" lon="1.724854"/><trkpt lat="53.988395" lon="4.163818"/><trkpt lat="53.533778" lon="5.306396"/><trkpt lat="53.709714" lon="6.591797"/><trkpt lat="53.350551" lon="7.042236"/></trkseg></trk></gpx>"""
+        == """<?xml version="1.0" encoding="UTF-8"?><gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="@dwayneparton/geojson-to-gpx"><wpt lat="52.57635" lon="-0.274658"><name>test</name><desc>Some description</desc></wpt><trk><name>test</name><trkseg><trkpt lat="54.476422" lon="-0.571289"/><trkpt lat="54.610255" lon="0.439453"/><trkpt lat="53.448807" lon="1.724854"/><trkpt lat="53.988395" lon="4.163818"/><trkpt lat="53.533778" lon="5.306396"/><trkpt lat="53.709714" lon="6.591797"/><trkpt lat="53.350551" lon="7.042236"/></trkseg></trk></gpx>"""
     )
 
 
@@ -235,7 +234,7 @@ def test_kml_export(map, live_server, bootstrap, page):
     download.save_as(path)
     assert (
         path.read_text()
-        == """<?xml version="1.0" encoding="UTF-8"?><kml xmlns="http://www.opengis.net/kml/2.2"><Document><Placemark><name>name poly</name><ExtendedData><Data name="name"><value>name poly</value></Data></ExtendedData><Polygon><outerBoundaryIs><LinearRing><coordinates>11.25,53.585984 10.151367,52.975108 12.689209,52.167194 14.084473,53.199452 12.634277,53.618579 11.25,53.585984 11.25,53.585984</coordinates></LinearRing></outerBoundaryIs></Polygon></Placemark><Placemark><name>test</name><description>Some description</description><ExtendedData><Data name="_umap_options"><value>[object Object]</value></Data><Data name="name"><value>test</value></Data><Data name="description"><value>Some description</value></Data></ExtendedData><Point><coordinates>-0.274658,52.57635</coordinates></Point></Placemark><Placemark><name>test</name><ExtendedData><Data name="_umap_options"><value>[object Object]</value></Data><Data name="name"><value>test</value></Data></ExtendedData><LineString><coordinates>-0.571289,54.476422 0.439453,54.610255 1.724854,53.448807 4.163818,53.988395 5.306396,53.533778 6.591797,53.709714 7.042236,53.350551</coordinates></LineString></Placemark></Document></kml>"""
+        == """<kml xmlns="http://www.opengis.net/kml/2.2"><Document>\n<Placemark id="gyNzM">\n<name>name poly</name><ExtendedData></ExtendedData>\n  <Polygon>\n<outerBoundaryIs>\n  <LinearRing><coordinates>11.25,53.585984\n10.151367,52.975108\n12.689209,52.167194\n14.084473,53.199452\n12.634277,53.618579\n11.25,53.585984\n11.25,53.585984</coordinates></LinearRing></outerBoundaryIs></Polygon></Placemark>\n<Placemark id="QwNjg">\n<name>test</name><description>Some description</description><ExtendedData>\n  <Data name="_umap_options"><value>{"color":"OliveDrab"}</value></Data></ExtendedData>\n  <Point><coordinates>-0.274658,52.57635</coordinates></Point></Placemark>\n<Placemark id="YwMTM">\n<name>test</name><ExtendedData>\n  <Data name="_umap_options"><value>{"fill":false,"opacity":0.6}</value></Data></ExtendedData>\n  <LineString><coordinates>-0.571289,54.476422\n0.439453,54.610255\n1.724854,53.448807\n4.163818,53.988395\n5.306396,53.533778\n6.591797,53.709714\n7.042236,53.350551</coordinates></LineString></Placemark></Document></kml>"""
     )
 
 

umap/tests/integration/test_import.py

@@ -585,3 +585,25 @@ def test_import_from_datasets(page, live_server, tilelayer, settings):
     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()
+
+
+def test_import_osm_relation(tilelayer, live_server, page):
+    # Overpass query used for this data:
+    # [out:json][timeout:25];(relation(id:15612202)%20;);out%20geom;
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Open browser").click()
+    layers = page.locator(".umap-browser .datalayer")
+    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()
+    textarea = page.locator(".umap-upload textarea")
+    file_path = Path(__file__).parent.parent / "fixtures/test_import_osm_relation.json"
+    textarea.fill(file_path.read_text())
+    page.locator('select[name="format"]').select_option("osm")
+    page.get_by_role("button", name="Import data", exact=True).click()
+    # A layer and one path has been created
+    expect(layers).to_have_count(1)
+    expect(paths).to_have_count(1)

umap/tests/integration/test_map_preview.py

@@ -21,6 +21,21 @@ GEOJSON = {
         }
     ],
 }
+GEOJSON2 = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "name": "Montmorency Falls",
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [-71.14, 46.89],
+            },
+        }
+    ],
+}
 CSV = "name,latitude,longitude\nNiagara Falls,43.08,-79.04"
 
 
@@ -43,10 +58,29 @@ 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 handle(route):
+        if "2" in route.request.url:
+            route.fulfill(json=GEOJSON2)
+        else:
+            route.fulfill(json=GEOJSON)
+
+    # Intercept the route to the proxy
+    page.route("*/**/ajax-proxy/**", handle)
+
+    page.goto(
+        (
+            f"{live_server.url}/map/?"
+            "dataUrl=http://some.org/geo.json&dataUrl=http://some.org/geo2.json"
+        )
+    )
+    markers = page.locator(".leaflet-marker-icon")
+    expect(markers).to_have_count(2)
+
+
 def test_map_preview_can_load_remote_csv(page, live_server, tilelayer):
     def handle(route):
-        csv = """name,latitude,longitude\nNiagara Falls,43.08,-79.04"""
-        route.fulfill(body=csv)
+        route.fulfill(body=CSV)
 
     # Intercept the route to the proxy
     page.route("*/**/ajax-proxy/**", handle)

umap/tests/integration/test_tableeditor.py

@@ -2,22 +2,176 @@ import json
 import re
 from pathlib import Path
 
+from playwright.sync_api import expect
+
 from umap.models import DataLayer
 
+from ..base import DataLayerFactory
+
+DATALAYER_DATA = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "mytype": "even",
+                "name": "Point 2",
+                "mynumber": 10,
+                "myboolean": True,
+                "mydate": "2024/04/14 12:19:17",
+            },
+            "geometry": {"type": "Point", "coordinates": [0.065918, 48.385442]},
+            "id": "poin2",  # Must be exactly 5 chars long so the frontend will keep it
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "mytype": "odd",
+                "name": "Point 1",
+                "mynumber": 12,
+                "myboolean": False,
+                "mydate": "2024/03/13 12:20:20",
+            },
+            "geometry": {"type": "Point", "coordinates": [3.55957, 49.767074]},
+            "id": "poin1",
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "mytype": "even",
+                "name": "Point 4",
+                "mynumber": 10,
+                "myboolean": "true",
+                "mydate": "2024/08/18 13:14:15",
+            },
+            "geometry": {"type": "Point", "coordinates": [0.856934, 45.290347]},
+            "id": "poin4",
+        },
+        {
+            "type": "Feature",
+            "properties": {
+                "mytype": "odd",
+                "name": "Point 3",
+                "mynumber": 14,
+                "mydate": "2024-04-14T10:19:17.000Z",
+            },
+            "geometry": {"type": "Point", "coordinates": [4.372559, 47.945786]},
+            "id": "poin3",
+        },
+    ],
+    "_umap_options": {
+        "name": "Calque 2",
+    },
+}
+
 
 def test_table_editor(live_server, openmap, datalayer, page):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     page.get_by_role("link", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
-    page.once("dialog", lambda dialog: dialog.accept(prompt_text="newprop"))
     page.get_by_text("Add a new property").click()
+    page.locator("dialog").locator("input").fill("newprop")
+    page.locator("dialog").get_by_role("button", name="OK").click()
+    page.locator("td").nth(2).dblclick()
     page.locator('input[name="newprop"]').fill("newvalue")
-    page.once("dialog", lambda dialog: dialog.accept())
-    page.hover(".umap-table-editor .tcell")
-    page.get_by_title("Delete this property on all").first.click()
+    page.keyboard.press("Enter")
+    page.locator("thead button[data-property=name]").click()
+    page.get_by_role("button", name="Delete this column").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()
     saved = DataLayer.objects.last()
     data = json.loads(Path(saved.geojson.path).read_text())
     assert data["features"][0]["properties"]["newprop"] == "newvalue"
     assert "name" not in data["features"][0]["properties"]
+
+
+def test_cannot_add_existing_property_name(live_server, openmap, datalayer, page):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit properties in a table").click()
+    page.get_by_text("Add a new property").click()
+    page.locator("dialog").locator("input").fill("name")
+    page.get_by_role("button", name="OK").click()
+    expect(page.get_by_role("dialog")).to_contain_text(
+        "This name already exists: “name”"
+    )
+    expect(page.locator("table th button[data-property=name]")).to_have_count(1)
+
+
+def test_cannot_add_property_with_a_dot(live_server, openmap, datalayer, page):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit properties in a table").click()
+    page.get_by_text("Add a new property").click()
+    page.locator("dialog").locator("input").fill("foo.bar")
+    page.get_by_role("button", name="OK").click()
+    expect(page.get_by_role("dialog")).to_contain_text(
+        "Name “foo.bar” should not contain a dot."
+    )
+    expect(page.locator("table th button[data-property=name]")).to_have_count(1)
+
+
+def test_rename_property(live_server, openmap, datalayer, page):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit properties in a table").click()
+    expect(page.locator("table th button[data-property=name]")).to_have_count(1)
+    page.locator("thead button[data-property=name]").click()
+    page.get_by_text("Rename this column").click()
+    page.locator("dialog").locator("input").fill("newname")
+    page.get_by_role("button", name="OK").click()
+    expect(page.locator("table th button[data-property=newname]")).to_have_count(1)
+    expect(page.locator("table th button[data-property=name]")).to_have_count(0)
+
+
+def test_delete_selected_rows(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("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit properties in a table").click()
+    expect(page.locator("tbody tr")).to_have_count(4)
+    expect(page.locator(".leaflet-marker-icon")).to_have_count(4)
+    page.locator("tr[data-feature=poin2]").get_by_role("checkbox").check()
+    page.get_by_role("button", name="Delete selected rows").click()
+    page.get_by_role("button", name="OK").click()
+    expect(page.locator("tbody tr")).to_have_count(3)
+    expect(page.locator(".leaflet-marker-icon")).to_have_count(3)
+
+
+def test_delete_all_rows(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("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit properties in a table").click()
+    expect(page.locator("tbody tr")).to_have_count(4)
+    expect(page.locator(".leaflet-marker-icon")).to_have_count(4)
+    page.locator("thead").get_by_role("checkbox").check()
+    page.get_by_role("button", name="Delete selected rows").click()
+    page.get_by_role("button", name="OK").click()
+    expect(page.locator("tbody tr")).to_have_count(0)
+    expect(page.locator(".leaflet-marker-icon")).to_have_count(0)
+
+
+def test_filter_and_delete_rows(live_server, openmap, page):
+    DataLayerFactory(map=openmap, data=DATALAYER_DATA)
+    panel = page.locator(".panel.left.on")
+    table = page.locator(".panel.full table")
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel").get_by_title("Edit properties in a table").click()
+    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()
+    expect(panel).to_be_visible()
+    panel.get_by_label("even").check()
+    table.locator("thead").get_by_role("checkbox").check()
+    page.get_by_role("button", name="Delete selected rows").click()
+    page.get_by_role("button", name="OK").click()
+    expect(table.locator("tbody tr")).to_have_count(2)
+    expect(page.locator(".leaflet-marker-icon")).to_have_count(2)
+    expect(table.get_by_text("Point 1")).to_be_visible()
+    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()

umap/tests/integration/test_websocket_sync.py

@@ -69,8 +69,8 @@ def test_websocket_connection_can_sync_markers(
 
     # Delete a marker from peer A and check it's been deleted on peer B
     a_first_marker.click(button="right")
-    peerA.on("dialog", lambda dialog: dialog.accept())
     peerA.get_by_role("link", name="Delete this feature").click()
+    peerA.locator("dialog").get_by_role("button", name="OK").click()
     expect(a_marker_pane).to_have_count(1)
     expect(b_marker_pane).to_have_count(1)
 
@@ -153,8 +153,8 @@ def test_websocket_connection_can_sync_polygons(
 
     # Delete a polygon from peer A and check it's been deleted on peer B
     a_polygon.click(button="right")
-    peerA.on("dialog", lambda dialog: dialog.accept())
     peerA.get_by_role("link", name="Delete this feature").click()
+    peerA.locator("dialog").get_by_role("button", name="OK").click()
     expect(a_polygons).to_have_count(0)
     expect(b_polygons).to_have_count(0)
 

umap/tests/test_views.py

@@ -122,7 +122,7 @@ def test_valid_proxy_request_with_invalid_ttl(client):
 
 def test_invalid_proxy_url_should_return_400(client):
     url = reverse("ajax-proxy")
-    params = {"url": "http://example.org/a space is invalid"}
+    params = {"url": "http://example.org/a\ncarriage\r\nreturn is invalid"}
     headers = {
         "HTTP_X_REQUESTED_WITH": "XMLHttpRequest",
         "HTTP_REFERER": settings.SITE_URL,
@@ -144,7 +144,7 @@ def test_valid_proxy_request_with_x_accel_redirect(client, settings):
     assert "X-Accel-Redirect" in response.headers
     assert (
         response["X-Accel-Redirect"]
-        == "/proxy/http%3A//example.org%3Ffoo%3Dbar%26bar%3Dfoo"
+        == "/proxy/http%3A%2F%2Fexample.org%3Ffoo%3Dbar%26bar%3Dfoo"
     )
     assert "X-Accel-Expires" in response.headers
     assert response["X-Accel-Expires"] == "300"

umap/views.py

@@ -11,7 +11,7 @@ from io import BytesIO
 from pathlib import Path
 from smtplib import SMTPException
 from urllib.error import HTTPError, URLError
-from urllib.parse import quote, quote_plus, urlparse
+from urllib.parse import quote_plus, urlparse
 from urllib.request import Request, build_opener
 
 from django.conf import settings
@@ -403,13 +403,14 @@ class AjaxProxy(View):
             ttl = None
         if getattr(settings, "UMAP_XSENDFILE_HEADER", None):
             response = HttpResponse()
-            response[settings.UMAP_XSENDFILE_HEADER] = f"/proxy/{quote(url)}"
+            response[settings.UMAP_XSENDFILE_HEADER] = f"/proxy/{quote_plus(url)}"
             if ttl:
                 response["X-Accel-Expires"] = ttl
             return response
 
         # You should not use this in production (use Nginx or so)
         headers = {"User-Agent": "uMapProxy +http://wiki.openstreetmap.org/wiki/UMap"}
+        url = url.replace(" ", "+")
         request = Request(url, headers=headers)
         opener = build_opener()
         try:

{umap_project-2.4.1.dist-info → umap_project-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.4.1
+Version: 2.5.0
 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,10 +19,10 @@ Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.0.6
-Requires-Dist: pillow==10.3.0
-Requires-Dist: psycopg==3.1.19
-Requires-Dist: pydantic==2.7.4
+Requires-Dist: django==5.0.7
+Requires-Dist: pillow==10.4.0
+Requires-Dist: psycopg==3.2.1
+Requires-Dist: pydantic==2.8.2
 Requires-Dist: rcssmin==1.1.2
 Requires-Dist: requests==2.32.3
 Requires-Dist: rjsmin==1.2.2
@@ -33,11 +33,11 @@ Provides-Extra: dev
 Requires-Dist: djlint==1.34.1; extra == 'dev'
 Requires-Dist: hatch==1.12.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.27; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.28; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
 Requires-Dist: mkdocs==1.6.0; extra == 'dev'
 Requires-Dist: pymdown-extensions==10.8.1; extra == 'dev'
-Requires-Dist: ruff==0.4.9; extra == 'dev'
+Requires-Dist: ruff==0.5.1; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.26; extra == 'docker'
@@ -45,7 +45,7 @@ Provides-Extra: test
 Requires-Dist: factory-boy==3.2.1; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.8.0; extra == 'test'
-Requires-Dist: pytest-playwright==0.5.0; extra == 'test'
+Requires-Dist: pytest-playwright==0.5.1; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==8.2.2; extra == 'test'
 Description-Content-Type: text/markdown