umap-project 3.4.0b3__py3-none-any.whl → 3.6.0__py3-none-any.whl

umap/tests/integration/test_map.py

@@ -147,16 +147,16 @@ def test_default_view_latest_with_polygon(map, live_server, page):
     expect(layers).to_have_count(1)
 
 
-def test_default_view_locate(browser, live_server, map):
+def test_default_view_locate(browser, live_server, map, new_page):
     context = browser.new_context(
         geolocation={"longitude": 8.52967, "latitude": 39.16267},
         permissions=["geolocation"],
     )
     map.settings["properties"]["defaultView"] = "locate"
     map.save()
-    page = context.new_page()
+    page = new_page(custom_context=context)
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    expect(page).to_have_url(re.compile(r".*#18/39\.16267/8\.52967"))
+    expect(page).to_have_url(re.compile(r".*#18/39\.162670/8\.529670"))
 
 
 def test_remote_layer_should_not_be_used_as_datalayer_for_created_features(

umap/tests/integration/test_optimistic_merge.py

@@ -3,6 +3,7 @@ import re
 from pathlib import Path
 from time import sleep
 
+import pytest
 from playwright.sync_api import expect
 
 from umap.models import DataLayer
@@ -12,7 +13,12 @@ from ..base import DataLayerFactory, MapFactory
 DATALAYER_UPDATE = re.compile(r".*/datalayer/update/.*")
 
 
-def test_created_markers_are_merged(new_page, live_server, tilelayer):
+# Test with in memory upload AND streamed upload
+@pytest.mark.parametrize("upload_limit", (2621440, 0))
+def test_created_markers_are_merged(
+    new_page, live_server, tilelayer, settings, upload_limit
+):
+    settings.FILE_UPLOAD_MAX_MEMORY_SIZE = upload_limit
     # 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={})

umap/tests/integration/test_owned_map.py

@@ -183,7 +183,7 @@ def test_can_change_perms_after_create(tilelayer, live_server, login, user):
     page.goto(f"{live_server.url}/en/map/new")
     # Create a layer
     page.get_by_title("Manage layers").click()
-    page.get_by_title("Add a layer").click()
+    page.get_by_role("button", name="Add a layer").click()
     page.locator("input[name=name]").fill("Layer 1")
     expect(
         page.get_by_role("button", name="Visibility: Draft (private)")
@@ -217,7 +217,7 @@ def test_can_change_owner(map, live_server, login, user):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
     edit_permissions = page.get_by_title("Update permissions and editors")
     edit_permissions.click()
-    close = page.locator(".umap-field-owner .close")
+    close = page.locator(".umap-field-owner .icon-close")
     close.click()
     input = page.locator("input.edit-owner")
     with page.expect_response(re.compile(r".*/agnocomplete/.*")):

umap/tests/integration/test_popup.py

@@ -42,3 +42,34 @@ def test_openstreetmap_popup(live_server, map, page):
         "src",
         "https://api.panoramax.xyz/api/pictures/d811b398-d930-4cf8-95a2-0c29c34d9fca/sd.jpg",
     )
+
+
+def test_table_popup(live_server, map, page):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "geometry": {"type": "Point", "coordinates": [2.49, 48.79]},
+                "properties": {
+                    "url": "https://restaurant.org",
+                    "formatted": "with **bold**",
+                },
+                "id": "AzMjk",
+            },
+        ],
+        "_umap_options": {
+            "popupTemplate": "Table",
+            "fields": [
+                {"key": "url", "type": "String"},
+                {"key": "formatted", "type": "Text"},
+            ],
+        },
+    }
+    DataLayerFactory(map=map, data=data)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#18/48.79/2.49")
+    page.locator(".leaflet-marker-icon").click()
+    expect(page.get_by_role("link", name="https://restaurant.org")).to_be_visible()
+    expect(page.get_by_role("cell", name="with bold").locator("strong")).to_have_text(
+        "bold"
+    )

umap/tests/integration/test_remote_data.py

