umap-project 2.5.1__py3-none-any.whl → 2.6.0b0__py3-none-any.whl

umap/tests/fixtures/test_circles_layer.geojson

@@ -0,0 +1,219 @@
+{
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5869228,
+                    47.1988448
+                ]
+            },
+            "properties": {
+                "@id": "node/8371195387",
+                "access": "private",
+                "amenity": "bicycle_parking",
+                "covered": "yes",
+                "fee": "no",
+                "name": "station with unknown capacity"
+            },
+            "id": "capa0"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5567325,
+                    47.2223201
+                ]
+            },
+            "properties": {
+                "@id": "node/3750335624",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "stands",
+                "capacity": "2",
+                "check_date:capacity": "2021-05-12",
+                "covered": "no",
+                "material": "metal",
+                "name": "tiny station with 2"
+            },
+            "id": "capa2"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5293571,
+                    47.2285598
+                ]
+            },
+            "properties": {
+                "@id": "node/7149702104",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "wall_loops",
+                "covered": "yes",
+                "capacity": "2",
+                "name": "tiny station with 3"
+            },
+            "id": "capa3"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5613176,
+                    47.2223468
+                ]
+            },
+            "properties": {
+                "@id": "node/5206704322",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "stands",
+                "capacity": "4",
+                "name": "small station with 4"
+            },
+            "id": "capa4"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5465724,
+                    47.2074831
+                ]
+            },
+            "properties": {
+                "@id": "node/10539987424",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "stands",
+                "capacity": "6",
+                "covered": "no",
+                "material": "metal",
+                "name": "small station with 6"
+            },
+            "id": "capa6"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5877882,
+                    47.2179441
+                ]
+            },
+            "properties": {
+                "@id": "node/10239046793",
+                "amenity": "bicycle_parking",
+                "capacity": 8
+            },
+            "id": "capa8"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5406938,
+                    47.2312451
+                ]
+            },
+            "properties": {
+                "@id": "node/5176046494",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "rack",
+                "capacity": "27",
+                "name": "middle station with 27"
+            },
+            "id": "cap27"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5344658,
+                    47.1988441
+                ]
+            },
+            "properties": {
+                "@id": "node/4126326089",
+                "access": "private",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "building",
+                "capacity": "64",
+                "covered": "yes",
+                "material": "metal",
+                "name": "middle station with 64"
+            },
+            "id": "cap64"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5433176,
+                    47.2172633
+                ]
+            },
+            "properties": {
+                "@id": "way/1001063092",
+                "access": "yes",
+                "amenity": "bicycle_parking",
+                "architect": "Forma 6;Phytolab",
+                "bicycle_parking": "shed",
+                "building": "roof",
+                "building:architecture": "contemporary",
+                "capacity": "676",
+                "capacity:cargo_bike": "22",
+                "capacity:motorcycle": "33",
+                "covered": "yes",
+                "fee": "no",
+                "name": "big station with 676",
+                "start_date": "2021-11-15",
+                "@geometry": "center"
+            },
+            "id": "ca676"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5291998,
+                    47.259166
+                ]
+            },
+            "properties": {
+                "@id": "node/11141117088",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "stands",
+                "capacity": "1160",
+                "temporary": "yes",
+                "temporary:date_off": "2023-10-28",
+                "temporary:date_on": "2023-09-08",
+                "name": "huge station with 1160"
+            },
+            "id": "c1160"
+        }
+    ],
+    "_umap_options": {
+        "displayOnLoad": true,
+        "inCaption": true,
+        "browsable": true,
+        "editMode": "advanced",
+        "name": "Calque 1",
+        "remoteData": {},
+        "type": "Circles",
+        "circles": {
+            "radius": {"min": 2, "max": 40},
+            "property": "capacity"
+        }
+    }
+}

