umap-project 3.2.0__py3-none-any.whl → 3.3.1__py3-none-any.whl

umap/tests/integration/test_export_map.py

@@ -38,7 +38,7 @@ DATALAYER_DATA = {
                 "_umap_options": {
                     "color": "OliveDrab",
                 },
-                "name": "test",
+                "name": "test one",
                 "description": "Some description",
             },
             "id": "QwNjg",
@@ -54,7 +54,7 @@ DATALAYER_DATA = {
                     "fill": False,
                     "opacity": 0.6,
                 },
-                "name": "test",
+                "name": "test two",
             },
             "id": "YwMTM",
             "geometry": {
@@ -143,7 +143,7 @@ def test_umap_export(map, live_server, bootstrap, page):
                         "id": "QwNjg",
                         "properties": {
                             "_umap_options": {"color": "OliveDrab"},
-                            "name": "test",
+                            "name": "test one",
                             "description": "Some description",
                         },
                         "type": "Feature",
@@ -164,7 +164,7 @@ def test_umap_export(map, live_server, bootstrap, page):
                         "id": "YwMTM",
                         "properties": {
                             "_umap_options": {"fill": False, "opacity": 0.6},
-                            "name": "test",
+                            "name": "test two",
                         },
                         "type": "Feature",
                     },