@@ -16,7 +16,7 @@ def intercept_remote_data(page):
             "features": [
                 {
                     "type": "Feature",
-                    "properties": {"name": "Point 2"},
+                    "properties": {"name": "Point 2", "foobar": "bla"},
                     "geometry": {
                         "type": "Point",
                         "coordinates": [4.3375, 11.2707],
@@ -29,7 +29,7 @@ def intercept_remote_data(page):
             "features": [
                 {
                     "type": "Feature",
-                    "properties": {"name": "Point 1"},
+                    "properties": {"name": "Point 1", "foobar": "baz"},
                     "geometry": {
                         "type": "Point",
                         "coordinates": [4.3375, 12.2707],
@@ -44,7 +44,6 @@ def intercept_remote_data(page):
 
     # 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):
@@ -104,6 +103,7 @@ def test_create_remote_data_layer(page, live_server, tilelayer, settings):
     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()
+    assert DataLayer.objects.count() == 1
     datalayer = DataLayer.objects.last()
     data = json.loads(Path(datalayer.geojson.path).read_text())
     assert data == {
@@ -117,8 +117,8 @@ def test_create_remote_data_layer(page, live_server, tilelayer, settings):
                     "type": "String",
                 },
                 {
-                    "key": "description",
-                    "type": "Text",
+                    "key": "foobar",
+                    "type": "String",
                 },
             ],
             "id": str(datalayer.pk),

umap/tests/integration/test_search.py

@@ -0,0 +1,41 @@
+from playwright.sync_api import expect
+
+
+def test_reverse_search(live_server, page, tilelayer):
+    photon_response = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {
+                    "osm_type": "N",
+                    "osm_id": 5055853416,
+                    "osm_key": "place",
+                    "osm_value": "locality",
+                    "type": "locality",
+                    "postcode": "10200",
+                    "countrycode": "FR",
+                    "name": "Le Haut Sentier",
+                    "country": "France",
+                    "city": "Thors",
+                    "state": "Grand Est",
+                    "county": "Aube",
+                },
+                "geometry": {"type": "Point", "coordinates": [4.7995256, 48.2985251]},
+            }
+        ],
+    }
+    page.goto(f"{live_server.url}/en/map/new")
+
+    def handle_search(route):
+        route.fulfill(json=photon_response)
+
+    # Intercept the route
+    page.route(
+        "https://photon.komoot.io/reverse/?limit=1&lat=48.3&lon=4.8",
+        handle_search,
+    )
+    page.get_by_role("button", name="Search location").click()
+    page.get_by_role("searchbox", name="Type a place name or").fill("48.3 4.8")
+    expect(page.get_by_text("48.3 4.8")).to_be_visible()
+    expect(page.get_by_text("Le Haut Sentier")).to_be_visible()

umap/tests/integration/test_share.py

@@ -8,7 +8,7 @@ pytestmark = pytest.mark.django_db
 
 def test_iframe_code_can_contain_datalayers(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
-    textarea = page.locator(".umap-share-iframe")
+    textarea = page.get_by_label("Iframe")
     expect(textarea).to_be_visible()
     expect(textarea).to_have_text(re.compile('src="'))
     expect(textarea).to_have_text(re.compile('href="'))
@@ -28,7 +28,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()
-    textarea = page.locator(".umap-share-iframe")
+    textarea = page.get_by_label("Iframe")
     expect(textarea).to_be_visible()
     expect(textarea).not_to_have_text(re.compile("feature=Here"))
     # Open options

umap/tests/integration/test_team.py

@@ -39,7 +39,7 @@ def test_can_remove_user_from_team(live_server, map, user, user2, team, login):
         page.get_by_role("link", name="My teams").click()
     with page.expect_navigation():
         page.get_by_role("link", name="Edit").click()
-    page.locator("li").filter(has_text="Averell").locator(".close").click()
+    page.locator("li").filter(has_text="Averell").locator(".icon-close").click()
     page.get_by_role("button", name="Save").click()
     assert Team.objects.count() == 1
     modified = Team.objects.first()

umap/tests/integration/test_websocket_sync.py

@@ -53,6 +53,7 @@ def test_websocket_connection_can_sync_markers(
 
     a_map_el = peerA.locator("#map")
     a_map_el.click(position={"x": 220, "y": 220})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     expect(a_marker_pane).to_have_count(1)
     expect(b_marker_pane).to_have_count(1)
     # Peer B should not be in state dirty
@@ -330,6 +331,7 @@ def test_websocket_connection_can_sync_late_joining_peer(
 
     a_map_el = peerA.locator("#map")
     a_map_el.click(position={"x": 220, "y": 220})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     peerA.locator("body").type("First marker")
     peerA.locator("body").press("Escape")
     peerA.wait_for_timeout(300)
@@ -555,8 +557,10 @@ def test_create_and_sync_map(
 
     # Add a marker from peer A
     peerA.get_by_role("button", name="Edit").click()
+    peerA.wait_for_timeout(300)  # Time for the animation to finish
     peerA.get_by_title("Draw a marker").click()
     peerA.locator("#map").click(position={"x": 220, "y": 220})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     expect(markersA).to_have_count(1)
     expect(markersB).to_have_count(1)
 
@@ -582,6 +586,7 @@ def test_create_and_sync_map(
     # Add a marker from peer B
     peerB.get_by_title("Draw a marker").click()
     peerB.locator("#map").click(position={"x": 200, "y": 200})
+    peerA.wait_for_timeout(300)  # Time for the panel animation to finish
     expect(markersB).to_have_count(2)
     expect(markersA).to_have_count(1)
     with peerB.expect_response(re.compile("./datalayer/update/.*")):
@@ -607,7 +612,7 @@ def test_saved_datalayer_are_not_duplicated(
     wait_for_loaded(peerA)
     # Create a new datalayer
     peerA.get_by_title("Manage layers").click()
-    peerA.get_by_title("Add a layer").click()
+    peerA.get_by_role("button", name="Add a layer").click()
     peerA.locator("#map").click(position={"x": 220, "y": 220})
     # Save layer to the server, so now the datalayer exist on the server AND
     # is still in the live operations of peer A

umap/tests/test_search_maps_command.py

@@ -0,0 +1,44 @@
+import pytest
+from django.core.management import call_command
+
+from umap.models import Map
+
+from .base import MapFactory
+
+pytestmark = pytest.mark.django_db
+
+
+def test_search_and_delete_maps(map, team):
+    target = MapFactory(name="find me")
+    assert Map.objects.filter(share_status=Map.DELETED).count() == 0
+
+    call_command("search_maps", "find", "--delete", "--dry-run", "--no-input")
+    assert Map.objects.filter(share_status=Map.DELETED).count() == 0
+
+    call_command("search_maps", "find", "--delete", "--no-input")
+    assert Map.objects.filter(share_status=Map.DELETED).count() == 1
+
+    assert not Map.public.filter(pk=target.pk)
+
+    call_command("search_maps", "find", "--restore", "--no-input")
+    assert Map.objects.filter(share_status=Map.DELETED).count() == 0
+
+    assert Map.objects.get(pk=target.pk).share_status == Map.DRAFT
+
+
+def test_search_and_block_maps(map, team):
+    target = MapFactory(name="find me")
+    assert Map.objects.filter(share_status=Map.BLOCKED).count() == 0
+
+    call_command("search_maps", "find", "--block", "--dry-run", "--no-input")
+    assert Map.objects.filter(share_status=Map.BLOCKED).count() == 0
+
+    call_command("search_maps", "find", "--block", "--no-input")
+    assert Map.objects.filter(share_status=Map.BLOCKED).count() == 1
+
+    assert not Map.public.filter(pk=target.pk)
+
+    call_command("search_maps", "find", "--restore", "--no-input")
+    assert Map.objects.filter(share_status=Map.BLOCKED).count() == 0
+
+    assert Map.objects.get(pk=target.pk).share_status == Map.DRAFT

umap/tests/test_utils.py

@@ -1,3 +1,4 @@
+import stat
 from pathlib import Path
 
 import pytest
@@ -5,7 +6,8 @@ import pytest
 from umap.utils import gzip_file, normalize_string
 
 
-def test_gzip_file():
+def test_gzip_file(settings):
+    settings.FILE_UPLOAD_PERMISSIONS = 0o666
     # Let's use any old file so we can check that the date of the gzip file is set.
     src = Path(__file__).parent / "settings.py"
     dest = Path("/tmp/test_settings.py.gz")
@@ -14,6 +16,7 @@ def test_gzip_file():
     dest_stat = dest.stat()
     dest.unlink()
     assert src_stat.st_mtime == dest_stat.st_mtime
+    assert stat.filemode(dest_stat.st_mode) == "-rw-rw-rw-"
 
 
 @pytest.mark.parametrize(

umap/utils.py

@@ -7,7 +7,7 @@ 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
+from django.urls import URLPattern, URLResolver, get_resolver, reverse
 
 
 def _get_url_names(module):
@@ -29,14 +29,20 @@ def _urls_for_js():
     """
     Return templated URLs prepared for javascript.
     """
-    urls = {}
+    urls = {
+        "agnocomplete": f"{reverse('agnocomplete:agnocomplete', kwargs={'klass': 'AutocompleteUser'})}?q={{q}}"
+    }
     modules = ["umap.urls"]
     if settings.REALTIME_ENABLED:
         modules.append("umap.sync.app")
     for module in modules:
         names = _get_url_names(module)
+        prefix = settings.FORCE_SCRIPT_NAME or ""
         urls.update(
-            dict(zip(names, [get_uri_template(url, module=module) for url in names]))
+            zip(
+                names,
+                [get_uri_template(url, prefix=prefix, module=module) for url in names],
+            )
         )
     urls.update(getattr(settings, "UMAP_EXTRA_URLS", {}))
     return urls
@@ -150,6 +156,7 @@ def gzip_file(from_path, to_path):
         with gzip.open(to_path, "wb") as f_out:
             f_out.writelines(f_in)
     os.utime(to_path, ns=(stat.st_mtime_ns, stat.st_mtime_ns))
+    os.chmod(to_path, settings.FILE_UPLOAD_PERMISSIONS)
 
 
 def is_ajax(request):

umap/views.py

@@ -6,7 +6,6 @@ import socket
 import zipfile
 from datetime import datetime, timedelta
 from http.client import InvalidURL
-from io import BytesIO
 from pathlib import Path
 from smtplib import SMTPException
 from urllib.error import HTTPError, URLError
@@ -22,6 +21,7 @@ from django.contrib.postgres.search import SearchQuery, SearchVector
 from django.contrib.sessions.models import Session
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.exceptions import PermissionDenied
+from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.core.mail import send_mail
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.core.signing import BadSignature, Signer, TimestampSigner
@@ -610,7 +610,8 @@ class MapDetailMixin(SessionMixin):
 
     def set_preconnect(self, properties, context):
         # Try to extract the tilelayer domain, in order to but a preconnect meta.
-        url_template = properties.get("tilelayer", {}).get("url_template")
+        tilelayer = properties.get("tilelayer") or {}
+        url_template = tilelayer.get("url_template")
         # Not explicit tilelayer set, take the first of the list, which will be
         # used by frontend too.
         if not url_template:
@@ -1335,8 +1336,20 @@ class DataLayerUpdate(FormLessEditMixin, UpdateView):
                 return HttpResponse(status=412)
 
             # Replace the uploaded file by the merged version.
-            self.request.FILES["geojson"].file = BytesIO(
-                json_dumps(merged).encode("utf-8")
+            # The geojson here can be either a NamedTemporaryFile or an
+            # InMemoryUploadedFile, depending on whether is bigger than the
+            # FILE_UPLOAD_MAX_MEMORY_SIZE setting (2.5Mo by default).
+            # Now that we loaded all in RAM, let's use an InMemoryUploadedFile.
+            orig = self.request.FILES["geojson"]
+            file = io.BytesIO(json_dumps(merged).encode("utf-8"))
+            file_size = file.getbuffer().nbytes
+            self.request.FILES["geojson"] = InMemoryUploadedFile(
+                file=file,
+                field_name="geojson",
+                name=orig.name,
+                content_type="application/geo+json",
+                size=file_size,
+                charset="utf-8",
             )
 
             # Mark the data to be reloaded by form_valid

{umap_project-3.4.0b3.dist-info → umap_project-3.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.4.0b3
+Version: 3.6.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>
@@ -18,43 +18,49 @@ 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.7
-Requires-Dist: pillow==11.3.0
-Requires-Dist: psycopg==3.2.11
-Requires-Dist: rcssmin==1.2.1
+Requires-Dist: django-probes==1.8.0
+Requires-Dist: django<6.0,>=5.1
+Requires-Dist: pillow==12.1.0
+Requires-Dist: psycopg==3.3.2
+Requires-Dist: rcssmin==1.2.2
 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
+Requires-Dist: rjsmin==1.2.5
+Requires-Dist: social-auth-app-django==5.7.0
+Requires-Dist: social-auth-core==4.8.3
+Provides-Extra: deploy
+Requires-Dist: django==5.2.10; extra == 'deploy'
 Provides-Extra: dev
+Requires-Dist: django==5.2.9; extra == 'dev'
 Requires-Dist: djlint==1.36.4; extra == 'dev'
-Requires-Dist: hatch==1.14.2; extra == 'dev'
-Requires-Dist: isort==6.0.1; extra == 'dev'
-Requires-Dist: mkdocs-material==9.6.21; extra == 'dev'
+Requires-Dist: hatch==1.15.1; extra == 'dev'
+Requires-Dist: isort==7.0.0; extra == 'dev'
+Requires-Dist: mkdocs-material==9.7.1; 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.14.0; extra == 'dev'
-Requires-Dist: vermin==1.6.0; extra == 'dev'
-Provides-Extra: docker
-Requires-Dist: uvicorn==0.37.0; extra == 'docker'
+Requires-Dist: pymdown-extensions==10.20.1; extra == 'dev'
+Requires-Dist: ruff==0.14.14; extra == 'dev'
+Requires-Dist: vermin==1.8.0; extra == 'dev'
 Provides-Extra: s3
 Requires-Dist: django-storages[s3]==1.14.6; extra == 's3'
 Provides-Extra: sync
-Requires-Dist: pydantic==2.12.3; extra == 'sync'
-Requires-Dist: redis==6.4.0; extra == 'sync'
-Requires-Dist: websockets==15.0.1; extra == 'sync'
+Requires-Dist: pydantic==2.12.5; extra == 'sync'
+Requires-Dist: redis==7.1.0; extra == 'sync'
+Requires-Dist: uvicorn==0.40.0; extra == 'sync'
+Requires-Dist: websockets==16.0; 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.14; extra == 'test'
+Requires-Dist: moto[s3]==5.1.20; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.11.1; extra == 'test'
-Requires-Dist: pytest-playwright==0.7.1; extra == 'test'
+Requires-Dist: pytest-playwright==0.7.2; extra == 'test'
 Requires-Dist: pytest-rerunfailures==16.1; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
-Requires-Dist: pytest==8.4.2; extra == 'test'
+Requires-Dist: pytest==9.0.2; extra == 'test'
+Provides-Extra: yunohost
+Requires-Dist: django-yunohost-integration==0.10.9; extra == 'yunohost'
+Requires-Dist: django==5.1.15; extra == 'yunohost'
+Requires-Dist: uvicorn==0.40.0; extra == 'yunohost'
 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)