umap/tests/fixtures/test_upload_georss.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:creativeCommons="http://cyber.law.harvard.edu/rss/creativeCommonsRssModule.html" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:flickr="urn:flickr:user" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:georss="http://www.georss.org/georss" xmlns:media="http://search.yahoo.com/mrss/" xmlns:woe="http://where.yahooapis.com/v1/schema.rng">
+    <channel>
+        <title>Test stream</title>
+        <link>http://www.pouet.fr/link/</link>
+        <description/>
+        <pubDate>Sun, 13 Apr 2014 09:20:36 -0700</pubDate>
+        <lastBuildDate>Sun, 13 Apr 2014 09:20:36 -0700</lastBuildDate>
+        <generator>http://www.pouet.com/</generator>
+        <item>
+            <title>Title 1</title>
+            <link>http://link.com</link>
+            <description>Description 1</description>
+            <pubDate>Sun, 13 Apr 2014 09:20:36 -0700</pubDate>
+            <geo:lat>53.443324</geo:lat>
+            <geo:long>-2.218337</geo:long>
+            <enclosure url="http://farm4.staticflickr.com/3758/13906321891_faa9be0b8e_b.jpg" type="image/jpeg" />
+        </item>
+    </channel>
+</rss>

umap/tests/integration/conftest.py

@@ -27,10 +27,24 @@ def mock_osm_tiles(page):
 
 
 @pytest.fixture
-def page(context):
-    page = context.new_page()
-    page.on("console", lambda msg: print(msg.text) if msg.type != "warning" else None)
-    return page
+def new_page(context):
+    def make_page(prefix="console"):
+        page = context.new_page()
+        page.on(
+            "console",
+            lambda msg: print(f"{prefix}: {msg.text}")
+            if msg.type != "warning"
+            else None,
+        )
+        page.on("pageerror", lambda exc: print(f"{prefix} uncaught exception: {exc}"))
+        return page
+
+    yield make_page
+
+
+@pytest.fixture
+def page(new_page):
+    return new_page()
 
 
 @pytest.fixture

umap/tests/integration/helpers.py

@@ -0,0 +1,12 @@
+import json
+import re
+from pathlib import Path
+
+from umap.models import DataLayer
+
+
+def save_and_get_json(page):
+    with page.expect_response(re.compile(r".*/datalayer/create/.*")):
+        page.get_by_role("button", name="Save").click()
+    datalayer = DataLayer.objects.last()
+    return json.loads(Path(datalayer.geojson.path).read_text())

umap/tests/integration/test_anonymous_owned_map.py

@@ -219,3 +219,26 @@ def test_alert_message_after_create_show_link_even_without_mail(
     ).to_be_visible()
     expect(alert.get_by_role("button", name="Copy")).to_be_visible()
     expect(alert.get_by_role("button", name="Send me the link")).to_be_hidden()
+
+
+def test_anonymous_owner_can_delete_the_map(anonymap, live_server, owner_session):
+    assert Map.objects.count() == 1
+    owner_session.goto(f"{live_server.url}{anonymap.get_absolute_url()}")
+    owner_session.get_by_role("button", name="Edit").click()
+    owner_session.get_by_role("link", name="Map advanced properties").click()
+    owner_session.get_by_text("Advanced actions").click()
+    expect(owner_session.get_by_role("button", name="Delete")).to_be_visible()
+    owner_session.get_by_role("button", name="Delete").click()
+    with owner_session.expect_response(re.compile(r".*/update/delete/.*")):
+        owner_session.get_by_role("button", name="OK").click()
+    assert not Map.objects.count()
+
+
+def test_non_owner_cannot_see_delete_button(anonymap, live_server, page):
+    anonymap.edit_status = Map.ANONYMOUS
+    anonymap.save()
+    page.goto(f"{live_server.url}{anonymap.get_absolute_url()}")
+    page.get_by_role("button", name="Edit").click()
+    page.get_by_role("link", name="Map advanced properties").click()
+    page.get_by_text("Advanced actions").click()
+    expect(page.get_by_role("button", name="Delete")).to_be_hidden()

umap/tests/integration/test_basics.py

@@ -1,6 +1,10 @@
+import re
+
 import pytest
 from playwright.sync_api import expect
 
+from umap.models import Map
+
 
 def test_page_title(page, live_server):
     page.goto(live_server.url)
