umap-project 3.1.2__py3-none-any.whl → 3.3.0__py3-none-any.whl

umap/tests/integration/test_optimistic_merge.py

@@ -12,13 +12,13 @@ from ..base import DataLayerFactory, MapFactory
 DATALAYER_UPDATE = re.compile(r".*/datalayer/update/.*")
 
 
-def test_created_markers_are_merged(context, live_server, tilelayer):
+def test_created_markers_are_merged(new_page, live_server, tilelayer):
     # Let's create a new map with an empty datalayer
     map = MapFactory(name="server-side merge")
     datalayer = DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
 
     # Now navigate to this map and create marker
-    page_one = context.new_page()
+    page_one = new_page("page 1")
     page_one.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
 
     save_p1 = page_one.get_by_role("button", name="Save")
@@ -52,10 +52,20 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "id": str(datalayer.pk),
         "rank": 0,
         "remoteData": {},
+        "fields": [
+            {
+                "key": "name",
+                "type": "String",
+            },
+            {
+                "key": "description",
+                "type": "Text",
+            },
+        ],
     }
 
     # Now navigate to this map from another tab
-    page_two = context.new_page()
+    page_two = new_page("page 2")
 
     page_two.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
 
@@ -91,6 +101,16 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "id": str(datalayer.pk),
         "rank": 0,
         "remoteData": {},
+        "fields": [
+            {
+                "key": "name",
+                "type": "String",
+            },
+            {
+                "key": "description",
+                "type": "Text",
+            },
+        ],
     }
 
     # Now create another marker in the first tab
@@ -111,6 +131,16 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "id": str(datalayer.pk),
         "rank": 0,
         "remoteData": {},
+        "fields": [
+            {
+                "key": "name",
+                "type": "String",
+            },
+            {
+                "key": "description",
+                "type": "Text",
+            },
+        ],
     }
 
     # And again
@@ -131,6 +161,16 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "id": str(datalayer.pk),
         "rank": 0,
         "remoteData": {},
+        "fields": [
+            {
+                "key": "name",
+                "type": "String",
+            },
+            {
+                "key": "description",
+                "type": "Text",
+            },
+        ],
     }
     expect(marker_pane_p1).to_have_count(4)
 
@@ -153,20 +193,30 @@ def test_created_markers_are_merged(context, live_server, tilelayer):
         "id": str(datalayer.pk),
         "rank": 0,
         "remoteData": {},
+        "fields": [
+            {
+                "key": "name",
+                "type": "String",
+            },
+            {
+                "key": "description",
+                "type": "Text",
+            },
+        ],
     }
     expect(marker_pane_p2).to_have_count(5)
 
 
-def test_empty_datalayers_can_be_merged(context, live_server, tilelayer):
+def test_empty_datalayers_can_be_merged(new_page, live_server, tilelayer):
     # Let's create a new map with an empty datalayer
     map = MapFactory(name="server-side merge")
     DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
 
     # Open two tabs at the same time, on the same empty map
-    page_one = context.new_page()
+    page_one = new_page("page 1")
     page_one.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
 
-    page_two = context.new_page()
+    page_two = new_page("page 2")
     page_two.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
 
     save_p1 = page_one.get_by_role("button", name="Save")
@@ -213,15 +263,15 @@ def test_empty_datalayers_can_be_merged(context, live_server, tilelayer):
     expect(marker_pane_p2).to_have_count(2)
 
 
-def test_same_second_edit_doesnt_conflict(context, live_server, tilelayer):
+def test_same_second_edit_doesnt_conflict(new_page, live_server, tilelayer):
     # Let's create a new map with an empty datalayer
     map = MapFactory(name="server-side merge")
     datalayer = DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
 
     # Open the created map on two pages.
-    page_one = context.new_page()
+    page_one = new_page("page 1")
     page_one.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
-    page_two = context.new_page()
+    page_two = new_page("page 2")
     page_two.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
 
     save_p1 = page_one.get_by_role("button", name="Save")
@@ -280,14 +330,24 @@ def test_same_second_edit_doesnt_conflict(context, live_server, tilelayer):
         "id": str(datalayer.pk),
         "rank": 0,
         "remoteData": {},
+        "fields": [
+            {
+                "key": "name",
+                "type": "String",
+            },
+            {
+                "key": "description",
+                "type": "Text",
+            },
+        ],
     }
 
 
-def test_should_display_alert_on_conflict(context, live_server, datalayer, openmap):
+def test_should_display_alert_on_conflict(new_page, live_server, datalayer, openmap):
     # Open the map on two pages.
-    page_one = context.new_page()
+    page_one = new_page("page 1")
     page_one.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page_two = context.new_page()
+    page_two = new_page("page 2")
     page_two.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
 
     # Change name on page one and save

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

