umap-project 2.1.2__py3-none-any.whl → 2.2.0__py3-none-any.whl

umap/tests/integration/test_draw_polyline.py

@@ -0,0 +1,325 @@
+import json
+import re
+from pathlib import Path
+
+import pytest
+from playwright.sync_api import expect
+
+from umap.models import DataLayer
+
+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/")
+
+    # Click on the Draw a line button on a new map.
+    create_line = page.locator(".leaflet-control-toolbar ").get_by_title(
+        "Draw a polyline"
+    )
+    create_line.click()
+
+    # Check no line is present by default.
+    # We target with the color, because there is also the drawing line guide (dash-array)
+    # around
+    lines = page.locator(".leaflet-overlay-pane path[stroke='DarkBlue']")
+    guide = page.locator(".leaflet-overlay-pane > svg > g > path")
+    expect(lines).to_have_count(0)
+    expect(guide).to_have_count(0)
+
+    # Click on the map, it will create a line.
+    map = page.locator("#map")
+    map.click(position={"x": 200, "y": 200})
+    expect(lines).to_have_count(1)
+    expect(guide).to_have_count(1)
+    map.click(position={"x": 100, "y": 200})
+    expect(lines).to_have_count(1)
+    expect(guide).to_have_count(1)
+    map.click(position={"x": 100, "y": 100})
+    expect(lines).to_have_count(1)
+    expect(guide).to_have_count(1)
+    # Click again to finish
+    map.click(position={"x": 100, "y": 100})
+    expect(lines).to_have_count(1)
+    expect(guide).to_have_count(0)
+
+
+def test_clicking_esc_should_finish_line(page, live_server, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    # Click on the Draw a line button on a new map.
+    create_line = page.locator(".leaflet-control-toolbar ").get_by_title(
+        "Draw a polyline"
+    )
+    create_line.click()
+
+    # Check no line is present by default.
+    # We target with the color, because there is also the drawing line guide (dash-array)
+    # around
+    lines = page.locator(".leaflet-overlay-pane path[stroke='DarkBlue']")
+    guide = page.locator(".leaflet-overlay-pane > svg > g > path")
+    expect(lines).to_have_count(0)
+    expect(guide).to_have_count(0)
+
+    # Click on the map, it will create a line.
+    map = page.locator("#map")
+    map.click(position={"x": 200, "y": 200})
+    expect(lines).to_have_count(1)
+    expect(guide).to_have_count(1)
+    map.click(position={"x": 100, "y": 200})
+    expect(lines).to_have_count(1)
+    expect(guide).to_have_count(1)
+    map.click(position={"x": 100, "y": 100})
+    expect(lines).to_have_count(1)
+    expect(guide).to_have_count(1)
+    # Click ESC to finish
+    page.keyboard.press("Escape")
+    expect(lines).to_have_count(1)
+    expect(guide).to_have_count(0)
+
+
+def test_clicking_esc_should_delete_line_if_empty(page, live_server, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    # Click on the Draw a line button on a new map.
+    create_line = page.locator(".leaflet-control-toolbar ").get_by_title(
+        "Draw a polyline"
+    )
+    create_line.click()
+
+    # Check no line is present by default.
+    # We target with the color, because there is also the drawing line guide (dash-array)
+    # around
+    lines = page.locator(".leaflet-overlay-pane path[stroke='DarkBlue']")
+    guide = page.locator(".leaflet-overlay-pane > svg > g > path")
+    expect(lines).to_have_count(0)
+    expect(guide).to_have_count(0)
+
+    map = page.locator("#map")
+    map.click(position={"x": 200, "y": 200})
+    # At this stage, the line as one element, it should not be created
+    # on pressing esc, as invalid
+    # Click ESC to finish
+    page.keyboard.press("Escape")
+    expect(lines).to_have_count(0)
+    expect(guide).to_have_count(0)
+
+
+def test_clicking_esc_should_delete_line_if_invalid(page, live_server, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    # Click on the Draw a line button on a new map.
+    create_line = page.locator(".leaflet-control-toolbar ").get_by_title(
+        "Draw a polyline"
+    )
+    create_line.click()
+
+    # Check no line is present by default.
+    # We target with the color, because there is also the drawing line guide (dash-array)
+    # around
+    lines = page.locator(".leaflet-overlay-pane path[stroke='DarkBlue']")
+    guide = page.locator(".leaflet-overlay-pane > svg > g > path")
+    expect(lines).to_have_count(0)
+    expect(guide).to_have_count(0)
+
+    # At this stage, the line as no element, it should not be created
+    # on pressing esc
+    # Click ESC to finish
+    page.keyboard.press("Escape")
+    expect(lines).to_have_count(0)
+    expect(guide).to_have_count(0)
+
+
+def test_can_draw_multi(live_server, page, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+    lines = page.locator(".leaflet-overlay-pane path")
+    expect(lines).to_have_count(0)
+    add_shape = page.get_by_title("Add a line to the current multi")
+    expect(add_shape).to_be_hidden()
+    page.get_by_title("Draw a polyline").click()
+    map = page.locator("#map")
+    map.click(position={"x": 200, "y": 100})
+    map.click(position={"x": 100, "y": 100})
+    map.click(position={"x": 100, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 100, "y": 200})
+    expect(add_shape).to_be_visible()
+    expect(lines).to_have_count(1)
+    add_shape.click()
+    map.click(position={"x": 250, "y": 250})
+    map.click(position={"x": 200, "y": 250})
+    map.click(position={"x": 200, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 200, "y": 200})
+    expect(lines).to_have_count(1)
+    page.keyboard.press("Escape")
+    expect(add_shape).to_be_hidden()
+    lines.first.click(button="right", position={"x": 10, "y": 1})
+    expect(page.get_by_role("link", name="Transform to polygon")).to_be_hidden()
+    expect(page.get_by_role("link", name="Remove shape from the multi")).to_be_visible()
+
+
+def test_can_transfer_shape_from_simple_polyline(live_server, page, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+    lines = page.locator(".leaflet-overlay-pane path")
+    expect(lines).to_have_count(0)
+    page.get_by_title("Draw a polyline").click()
+    map = page.locator("#map")
+
+    # Draw a first line
+    map.click(position={"x": 200, "y": 100})
+    map.click(position={"x": 100, "y": 100})
+    map.click(position={"x": 100, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 100, "y": 200})
+    expect(lines).to_have_count(1)
+
+    # Draw another polygon
+    page.get_by_title("Draw a polyline").click()
+    map.click(position={"x": 250, "y": 250})
+    map.click(position={"x": 200, "y": 250})
+    map.click(position={"x": 200, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 200, "y": 200})
+    expect(lines).to_have_count(2)
+
+    # Now that polygon 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(1)
+
+
+def test_can_transfer_shape_from_multi(live_server, page, tilelayer, settings):
+    settings.UMAP_ALLOW_ANONYMOUS = True
+    page.goto(f"{live_server.url}/en/map/new/")
+    lines = page.locator(".leaflet-overlay-pane path")
+    expect(lines).to_have_count(0)
+    page.get_by_title("Draw a polyline").click()
+    map = page.locator("#map")
+
+    # Draw a multi line
+    map.click(position={"x": 200, "y": 100})
+    map.click(position={"x": 100, "y": 100})
+    map.click(position={"x": 100, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 100, "y": 200})
+    expect(lines).to_have_count(1)
+    page.get_by_title("Add a line to the current multi").click()
+    map.click(position={"x": 250, "y": 250})
+    map.click(position={"x": 200, "y": 250})
+    map.click(position={"x": 200, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 200, "y": 200})
+    expect(lines).to_have_count(1)
+
+    # Draw another line
+    page.get_by_title("Draw a polyline").click()
+    map.click(position={"x": 350, "y": 350})
+    map.click(position={"x": 300, "y": 350})
+    map.click(position={"x": 300, "y": 300})
+    # Click again to finish
+    map.click(position={"x": 300, "y": 300})
+    expect(lines).to_have_count(2)
+
+    # Now that polygon 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]]
+        ],
+        "type": "MultiLineString",
+    }
+    assert data["features"][1]["geometry"] == {
+        "coordinates": [
+            [[-4.372559, 51.138001], [-5.471191, 51.138001], [-5.471191, 51.822198]],
+            [[-7.668457, 54.457267], [-9.865723, 54.457267], [-9.865723, 53.159947]],
+        ],
+        "type": "MultiLineString",
+    }
+
+
+def test_can_extract_shape(live_server, page, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+    lines = page.locator(".leaflet-overlay-pane path")
+    expect(lines).to_have_count(0)
+    page.get_by_title("Draw a polylin").click()
+    map = page.locator("#map")
+    map.click(position={"x": 200, "y": 100})
+    map.click(position={"x": 100, "y": 100})
+    map.click(position={"x": 100, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 100, "y": 200})
+    expect(lines).to_have_count(1)
+    extract_button = page.get_by_role("link", name="Extract shape to separate feature")
+    expect(extract_button).to_be_hidden()
+    page.get_by_title("Add a line to the current multi").click()
+    map.click(position={"x": 250, "y": 250})
+    map.click(position={"x": 200, "y": 250})
+    map.click(position={"x": 200, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 200, "y": 200})
+    expect(lines).to_have_count(1)
+    lines.first.click(position={"x": 10, "y": 1}, button="right")
+    extract_button.click()
+    expect(lines).to_have_count(2)
+
+
+def test_can_clone_polyline(live_server, page, tilelayer, settings):
+    settings.UMAP_ALLOW_ANONYMOUS = True
+    page.goto(f"{live_server.url}/en/map/new/")
+    lines = page.locator(".leaflet-overlay-pane path")
+    expect(lines).to_have_count(0)
+    page.get_by_title("Draw a polyline").click()
+    map = page.locator("#map")
+    map.click(position={"x": 200, "y": 100})
+    map.click(position={"x": 100, "y": 100})
+    map.click(position={"x": 100, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 100, "y": 200})
+    expect(lines).to_have_count(1)
+    lines.first.click(position={"x": 10, "y": 1}, button="right")
+    page.get_by_role("link", name="Clone this feature").click()
+    expect(lines).to_have_count(2)
+    data = save_and_get_json(page)
+    assert len(data["features"]) == 2
+    assert data["features"][0]["geometry"]["type"] == "LineString"
+    assert data["features"][0]["geometry"] == data["features"][1]["geometry"]
+    assert data["features"][0]["properties"] == data["features"][1]["properties"]
+
+
+def test_can_transform_polyline_to_polygon(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")
+    # Paths with fill
+    polygons = page.locator(".leaflet-overlay-pane path[fill='DarkBlue']")
+    expect(paths).to_have_count(0)
+    page.get_by_title("Draw a polyline").click()
+    map = page.locator("#map")
+    map.click(position={"x": 200, "y": 100})
+    map.click(position={"x": 100, "y": 100})
+    map.click(position={"x": 100, "y": 200})
+    # Click again to finish
+    map.click(position={"x": 100, "y": 200})
+    expect(paths).to_have_count(1)
+    expect(polygons).to_have_count(0)
+    paths.first.click(position={"x": 10, "y": 1}, button="right")
+    page.get_by_role("link", name="Transform to polygon").click()
+    expect(polygons).to_have_count(1)
+    expect(paths).to_have_count(1)
+    data = save_and_get_json(page)
+    assert len(data["features"]) == 1
+    assert data["features"][0]["geometry"]["type"] == "Polygon"

umap/tests/integration/test_edit_datalayer.py

@@ -1,20 +1,24 @@
+import platform
+import re
+
 from playwright.sync_api import expect
 
+from umap.models import DataLayer
+
+from ..base import DataLayerFactory
+
 
 def test_should_have_fieldset_for_layer_type_properties(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
 
     # Open DataLayers list
-    button = page.get_by_title("Manage Layers")
-    expect(button).to_be_visible()
-    button.click()
+    page.get_by_title("Manage layers").click()
 
     # Create a layer
-    page.get_by_title("Manage layers").click()
-    page.get_by_role("button", name="Add a layer").click()
+    page.get_by_title("Add a layer").click()
     page.locator("input[name=name]").fill("Layer 1")
 
-    select = page.locator("#umap-ui-container .umap-field-type select")
+    select = page.locator(".panel.on .umap-field-type select")
     expect(select).to_be_visible()
 
     choropleth_header = page.get_by_text("Choropleth: settings")
@@ -44,3 +48,138 @@ def test_should_have_fieldset_for_layer_type_properties(page, live_server, tilel
     expect(choropleth_header).to_be_hidden()
     expect(heat_header).to_be_hidden()
     expect(cluster_header).to_be_hidden()
+
+
+def test_cancel_deleting_datalayer_should_restore(
+    live_server, openmap, datalayer, page
+):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
+    markers = page.locator(".leaflet-marker-icon")
+    expect(layers).to_have_count(1)
+    expect(markers).to_have_count(1)
+    page.get_by_role("link", name="Manage layers").click()
+    page.once("dialog", lambda dialog: dialog.accept())
+    page.locator(".panel.right").get_by_title("Delete layer").click()
+    expect(markers).to_have_count(0)
+    page.get_by_role("button", name="See layers").click()
+    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()
+    expect(markers).to_have_count(1)
+    expect(page.locator(".umap-browser").get_by_text("test datalayer")).to_be_visible()
+
+
+def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.get_by_title("See layers").click()
+    layers = page.locator(".umap-browser .datalayer")
+    markers = page.locator(".leaflet-marker-icon")
+    expect(layers).to_have_count(1)
+    expect(markers).to_have_count(1)
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel.right").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="Advanced actions").click()
+    page.get_by_role("button", name="Clone").click()
+    expect(layers).to_have_count(2)
+    expect(markers).to_have_count(2)
+
+
+def test_can_change_icon_class(live_server, openmap, page):
+    # Faster than doing a login
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"name": "Point 4"},
+                "geometry": {"type": "Point", "coordinates": [0.856934, 45.290347]},
+            },
+        ],
+    }
+    DataLayerFactory(map=openmap, data=data)
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    expect(page.locator(".umap-div-icon")).to_be_visible()
+    page.get_by_role("link", name="Manage layers").click()
+    expect(page.locator(".umap-circle-icon")).to_be_hidden()
+    page.locator(".panel.right").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator(".umap-field-iconClass a.define").click()
+    page.get_by_text("Circle").click()
+    expect(page.locator(".umap-circle-icon")).to_be_visible()
+    expect(page.locator(".umap-div-icon")).to_be_hidden()
+
+
+def test_can_change_name(live_server, openmap, page, datalayer):
+    page.goto(
+        f"{live_server.url}{openmap.get_absolute_url()}?edit&datalayersControl=expanded"
+    )
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel.right").get_by_title("Edit", exact=True).click()
+    expect(page.locator(".umap-is-dirty")).to_be_hidden()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').press("Control+a")
+    page.locator('input[name="name"]').fill("new name")
+    expect(page.locator(".umap-browser .datalayer")).to_contain_text("new name")
+    expect(page.locator(".umap-is-dirty")).to_be_visible()
+    with page.expect_response(re.compile(".*/datalayer/update/.*")):
+        page.get_by_role("button", name="Save").click()
+    saved = DataLayer.objects.last()
+    assert saved.name == "new name"
+    expect(page.locator(".umap-is-dirty")).to_be_hidden()
+
+
+def test_can_create_new_datalayer(live_server, openmap, page, datalayer):
+    page.goto(
+        f"{live_server.url}{openmap.get_absolute_url()}?edit&datalayersControl=expanded"
+    )
+    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Add a layer").click()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').fill("my new layer")
+    expect(page.get_by_text("my new layer")).to_be_visible()
+    with page.expect_response(re.compile(".*/datalayer/create/.*")):
+        page.get_by_role("button", name="Save").click()
+    assert DataLayer.objects.count() == 2
+    saved = DataLayer.objects.last()
+    assert saved.name == "my new layer"
+    expect(page.locator(".umap-is-dirty")).to_be_hidden()
+    # Edit again, it should not create a new datalayer
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel.right").get_by_title("Edit", exact=True).first.click()
+    page.locator('input[name="name"]').click()
+    page.locator('input[name="name"]').fill("my new layer with a new name")
+    expect(page.get_by_text("my new layer with a new name")).to_be_visible()
+    page.get_by_role("button", name="Save").click()
+    with page.expect_response(re.compile(".*/datalayer/update/.*")):
+        page.get_by_role("button", name="Save").click()
+    assert DataLayer.objects.count() == 2
+    saved = DataLayer.objects.last()
+    assert saved.name == "my new layer with a new name"
+    expect(page.locator(".umap-is-dirty")).to_be_hidden()
+
+
+def test_can_restore_version(live_server, openmap, page, datalayer):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    marker = page.locator(".leaflet-marker-icon")
+    expect(marker).to_have_class(re.compile(".*umap-ball-icon.*"))
+    marker.click(modifiers=["Shift"])
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator("#umap-feature-shape-properties").get_by_text("Default").click()
+    with page.expect_response(re.compile(".*/datalayer/update/.*")):
+        page.get_by_role("button", name="Save").click()
+    expect(marker).to_have_class(re.compile(".*umap-div-icon.*"))
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator(".panel.right").get_by_title("Edit", exact=True).click()
+    page.get_by_role("heading", name="Versions").click()
+    page.once("dialog", lambda dialog: dialog.accept())
+    page.get_by_role("button", name="Restore this version").last.click()
+    expect(marker).to_have_class(re.compile(".*umap-ball-icon.*"))
+
+
+def test_can_edit_layer_on_ctrl_shift_click(live_server, openmap, page, datalayer):
+    modifier = "Meta" if platform.system() == "Darwin" else "Control"
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.locator(".leaflet-marker-icon").click(modifiers=[modifier, "Shift"])
+    expect(page.get_by_role("heading", name="Layer properties")).to_be_visible()