@@ -66,3 +70,28 @@ def test_cannot_put_script_tag_in_datalayer_name_or_description(
     expect(page.get_by_text('<script>alert("attack")</script>')).to_be_visible()
     # Description should contain escaped HTML
     expect(page.get_by_text("before after")).to_be_visible()
+
+
+def test_login_from_map_page(live_server, page, tilelayer, settings, user, context):
+    settings.ENABLE_ACCOUNT_LOGIN = True
+    assert Map.objects.count() == 0
+    page.goto(f"{live_server.url}/en/map/new/")
+    with (
+        page.expect_response(re.compile(r".*/map/create/")),
+        context.expect_page() as login_page_info,
+    ):
+        page.get_by_role("button", name="Save").click()
+    assert Map.objects.count() == 0
+    login_page = login_page_info.value
+    expect(login_page).to_have_title("Login")
+    login_page.get_by_placeholder("Username").fill(user.username)
+    login_page.get_by_placeholder("Password").fill("123123")
+    with page.expect_response(re.compile(r".*/map/create/")):
+        login_page.locator('#login_form input[type="submit"]').click()
+    # Login page should be closed
+    page.wait_for_timeout(500)  # Seems needed from time to time…
+    assert len(context.pages) == 1
+    # Save should have proceed
+    assert Map.objects.count() == 1
+    # Use name should now appear on the header toolbar
+    expect(page.get_by_text("My Dashboard (Joe)")).to_be_visible()

umap/tests/integration/test_caption.py

@@ -25,3 +25,23 @@ def test_caption(live_server, page, map):
         panel.locator(".datalayer-legend .off").get_by_text(non_loaded.name)
     ).to_be_visible()
     expect(panel.locator(".datalayer-legend").get_by_text(hidden.name)).to_be_hidden()
+
+
+def test_caption_should_display_owner_as_author(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "caption"
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    panel = page.locator(".panel.left.on")
+    expect(panel).to_be_visible()
+    expect(panel.get_by_text("By Gabriel")).to_be_visible()
+
+
+def test_caption_should_display_team_as_author(live_server, page, map, team):
+    map.settings["properties"]["onLoadPanel"] = "caption"
+    map.team = team
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    panel = page.locator(".panel.left.on")
+    expect(panel).to_be_visible()
+    expect(panel.get_by_text("By Gabriel")).to_be_hidden()
+    expect(panel.get_by_text("By Awesome Team")).to_be_visible()

umap/tests/integration/test_circles_layer.py

@@ -0,0 +1,69 @@
+import json
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+
+def test_basic_circles_layer(map, live_server, page):
+    path = Path(__file__).parent.parent / "fixtures/test_circles_layer.geojson"
+    data = json.loads(path.read_text())
+    DataLayerFactory(data=data, map=map)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}#12/47.2210/-1.5621")
+    paths = page.locator("path")
+    expect(paths).to_have_count(10)
+    # Last arc curve command
+    assert (
+        page.locator("[data-feature=c1160]")
+        .get_attribute("d")
+        .endswith("a40,40 0 1,0 -80,0 ")
+    )
+    assert (
+        page.locator("[data-feature=ca676]")
+        .get_attribute("d")
+        .endswith("a31,31 0 1,0 -62,0 ")
+    )
+    assert (
+        page.locator("[data-feature=cap64]")
+        .get_attribute("d")
+        .endswith("a10,10 0 1,0 -20,0 ")
+    )
+    assert (
+        page.locator("[data-feature=cap27]")
+        .get_attribute("d")
+        .endswith("a6,6 0 1,0 -12,0 ")
+    )
+    assert (
+        page.locator("[data-feature=capa8]")
+        .get_attribute("d")
+        .endswith("a4,4 0 1,0 -8,0 ")
+    )
+    assert (
+        page.locator("[data-feature=capa6]")
+        .get_attribute("d")
+        .endswith("a3,3 0 1,0 -6,0 ")
+    )
+    assert (
+        page.locator("[data-feature=capa4]")
+        .get_attribute("d")
+        .endswith("a3,3 0 1,0 -6,0 ")
+    )
+    assert (
+        page.locator("[data-feature=capa3]")
+        .get_attribute("d")
+        .endswith("a2,2 0 1,0 -4,0 ")
+    )
+    assert (
+        page.locator("[data-feature=capa2]")
+        .get_attribute("d")
+        .endswith("a2,2 0 1,0 -4,0 ")
+    )
+    assert (
+        page.locator("[data-feature=capa0]")
+        .get_attribute("d")
+        .endswith("a2,2 0 1,0 -4,0 ")
+    )