@@ -210,8 +210,8 @@ def test_csv_export(map, live_server, bootstrap, page):
         path.read_text()
         == """name,Latitude,Longitude,description
 name poly,53.0072070131872,12.182431646910137,
-test,52.57635,-0.274658,Some description
-test,53.725145179688646,2.9700064980570517,"""
+test one,52.57635,-0.274658,Some description
+test two,53.725145179688646,2.9700064980570517,"""
     )
 
 
@@ -228,7 +228,7 @@ def test_gpx_export(map, live_server, bootstrap, page):
     download.save_as(path)
     assert (
         path.read_text()
-        == """<?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>"""
+        == """<?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 one</name><desc>Some description</desc></wpt><trk><name>test two</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>"""
     )
 
 
@@ -244,7 +244,7 @@ def test_kml_export(map, live_server, bootstrap, page):
     download.save_as(path)
     assert (
         path.read_text()
-        == """<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>"""
+        == """<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 one</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 two</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>"""
     )
 
 
@@ -284,7 +284,7 @@ def test_geojson_export(map, live_server, bootstrap, page):
                 "id": "QwNjg",
                 "properties": {
                     "_umap_options": {"color": "OliveDrab"},
-                    "name": "test",
+                    "name": "test one",
                     "description": "Some description",
                 },
                 "type": "Feature",
@@ -305,10 +305,74 @@ def test_geojson_export(map, live_server, bootstrap, page):
                 "id": "YwMTM",
                 "properties": {
                     "_umap_options": {"fill": False, "opacity": 0.6},
-                    "name": "test",
+                    "name": "test two",
                 },
                 "type": "Feature",
             },
         ],
         "type": "FeatureCollection",
     }
+
+
+def test_export_should_respect_filters(map, live_server, bootstrap, page):
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.locator("summary").filter(has_text="Filters").locator("i").click()
+    page.get_by_role("textbox", name="Search map features…").fill("test")
+    page.wait_for_timeout(300)  # Wait for debounce
+    page.get_by_role("button", name="Share and download").click()
+    button = page.get_by_role("button", name="geojson")
+    expect(button).to_be_visible()
+    with page.expect_download() as download_info:
+        button.click()
+    download = download_info.value
+    assert download.suggested_filename == "test_map.geojson"
+    path = Path("/tmp/") / download.suggested_filename
+    download.save_as(path)
+    assert json.loads(path.read_text()) == {
+        "features": [
+            {
+                "geometry": {"coordinates": [-0.274658, 52.57635], "type": "Point"},
+                "id": "QwNjg",
+                "properties": {
+                    "_umap_options": {"color": "OliveDrab"},
+                    "name": "test one",
+                    "description": "Some description",
+                },
+                "type": "Feature",
+            },
+            {
+                "geometry": {
+                    "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],
+                    ],
+                    "type": "LineString",
+                },
+                "id": "YwMTM",
+                "properties": {
+                    "_umap_options": {"fill": False, "opacity": 0.6},
+                    "name": "test two",
+                },
+                "type": "Feature",
+            },
+        ],
+        "type": "FeatureCollection",
+    }
+
+
+def test_png_export(map, live_server, bootstrap, page):
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?share#6/53.406/6.757")
+    page.get_by_role("button", name="png").click()
+    with page.expect_download() as download_info:
+        page.get_by_role("button", name="Download", exact=True).click()
+    download = download_info.value
+    assert download.suggested_filename == "test_map.png"
+    path = Path("/tmp/") / download.suggested_filename
+    download.save_as(path)
+    # Something has been saved…
+    assert path.read_bytes()

umap/tests/integration/test_map_preview.py

@@ -104,7 +104,7 @@ def test_map_preview_can_load_csv_in_querystring(page, live_server, tilelayer):
 
 def test_map_preview_can_change_styling_from_querystring(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/map/?data={quote(json.dumps(GEOJSON))}&color=DarkRed")
-    markers = page.locator(".leaflet-marker-icon .icon_container")
+    markers = page.locator(".leaflet-marker-icon .icon-container")
     expect(markers).to_have_count(1)
     expect(markers).to_have_css("background-color", "rgb(139, 0, 0)")
 

umap/tests/integration/test_share.py

@@ -27,7 +27,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()
+    page.locator(".icon-container").click()
     textarea = page.locator(".umap-share-iframe")
     expect(textarea).to_be_visible()
     expect(textarea).not_to_have_text(re.compile("feature=Here"))

umap/tests/integration/test_tableeditor.py

@@ -130,13 +130,13 @@ def test_rename_property(live_server, openmap, page):
     expect(page.locator("table th button[data-property=mytype]")).to_have_count(0)
 
     page.locator(".panel.full").get_by_role("button", name="Close").click()
-    page.locator(".leaflet-marker-icon").first.click()
+    page.locator(".leaflet-marker-icon").first.click(button="right")
     page.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     expect(page.locator(".panel.right .umap-field-mynewtype")).to_be_visible()
     expect(page.locator(".panel.right .umap-field-mytype")).to_be_hidden()
     page.locator(".edit-undo").click()
     page.locator(".panel.right").get_by_role("button", name="Close").click()
-    page.locator(".leaflet-marker-icon").first.click()
+    page.locator(".leaflet-marker-icon").first.click(button="right")
     page.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     expect(page.locator(".panel.right .umap-field-mynewtype")).to_be_hidden()
     expect(page.locator(".panel.right .umap-field-mytype")).to_be_visible()
@@ -154,12 +154,12 @@ def test_delete_property(live_server, openmap, page):
     expect(page.locator("table th button[data-property=mytype]")).to_have_count(0)
 
     page.locator(".panel.full").get_by_role("button", name="Close").click()
-    page.locator(".leaflet-marker-icon").first.click()
+    page.locator(".leaflet-marker-icon").first.click(button="right")
     page.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     expect(page.locator(".panel.right .umap-field-mytype")).to_be_hidden()
     page.locator(".edit-undo").click()
     page.locator(".panel.right").get_by_role("button", name="Close").click()
-    page.locator(".leaflet-marker-icon").first.click()
+    page.locator(".leaflet-marker-icon").first.click(button="right")
     page.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     expect(page.locator(".panel.right .umap-field-mytype")).to_be_visible()
 

umap/tests/integration/test_websocket_sync.py

@@ -58,7 +58,7 @@ def test_websocket_connection_can_sync_markers(new_page, asgi_live_server, tilel
     peerA.locator("body").press("Escape")
     peerA.wait_for_timeout(300)
 
-    peerB.locator(".leaflet-marker-icon").first.click()
+    peerB.locator(".leaflet-marker-icon").first.click(button="right")
     peerB.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     expect(peerB.locator('input[name="name"]')).to_have_value("Synced name")
 
@@ -137,7 +137,7 @@ def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilel
     a_polygon_bbox_t1 = a_polygon.bounding_box()
     assert b_polygon_bbox_t1 == a_polygon_bbox_t1
 
-    b_polygon.click()
+    b_polygon.click(button="right")
     peerB.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
 
     edited_vertex = peerB.locator("div:nth-child(6)").first
@@ -151,7 +151,7 @@ def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilel
     assert b_polygon_bbox_t2 == a_polygon_bbox_t2
 
     # Move the polygon on peer B and check it moved also on peer A
-    b_polygon.click()
+    b_polygon.click(button="right")
     peerB.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
 
     b_polygon.drag_to(b_map_el, target_position={"x": 400, "y": 400})
@@ -340,7 +340,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
     expect(b_polygons).to_have_count(1)
 
     # Verify marker properties
-    peerB.locator(".leaflet-marker-icon").first.click()
+    peerB.locator(".leaflet-marker-icon").first.click(button="right")
     peerB.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     expect(peerB.locator('input[name="name"]')).to_have_value("First marker")
 

umap/utils.py

@@ -196,7 +196,11 @@ def collect_pictograms():
         root = Path(definition["path"])
         subfolder = "pictograms"
         if not root.is_absolute():
-            root = Path(finders.find(root).removesuffix(definition["path"]))
+            found_path = finders.find(root)
+            if not found_path:
+                print(f"Cannot find {root} in STATIFILES_DIRS")
+                continue
+            root = Path(found_path.removesuffix(definition["path"].rstrip("/")))
             subfolder = definition["path"]
         categories = {}
         for path in (root / subfolder).iterdir():

umap/views.py

@@ -636,6 +636,8 @@ class MapDetailMixin(SessionMixin):
             "defaultLabelKeys": settings.UMAP_LABEL_KEYS,
             "help_links": settings.UMAP_HELP_LINKS,
         }
+        if settings.OPENROUTESERVICE_APIKEY:
+            properties["ORSAPIKey"] = settings.OPENROUTESERVICE_APIKEY
         created = bool(getattr(self, "object", None))
         if created:
             properties.update(

{umap_project-3.2.0.dist-info → umap_project-3.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.2.0
+Version: 3.3.1
 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,11 +19,11 @@ 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.4
+Requires-Dist: django==5.2.5
 Requires-Dist: pillow==11.3.0
 Requires-Dist: psycopg==3.2.9
 Requires-Dist: rcssmin==1.2.1
-Requires-Dist: requests==2.32.4
+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
@@ -31,11 +31,11 @@ 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.15; extra == 'dev'
+Requires-Dist: mkdocs-material==9.6.18; 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; extra == 'dev'
-Requires-Dist: ruff==0.12.2; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.16.1; extra == 'dev'
+Requires-Dist: ruff==0.12.10; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uvicorn==0.35.0; extra == 'docker'
@@ -43,12 +43,12 @@ 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: redis==6.2.0; 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.0; 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.6; extra == 'test'
+Requires-Dist: moto[s3]==5.1.10; 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'