@@ -69,7 +69,9 @@ def test_table_editor(live_server, openmap, datalayer, page):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     page.get_by_role("button", 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("td[data-property=description]").dblclick()
+    page.locator('textarea[name="description"]').fill("nice new description")
+    page.get_by_text("Add a new field").click()
     page.locator("dialog").locator("input").fill("newprop")
     page.locator("dialog").get_by_role("button", name="OK").click()
     page.locator("td").nth(2).dblclick()
@@ -83,6 +85,7 @@ def test_table_editor(live_server, openmap, datalayer, page):
         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"]["description"] == "nice new description"
     assert data["features"][0]["properties"]["newprop"] == "newvalue"
     assert "name" not in data["features"][0]["properties"]
 
@@ -91,7 +94,7 @@ 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("button", 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.get_by_text("Add a new field").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(
@@ -104,7 +107,7 @@ 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("button", 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.get_by_text("Add a new field").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(
@@ -127,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()
@@ -151,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

@@ -1,8 +1,10 @@
 import gzip
 import json
 import os
+from pathlib import Path
 
 from django.conf import settings
+from django.contrib.staticfiles import finders
 from django.core.serializers.json import DjangoJSONEncoder
 from django.urls import URLPattern, URLResolver, get_resolver
 
@@ -185,3 +187,38 @@ def merge_features(reference: list, latest: list, incoming: list):
 def json_dumps(obj, **kwargs):
     """Utility using the Django JSON Encoder when dumping objects"""
     return json.dumps(obj, cls=DjangoJSONEncoder, **kwargs)
+
+
+def collect_pictograms():
+    pictograms = {}
+
+    for name, definition in settings.UMAP_PICTOGRAMS_COLLECTIONS.items():
+        root = Path(definition["path"])
+        subfolder = "pictograms"
+        if not root.is_absolute():
+            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():
+            if path.is_dir():
+                categories[path.name] = []
+                for subpath in path.iterdir():
+                    if subpath.is_dir() or subpath.name.startswith("."):
+                        continue
+                    src = subpath.relative_to(root)
+                    categories[path.name].append(
+                        {
+                            "name": subpath.stem,
+                            "src": f"{settings.STATIC_URL}{src}",
+                        }
+                    )
+        pictograms[name] = {
+            "attribution": definition.get("attribution"),
+            "categories": categories,
+        }
+
+    return pictograms

umap/views.py

@@ -71,6 +71,7 @@ from .models import DataLayer, Licence, Map, Pictogram, Star, Team, TileLayer
 from .utils import (
     ConflictError,
     _urls_for_js,
+    collect_pictograms,
     gzip_file,
     is_ajax,
     json_dumps,
@@ -635,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(
@@ -1389,8 +1392,21 @@ class PictogramJSONList(ListView):
     model = Pictogram
 
     def render_to_response(self, context, **response_kwargs):
-        content = [p.json for p in Pictogram.objects.all()]
-        return simple_json_response(pictogram_list=content)
+        if settings.UMAP_PICTOGRAMS_COLLECTIONS:
+            content = collect_pictograms()
+        else:
+            categories = {}
+            for picto in Pictogram.objects.all():
+                category = picto.category or _("Generic")
+                categories.setdefault(category, [])
+                categories[category].append(picto.json)
+            content = {
+                settings.SITE_NAME: {
+                    "attribution": settings.SITE_NAME,
+                    "categories": categories,
+                }
+            }
+        return simple_json_response(data=content)
 
 
 # ############## #

umap_project-3.3.0.dist-info/METADATA

@@ -0,0 +1,76 @@
+Metadata-Version: 2.4
+Name: umap-project
+Version: 3.3.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>
+License-File: LICENSE
+Keywords: django,geodjango,leaflet,map,openstreetmap
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+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: pillow==11.3.0
+Requires-Dist: psycopg==3.2.9
+Requires-Dist: rcssmin==1.2.1
+Requires-Dist: requests==2.32.4
+Requires-Dist: rjsmin==1.2.4
+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: isort==6.0.1; extra == 'dev'
+Requires-Dist: mkdocs-material==9.6.16; 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.8; extra == 'dev'
+Requires-Dist: vermin==1.6.0; extra == 'dev'
+Provides-Extra: docker
+Requires-Dist: uvicorn==0.35.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: 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.9; 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-xdist<4,>=3.5.0; extra == 'test'
+Requires-Dist: pytest==8.4.1; 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)
+[![Forum](https://img.shields.io/discourse/users?server=https://forum.openstreetmap.fr&label=Forum&logo=discourse)](https://forum.openstreetmap.fr/c/utiliser/umap/29)
+[![Mailing list](https://img.shields.io/badge/Mailing%20list-Subscribe-598dc1?labelColor=white&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH5AICEi0F3iqxoQAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAATBSURBVEjHrZbPb5xHHcY/z+z6R+06cRzWJQGCSgKhxPturSIOwIFSIeCEOHHqMZeqkUoLUiH1rvddlEOFxAn4HxAXblwIoEoICRrlfScFi0PVxo0rQtYBJ3ZiZ3ceDruOYid2kqojzeH9vpr5zPc7zzwzAqjXFySpKinYrgABhA0SgBPgYU+wHZMlp6LomMdseuaZhUq1yglJc5I+a/s48BRo1Pa4pHFwD3zb1qbEJnAbWAU+BD4AroA2JN8Ar9tat30zxs6dPcGNxsIYuAaqpaTLMeZdgPn5xbF+P83YOhyCD4EPpRRmJWrArM00+KCkafA0aEvyNWDNZhVYAXXttCKFFfAV26sxdraG4GYNdAS8YfMtiaWiyP/4qCV79tn2ZL+fJiVPSZqymZaYsTkkMZJS2pDCJvgmcA3oSr33lWWtY+A5yechPGnzKni5LPNf8zG1+fnFkZT6o7bmwWtS/1KwMVADpoqifc3mnK16lrUWPi5wr+fRlPSizaiEoRICpDvAUQgTADG2bwKvgz+fZc2fnDrVDh8V2Gi0lGXNOeBXwFKM+fmUwrwdKiEEtoDDNk9sD4ixvSbpR6DnKpX+mXq9Nfr40OYBm9MS50JIrRjzPwFIZGAFu7IFmgBP3juwKNpXbf8Q+Ibk04+Zad3Wm7a/VK3e+F5RdN4bxj8peVyCYPu27RFb07sniDFftvUK6Pl6vfXyo0CzrPl92z8Gn48xf+Xtt39x11xsnrNZB1KIsd2TSBIHs6yl++Ht9yWfkfzVer314kOgp4Hv2vy8LPPf7P5v+yug67bSUDjqgmd093tnK4r8Q4mXJV5oNFrPPxjaehU4Dn4txrzcw6/mwO9KqR+GK+kCnwFV9sqmKPJV4DXwt7Os+ald0EXbt8oyf70sOzcevO8LRyQfs7VcFB0HgBBYBo7aVPcrZVm2u6BfAl+v18+ODCd8KQR+H+P+hpOSjgPrIbgLDEA27wLTDwM3Gm8crFRuXen1xt+SQi3LmjWJ3/b7Xn+Y6ELwF22t2fovQJifPzsGlcugCYmJfc7lnK3DFy68mcoyX+n3fX1rqxcvXsyvSkxnWfPk3n6+WLE1ByzZDMAphcmybF21XQVN7qHWF2xGUqq+tx17552f3VpaOpcGW5BfAcbr9daXHzTeTjOgI7bKGNtbAKEoOqtDR+kCUw9Q63dAG7bKS5daae9ieknygUajdfJ+sJ4CT4D/ebf0gzL+NEh6C3xslwN9Dbhj+28xtvv7C6+zKRFtvlCvNz+xE8yngbUQvLQDXBTnUkr+O+jYPZmetF2z019izHuP4lpFkf9H4nIIZFnW2lb9iOSnbV0sis76DjBApbJxQfKTQ+hhm8/Z4c8xdm49jk8XRbuwCcCw5GEMNAv+ww4r2SWiH0D4ne0TkpbLcvF/H/1KbH4TKEHJ9pmyzNv7gBeOQhgdmInHgVmJGYnplDwlhRFwFSzQFrBp+3oIWrXpAv+WWC6KfGVYuRPDl2mtLNt/3RM8WOnZgymFGUmzwCHgwFDtB+65Pp8AxobdkoOtChAkG3TH5l9AtP2PEFguik5/XzDAqVNvqFIR0mAa2wohkJKlwUNbkofjhZ2242GQoGSTJPopuR9j575j+H+W9nlG4uJsnAAAAABJRU5ErkJggg==)](https://lists.openstreetmap.org/listinfo/umap)
+
+[![Liberapay](https://img.shields.io/liberapay/patrons/uMap.svg?logo=liberapay)](https://liberapay.com/uMap)
+[![OpenCollective](https://img.shields.io/opencollective/all/uMap?logo=opencollective)](https://opencollective.com/uMap)
+[![GitHub Sponsors](https://img.shields.io/github/sponsors/umap-project?logo=github)](https://github.com/sponsors/umap-project)
+
+# uMap project
+
+uMap lets you create maps with OpenStreetMap layers within minutes and embed them in your site.
+*Because we think that the more OSM will be used, the more OSM will be improved.*
+Built on top of Django and Leaflet.
+
+- Have a look at [our website](https://umap-project.org) for an introduction
+- See [our docs](https://docs.umap-project.org/) for technical information
+- Come [chat with us on matrix](https://matrix.to/#/#umap:matrix.org), start a thread on [the forum](https://forum.openstreetmap.fr/c/utiliser/umap/29) or join [the mailing list](https://lists.openstreetmap.org/listinfo/umap)