umap/tests/integration/test_draw_polygon.py

@@ -1,22 +1,11 @@
-import json
-import re
-from pathlib import Path
-
 import pytest
 from playwright.sync_api import expect
 
-from umap.models import DataLayer
+from .helpers import save_and_get_json
 
 pytestmark = pytest.mark.django_db
 
 
-def save_and_get_json(page):
-    with page.expect_response(re.compile(r".*/datalayer/create/.*")):
-        page.get_by_role("button", name="Save").click()
-    datalayer = DataLayer.objects.last()
-    return json.loads(Path(datalayer.geojson.path).read_text())
-
-
 def test_draw_polygon(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
 
@@ -243,7 +232,8 @@ def test_can_transfer_shape_from_simple_polygon(live_server, page, tilelayer):
     expect(polygons).to_have_count(1)
 
 
-def test_can_extract_shape(live_server, page, tilelayer):
+def test_can_extract_shape(live_server, page, tilelayer, settings):
+    settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/en/map/new/")
     polygons = page.locator(".leaflet-overlay-pane path")
     expect(polygons).to_have_count(0)
@@ -269,6 +259,58 @@ def test_can_extract_shape(live_server, page, tilelayer):
     polygons.first.click(position={"x": 20, "y": 20}, button="right")
     extract_button.click()
     expect(polygons).to_have_count(2)
+    data = save_and_get_json(page)
+    assert len(data["features"]) == 2
+    assert data["features"][0]["geometry"]["type"] == "Polygon"
+    assert data["features"][1]["geometry"]["type"] == "Polygon"
+    assert data["features"][0]["geometry"]["coordinates"] == [
+        [
+            [
+                -6.569824,
+                53.159947,
+            ],
+            [
+                -6.569824,
+                52.49616,
+            ],
+            [
+                -7.668457,
+                52.49616,
+            ],
+            [
+                -7.668457,
+                53.159947,
+            ],
+            [
+                -6.569824,
+                53.159947,
+            ],
+        ],
+    ]
+    assert data["features"][1]["geometry"]["coordinates"] == [
+        [
+            [
+                -8.76709,
+                54.457267,
+            ],
+            [
+                -8.76709,
+                53.813626,
+            ],
+            [
+                -9.865723,
+                53.813626,
+            ],
+            [
+                -9.865723,
+                54.457267,
+            ],
+            [
+                -8.76709,
+                54.457267,
+            ],
+        ],
+    ]
 
 
 def test_cannot_transfer_shape_to_line(live_server, page, tilelayer):
@@ -367,3 +409,58 @@ def test_can_transform_polygon_to_line(live_server, page, tilelayer, settings):
     data = save_and_get_json(page)
     assert len(data["features"]) == 1
     assert data["features"][0]["geometry"]["type"] == "LineString"
+
+
+def test_can_draw_a_polygon_and_invert_it(live_server, page, tilelayer, settings):
+    settings.UMAP_ALLOW_ANONYMOUS = True
+    page.goto(f"{live_server.url}/en/map/new/")
+    paths = page.locator(".leaflet-overlay-pane path")
+    expect(paths).to_have_count(0)
+    page.get_by_title("Draw a polygon").click()
+    map = page.locator("#map")
+    map.click(position={"x": 200, "y": 100})
+    map.click(position={"x": 200, "y": 200})
+    map.click(position={"x": 100, "y": 200})
+    map.click(position={"x": 100, "y": 100})
+    # Click again to finish
+    map.click(position={"x": 100, "y": 100})
+    expect(paths).to_have_count(1)
+    page.get_by_text("Advanced properties").click()
+    page.get_by_text("Display the polygon inverted").click()
+    data = save_and_get_json(page)
+    assert len(data["features"]) == 1
+    assert data["features"][0]["geometry"]["type"] == "Polygon"
+    assert data["features"][0]["geometry"]["coordinates"] == [
+        [
+            [
+                -7.668457,
+                54.457267,
+            ],
+            [
+                -7.668457,
+                53.159947,
+            ],
+            [
+                -9.865723,
+                53.159947,
+            ],
+            [
+                -9.865723,
+                54.457267,
+            ],
+            [
+                -7.668457,
+                54.457267,
+            ],
+        ],
+    ]
+
+    page.get_by_role("button", name="View").click()
+    popup = page.locator(".leaflet-popup")
+    expect(popup).to_be_hidden()
+    # Now click on the middle of the polygon, it should not show the popup
+    map.click(position={"x": 150, "y": 150})
+    expect(popup).to_be_hidden()
+    # Click elsewhere on the map, it should now show the popup
+    map.click(position={"x": 250, "y": 250})
+    expect(popup).to_be_visible()

umap/tests/integration/test_draw_polyline.py

@@ -1,22 +1,11 @@
-import json
-import re
-from pathlib import Path
-
 import pytest
 from playwright.sync_api import expect
 
-from umap.models import DataLayer
+from .helpers import save_and_get_json
 
 pytestmark = pytest.mark.django_db
 
 
-def save_and_get_json(page):
-    with page.expect_response(re.compile(r".*/datalayer/create/.*")):
-        page.get_by_role("button", name="Save").click()
-    datalayer = DataLayer.objects.last()
-    return json.loads(Path(datalayer.geojson.path).read_text())
-
-
 def test_draw_polyline(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
 
@@ -187,7 +176,7 @@ def test_can_transfer_shape_from_simple_polyline(live_server, page, tilelayer):
     map.click(position={"x": 100, "y": 200})
     expect(lines).to_have_count(1)
 
-    # Draw another polygon
+    # Draw another line
     page.get_by_title("Draw a polyline").click()
     map.click(position={"x": 250, "y": 250})
     map.click(position={"x": 200, "y": 250})
@@ -196,7 +185,7 @@ def test_can_transfer_shape_from_simple_polyline(live_server, page, tilelayer):
     map.click(position={"x": 200, "y": 200})
     expect(lines).to_have_count(2)
 
-    # Now that polygon 2 is selected, right click on first one
+    # Now that line 2 is selected, right click on first one
     # and transfer shape
     lines.first.click(position={"x": 10, "y": 1}, button="right")
     page.get_by_role("link", name="Transfer shape to edited feature").click()
@@ -235,18 +224,19 @@ def test_can_transfer_shape_from_multi(live_server, page, tilelayer, settings):
     map.click(position={"x": 300, "y": 300})
     expect(lines).to_have_count(2)
 
-    # Now that polygon 2 is selected, right click on first one
+    # Now that line 2 is selected, right click on first one
     # and transfer shape
     lines.first.click(position={"x": 10, "y": 1}, button="right")
     page.get_by_role("link", name="Transfer shape to edited feature").click()
     expect(lines).to_have_count(2)
     data = save_and_get_json(page)
-    # FIXME this should be a LineString, not MultiLineString
     assert data["features"][0]["geometry"] == {
         "coordinates": [
-            [[-6.569824, 52.49616], [-7.668457, 52.49616], [-7.668457, 53.159947]]
+            [-6.569824, 52.49616],
+            [-7.668457, 52.49616],
+            [-7.668457, 53.159947],
         ],
-        "type": "MultiLineString",
+        "type": "LineString",
     }
     assert data["features"][1]["geometry"] == {
         "coordinates": [

umap/tests/integration/test_edit_datalayer.py

@@ -107,7 +107,7 @@ def test_can_change_icon_class(live_server, openmap, page):
     page.locator(".panel.right").get_by_title("Edit", exact=True).click()
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-iconClass a.define").click()
-    page.get_by_text("Circle").click()
+    page.get_by_text("Circle", exact=True).click()
     expect(page.locator(".umap-circle-icon")).to_be_visible()
     expect(page.locator(".umap-div-icon")).to_be_hidden()