umap-project 2.9.3__py3-none-any.whl → 3.0.0__py3-none-any.whl

umap/tests/base.py

@@ -18,6 +18,7 @@ DATALAYER_DATA = {
     "features": [
         {
             "type": "Feature",
+            "id": "ExNTQ",
             "geometry": {
                 "type": "Point",
                 "coordinates": [14.68896484375, 48.55297816440071],
@@ -41,7 +42,7 @@ class LicenceFactory(factory.django.DjangoModelFactory):
 
 
 class TileLayerFactory(factory.django.DjangoModelFactory):
-    name = "Test zoom layer"
+    name = "Test tilelayer"
     url_template = "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
     attribution = "Test layer attribution"
 

umap/tests/fixtures/remote_data.umap

@@ -0,0 +1,55 @@
+{
+  "type": "umap",
+  "uri": "http://localhost:8020/fr/map/carte-sans-nom_128#6/50.233/6.910",
+  "properties": {
+    "easing": false,
+    "embedControl": true,
+    "fullscreenControl": true,
+    "searchControl": true,
+    "datalayersControl": true,
+    "zoomControl": true,
+    "permanentCreditBackground": true,
+    "slideshow": {},
+    "captionMenus": true,
+    "captionBar": false,
+    "limitBounds": {},
+    "overlay": null,
+    "licence": "",
+    "description": "",
+    "name": "Carte sans nom",
+    "displayPopupFooter": false,
+    "miniMap": false,
+    "moreControl": true,
+    "scaleControl": true,
+    "scrollWheelZoom": true,
+    "zoom": 6
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      6.734619140625,
+      50.359480346298696
+    ]
+  },
+  "layers": [
+    {
+      "type": "FeatureCollection",
+      "features": [],
+      "_umap_options": {
+        "name": "Itinéraire D",
+        "color": "#d34e8d",
+        "editMode": "advanced",
+        "browsable": true,
+        "inCaption": true,
+        "remoteData": {
+          "url": "https://remote.org/data.json",
+          "format": "geojson"
+        },
+        "permissions": {
+          "edit_status": 0
+        },
+        "displayOnLoad": true
+      }
+    }
+  ]
+}

umap/tests/fixtures/test_upload_data_with_iconurl.umap

@@ -0,0 +1,122 @@
+{
+  "type": "umap",
+  "uri": "https://umap.incubateur.anct.gouv.fr/fr/map/aires-de-covoiturage-du-departement-de-la-nievre_42",
+  "properties": {
+    "easing": false,
+    "embedControl": true,
+    "fullscreenControl": true,
+    "searchControl": true,
+    "datalayersControl": true,
+    "zoomControl": true,
+    "permanentCreditBackground": true,
+    "sortKey": "com_lieu",
+    "slideshow": {},
+    "captionMenus": true,
+    "captionBar": false,
+    "limitBounds": {},
+    "overlay": {},
+    "tilelayer": {
+      "tms": false,
+      "name": "OpenStreetMap",
+      "maxZoom": 19,
+      "minZoom": 0,
+      "attribution": "map data © [[http://osm.org/copyright|OpenStreetMap contributors]] under ODbL",
+      "url_template": "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+    },
+    "licence": "",
+    "description": "",
+    "name": "Aires de covoiturage du département de la Nièvre",
+    "defaultView": "data",
+    "onLoadPanel": "none",
+    "displayPopupFooter": false,
+    "miniMap": false,
+    "moreControl": true,
+    "scaleControl": true,
+    "scrollWheelZoom": true,
+    "zoom": 9
+  },
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      3.4552001953125004,
+      47.12527904224337
+    ]
+  },
+  "layers": [
+    {
+      "type": "FeatureCollection",
+      "features": [
+        {
+          "type": "Feature",
+          "properties": {
+            "id_lieu": "58004-C-001",
+            "id_local": "",
+            "nom_lieu": "Maison du Bazois",
+            "ad_lieu": "Bois de Seigne",
+            "com_lieu": "ALLUY",
+            "insee": "58004",
+            "type": "Parking",
+            "date_maj": "29/08/2019",
+            "ouvert": "true",
+            "source": "225800010",
+            "nbre_pl": "4",
+            "nbre_pmr": "",
+            "duree": "",
+            "horaires": "",
+            "proprio": "",
+            "lumiere": "",
+            "comm": ""
+          },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [
+              3.634832,
+              47.043123
+            ]
+          }
+        },
+        {
+          "type": "Feature",
+          "properties": {
+            "id_lieu": "58012-C-001",
+            "id_local": "",
+            "nom_lieu": "Mairie",
+            "ad_lieu": "28 route de Saint-Amand",
+            "com_lieu": "ARQUIAN",
+            "insee": "58012",
+            "type": "Auto-stop",
+            "date_maj": "19/05/2021",
+            "ouvert": "true",
+            "source": "810157982",
+            "nbre_pl": "",
+            "nbre_pmr": "",
+            "duree": "",
+            "horaires": "",
+            "proprio": "",
+            "lumiere": "true",
+            "comm": ""
+          },
+          "geometry": {
+            "type": "Point",
+            "coordinates": [
+              2.99163,
+              47.5407
+            ]
+          }
+        }
+      ],
+      "_umap_options": {
+        "displayOnLoad": true,
+        "browsable": false,
+        "editMode": "disabled",
+        "remoteData": {},
+        "popupContentTemplate": "# {nom_lieu}\nAdresse : {ad_lieu} {com_lieu}\nType : {type}\nNombre de places : {nbre_pl}\n",
+        "color": "SpringGreen",
+        "iconUrl": "/uploads/pictogram/car-24.png",
+        "labelKey": "com_lieu",
+        "id": 73,
+        "name": "Liste des aires de covoiturage"
+      }
+    }
+  ]
+}

umap/tests/integration/test_browser.py

@@ -348,10 +348,8 @@ def test_should_redraw_list_on_feature_delete(live_server, openmap, page, bootst
     buttons = page.locator(".umap-browser .datalayer li .icon-delete")
     expect(buttons).to_have_count(3)
     buttons.first.click()
-    page.locator("dialog").get_by_role("button", name="OK").click()
     expect(buttons).to_have_count(2)
-    page.get_by_role("button", name="Cancel edits").click()
-    page.locator("dialog").get_by_role("button", name="OK").click()
+    page.locator(".edit-undo").click()
     expect(buttons).to_have_count(3)
 
 

umap/tests/integration/test_conditional_rules.py

@@ -261,6 +261,9 @@ def test_can_create_new_rule(live_server, page, openmap):
     page.get_by_title("AliceBlue").first.click()
     colors = getColors(markers)
     assert colors.count("rgb(240, 248, 255)") == 3
+    page.locator(".edit-undo").click()
+    colors = getColors(markers)
+    assert colors.count("rgb(240, 248, 255)") == 0
 
 
 def test_can_deactive_rule_from_list(live_server, page, openmap):

umap/tests/integration/test_edit_datalayer.py

@@ -61,11 +61,9 @@ def test_cancel_deleting_datalayer_should_restore(
     expect(markers).to_have_count(1)
     page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Delete layer").click()
-    page.get_by_role("button", name="OK").click()
     expect(markers).to_have_count(0)
     expect(page.get_by_text("test datalayer")).to_be_hidden()
-    page.get_by_role("button", name="Cancel edits").click()
-    page.locator("dialog").get_by_role("button", name="OK").click()
+    page.locator(".edit-undo").click()
     expect(markers).to_have_count(1)
     expect(page.locator(".umap-browser").get_by_text("test datalayer")).to_be_visible()
 
@@ -160,7 +158,6 @@ def test_can_create_new_datalayer(live_server, openmap, page, datalayer):
     page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("Layer A with a new name")
     expect(page.get_by_text("Layer A 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
@@ -182,7 +179,7 @@ def test_can_restore_version(live_server, openmap, page, datalayer):
     page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Edit", exact=True).click()
     page.get_by_text("Versions").click()
-    page.get_by_role("button", name="Restore this version").last.click()
+    page.get_by_title("Restore this version").last.click()
     page.get_by_role("button", name="OK").click()
     expect(marker).to_have_class(re.compile(".*umap-ball-icon.*"))
 
@@ -205,7 +202,6 @@ def test_deleting_datalayer_should_remove_from_browser_and_layers_list(
     expect(panel.get_by_text("test datalayer")).to_be_visible()
     expect(edit_panel.get_by_text("test datalayer")).to_be_visible()
     page.locator(".panel.right").get_by_title("Delete layer").click()
-    page.get_by_role("button", name="OK").click()
     expect(panel.get_by_text("test datalayer")).to_be_hidden()
     expect(edit_panel.get_by_text("test datalayer")).to_be_hidden()
 
@@ -219,7 +215,6 @@ def test_deleting_datalayer_should_remove_from_caption(
     page.get_by_role("button", name="Manage layers").click()
     expect(panel.get_by_text("test datalayer")).to_be_visible()
     page.locator(".panel.right").get_by_title("Delete layer").click()
-    page.get_by_role("button", name="OK").click()
     expect(panel.get_by_text("test datalayer")).to_be_hidden()
 
 

umap/tests/integration/test_edit_map.py

@@ -226,3 +226,18 @@ def test_hover_tooltip_setting_should_be_persistent(live_server, map, page):
         - text: always never on hover
     """)
     expect(page.locator(".umap-field-showLabel input[value=null]")).to_be_checked()
+
+
+def test_can_edit_map_tags(live_server, map, page):
+    map.settings["properties"]["tags"] = ["arts"]
+    map.edit_status = Map.ANONYMOUS
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
+    page.get_by_role("button", name="Edit map name and caption").click()
+    page.get_by_text("Tags").click()
+    expect(page.get_by_label("Art and Culture")).to_be_checked()
+    page.get_by_label("Cycling").check()
+    with page.expect_response(re.compile("./update/settings/.*")):
+        page.get_by_role("button", name="Save").click()
+    saved = Map.objects.get(pk=map.pk)
+    assert saved.tags == ["arts", "cycling"]

umap/tests/integration/test_edit_polygon.py

@@ -117,8 +117,7 @@ def test_should_reset_style_on_cancel(live_server, openmap, page, bootstrap):
     expect(page.locator(".leaflet-overlay-pane path[fill='GoldenRod']")).to_have_count(
         1
     )
-    page.get_by_role("button", name="Cancel edits").click()
-    page.locator("dialog").get_by_role("button", name="OK").click()
+    page.locator(".edit-undo").click()
     expect(page.locator(".leaflet-overlay-pane path[fill='DarkBlue']")).to_have_count(1)
 
 

umap/tests/integration/test_import.py

@@ -86,8 +86,8 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
     expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
         "Imported map"
     )
-    expect(page.get_by_text("Tunnels")).to_be_visible()
-    expect(page.get_by_text("Cities")).to_be_visible()
+    expect(page.locator(".panel.left").get_by_text("Tunnels")).to_be_visible()
+    expect(page.locator(".panel.left").get_by_text("Cities")).to_be_visible()
     expect(page.locator(".leaflet-control-minimap")).to_be_visible()
     expect(
         page.locator('img[src="https://tile.openstreetmap.fr/hot/6/32/21.png"]')
@@ -650,6 +650,46 @@ def test_create_remote_data(page, live_server, tilelayer):
     )
 
 
+def test_create_remote_data_from_umap_backup(page, live_server, tilelayer):
+    def handle(route):
+        route.fulfill(
+            json={
+                "type": "FeatureCollection",
+                "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {},
+                        "geometry": {
+                            "type": "Point",
+                            "coordinates": [4.3375, 51.2707],
+                        },
+                    }
+                ],
+            }
+        )
+
+    page.route("https://remote.org/data.json", handle)
+    page.goto(f"{live_server.url}/map/new/")
+    expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
+    page.get_by_title("Import data").click()
+    file_input = page.locator("input[type='file']")
+    with page.expect_file_chooser() as fc_info:
+        file_input.click()
+    file_chooser = fc_info.value
+    path = Path(__file__).parent.parent / "fixtures/remote_data.umap"
+    file_chooser.set_files(path)
+    page.get_by_role("button", name="Import data", exact=True).click()
+    page.get_by_title("Open browser").click()
+    layers = page.locator(".umap-browser .datalayer")
+    expect(layers).to_have_count(1)
+    expect(page.locator(".leaflet-marker-icon")).to_be_visible()
+    page.get_by_role("button", name="Edit", exact=True).click()
+    page.locator("summary").filter(has_text="Remote data").click()
+    expect(page.locator('.panel input[name="url"]')).to_have_value(
+        "https://remote.org/data.json"
+    )
+
+
 def test_import_geojson_from_url(page, live_server, tilelayer):
     def handle(route):
         route.fulfill(
@@ -870,3 +910,20 @@ def test_import_from_multiple_files(live_server, page, tilelayer):
     page.get_by_role("button", name="Import data", exact=True).click()
     # Two in one file, one in the other
     expect(markers).to_have_count(3)
+
+
+def test_umap_import_with_iconurl(live_server, tilelayer, page):
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Import data").click()
+    file_input = page.locator("input[type='file']")
+    with page.expect_file_chooser() as fc_info:
+        file_input.click()
+    file_chooser = fc_info.value
+    path = Path(__file__).parent.parent / "fixtures/test_upload_data_with_iconurl.umap"
+    file_chooser.set_files(path)
+    page.get_by_role("button", name="Import data", exact=True).click()
+    expect(
+        page.locator(
+            'img[src="https://umap.incubateur.anct.gouv.fr/uploads/pictogram/car-24.png"]'
+        )
+    ).to_have_count(2)

umap/tests/integration/test_optimistic_merge.py

@@ -292,9 +292,10 @@ def test_should_display_alert_on_conflict(context, live_server, datalayer, openm
     # Change name on page two and save
     page_two.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
     page_two.locator('input[name="name"]').fill("name from page two")
+    page_two.wait_for_timeout(300)  # Time for the input debounce.
 
     # Map should be in dirty status
-    expect(page_two.get_by_text("Cancel edits")).to_be_visible()
+    expect(page_two.get_by_text("Save", exact=True)).to_be_enabled()
     with page_two.expect_response(re.compile(r".*/datalayer/update/.*")):
         page_two.get_by_role("button", name="Save").click()
 
@@ -306,7 +307,7 @@ def test_should_display_alert_on_conflict(context, live_server, datalayer, openm
     # We should have an alert with some actions
     expect(page_two.get_by_text("Whoops! Other contributor(s) changed")).to_be_visible()
     # Map should still be in dirty status
-    expect(page_two.get_by_text("Cancel edits")).to_be_visible()
+    expect(page_two.get_by_text("Save", exact=True)).to_be_enabled()
 
     # Override data from page two
     with page_two.expect_response(re.compile(r".*/datalayer/update/.*")):
@@ -317,4 +318,4 @@ def test_should_display_alert_on_conflict(context, live_server, datalayer, openm
     data = json.loads(Path(saved.geojson.path).read_text())
     assert data["features"][0]["properties"]["name"] == "name from page two"
     # Map should not be in dirty status anymore
-    expect(page_two.get_by_text("Cancel edits")).to_be_hidden()
+    expect(page_two.get_by_text("Save", exact=True)).to_be_disabled()

umap/tests/integration/test_owned_map.py

@@ -241,7 +241,6 @@ def test_can_delete_datalayer(live_server, map, login, datalayer):
     expect(markers).to_have_count(1)
     page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Delete layer").click()
-    page.get_by_role("button", name="OK").click()
     with page.expect_response(re.compile(r".*/datalayer/delete/.*")):
         page.get_by_role("button", name="Save").click()
     expect(markers).to_have_count(0)

umap/tests/integration/test_save.py

@@ -16,17 +16,15 @@ def test_reseting_map_would_remove_from_save_queue(
     page.on("request", register_request)
     page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("new name")
-    page.get_by_role("button", name="Cancel edits").click()
-    page.get_by_role("button", name="OK").click()
+    page.locator(".edit-undo").click()
     page.wait_for_timeout(500)
-    page.get_by_role("button", name="Edit").click()
     page.get_by_role("button", name="Manage layers").click()
     page.get_by_role("button", name="Edit", exact=True).click()
     page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("new datalayer name")
     page.wait_for_timeout(300)  # Time of the Input debounce
     with page.expect_response(re.compile(".*/datalayer/update/.*")):
-        page.get_by_role("button", name="Save").click()
+        page.get_by_role("button", name="Save", exact=True).click()
     assert len(requests) == 1
     assert requests == [
         (