umap-project 2.1.3__py3-none-any.whl → 2.2.0b0__py3-none-any.whl

umap/static/umap/vendors/iconlayers/iconLayers.js

@@ -307,4 +307,4 @@
     iconLayers.Constructor = IconLayers;
 
     return iconLayers;
-});
+});

umap/templates/umap/css.html

@@ -23,8 +23,10 @@
       href="{% static 'umap/vendors/iconlayers/iconLayers.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/vars.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/font.css' %}" />
+<link rel="stylesheet" href="{% static 'umap/css/icon.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/base.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/content.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/nav.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/map.css' %}" />
+<link rel="stylesheet" href="{% static 'umap/css/panel.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/theme.css' %}" />

umap/templates/umap/js.html

@@ -42,7 +42,6 @@
 <script src="{% static 'umap/vendors/tokml/tokml.js' %}" defer></script>
 <script src="{% static 'umap/vendors/locatecontrol/L.Control.Locate.min.js' %}"
         defer></script>
-<script src="{% static 'umap/vendors/dompurify/purify.min.js' %}" defer></script>
 <script src="{% static 'umap/vendors/colorbrewer/colorbrewer.js' %}" defer></script>
 <script src="{% static 'umap/vendors/simple-statistics/simple-statistics.min.js' %}"
         defer></script>

umap/templates/umap/map_detail.html

@@ -18,6 +18,10 @@
         type="application/json+oembed"
         href="{{ oembed_absolute_uri }}?url={{ quoted_absolute_uri }}&format=json"
         title="{{ map.name }} oEmbed URL" />
+  <meta property="og:url" content="{{ SITE_URL }}{{ map.get_absolute_url }}" />
+  <meta property="og:title" content="{{ map.name }}" />
+  <meta property="og:description" content="{{ map.description }}" />
+  <meta property="og:site_name" content="{{ SITE_NAME }}" />
 {% endblock extra_head %}
 {% block content %}
   {% block map_init %}

umap/templates/umap/map_table.html

@@ -68,16 +68,18 @@
                   <span class="sr-only">{% translate "Clone" %}</span>
                 </button>
               </form>
-              <form action="{% url 'map_delete' map_inst.pk %}"
-                    method="post"
-                    class="map-delete">
-                {% csrf_token %}
-                <input type="hidden" name="next" value="{% url 'user_dashboard' %}">
-                <button class="map-icon" type="submit" title="{% translate "Delete" %}">
-                  <span class="icon-dashboard icon-delete"></span>
-                  <span class="sr-only">{% translate "Delete" %}</span>
-                </button>
-              </form>
+              {% if map_inst|can_delete_map:request %}
+                <form action="{% url 'map_delete' map_inst.pk %}"
+                      method="post"
+                      class="map-delete">
+                  {% csrf_token %}
+                  <input type="hidden" name="next" value="{% url 'user_dashboard' %}">
+                  <button class="map-icon" type="submit" title="{% translate "Delete" %}">
+                    <span class="icon-dashboard icon-delete"></span>
+                    <span class="sr-only">{% translate "Delete" %}</span>
+                  </button>
+                </form>
+              {% endif %}
             </td>
           </tr>
         {% endwith %}

umap/templatetags/umap_tags.py

@@ -43,6 +43,11 @@ def tilelayer_preview(tilelayer):
     return output
 
 
+@register.filter
+def can_delete_map(map, request):
+    return map.can_delete(request.user, request)
+
+
 @register.filter
 def notag(s):
     return s.replace("<", "&lt;")

umap/tests/integration/conftest.py

@@ -1,9 +1,20 @@
+import os
+
 import pytest
 
 
 @pytest.fixture(autouse=True)
 def set_timeout(context):
-    context.set_default_timeout(5000)
+    context.set_default_timeout(int(os.environ.get("PLAYWRIGHT_TIMEOUT", 7500)))
+    context.set_default_navigation_timeout(
+        int(os.environ.get("PLAYWRIGHT_TIMEOUT", 7500))
+    )
+
+
+@pytest.fixture(autouse=True)
+def mock_osm_tiles(page):
+    if not bool(os.environ.get("PLAYWRIGHT_USE_TILES", False)):
+        page.route("*/**/osmfr/**", lambda route: route.fulfill())
 
 
 @pytest.fixture

umap/tests/integration/test_anonymous_owned_map.py

@@ -34,7 +34,7 @@ def test_map_load_with_owner(anonymap, live_server, owner_session):
     expect(save).to_be_visible()
     add_marker = owner_session.get_by_title("Draw a marker")
     expect(add_marker).to_be_visible()
-    edit_settings = owner_session.get_by_title("Edit map properties")
+    edit_settings = owner_session.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_visible()
     edit_permissions = owner_session.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_visible()
@@ -65,7 +65,7 @@ def test_map_load_with_anonymous_but_editable_layer(
     expect(save).to_be_visible()
     add_marker = page.get_by_title("Draw a marker")
     expect(add_marker).to_be_visible()
-    edit_settings = page.get_by_title("Edit map properties")
+    edit_settings = page.get_by_title("Map advanced properties")
     expect(edit_settings).to_be_hidden()
     edit_permissions = page.get_by_title("Update permissions and editors")
     expect(edit_permissions).to_be_hidden()
@@ -114,12 +114,13 @@ def test_anonymous_can_add_marker_on_editable_layer(
     marker = page.locator(".leaflet-marker-icon")
     map_el = page.locator("#map")
     expect(marker).to_have_count(2)
-    expect(map_el).not_to_have_class(re.compile("umap-ui"))
+    panel = page.locator(".panel.right.on")
+    expect(panel).to_be_hidden()
     add_marker.click()
     map_el.click(position={"x": 100, "y": 100})
     expect(marker).to_have_count(3)
     # Edit panel is open
-    expect(map_el).to_have_class(re.compile("umap-ui"))
+    expect(panel).to_be_visible()
     datalayer_select = page.locator("select[name='datalayer']")
     expect(datalayer_select).to_be_visible()
     options = page.locator("select[name='datalayer'] option")
@@ -132,7 +133,7 @@ def test_can_change_perms_after_create(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/en/map/new")
     # 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")
     save = page.get_by_role("button", name="Save")
     expect(save).to_be_visible()

umap/tests/integration/test_browser.py

@@ -63,7 +63,7 @@ def bootstrap(map, live_server):
 
 def test_data_browser_should_be_open(live_server, page, bootstrap, map):
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    el = page.locator(".umap-browse-data")
+    el = page.locator(".umap-browser")
     expect(el).to_be_visible()
     expect(page.get_by_text("one point in france")).to_be_visible()
     expect(page.get_by_text("one line in new zeland")).to_be_visible()
@@ -81,7 +81,7 @@ def test_data_browser_should_be_filterable(live_server, page, bootstrap, map):
     expect(filter_).to_be_visible()
     filter_.type("poly")
     expect(page.get_by_title("Features in this layer: 1/3")).to_be_visible()
-    expect(page.get_by_title("Features in this layer: 1/3")).to_have_text("1/3")
+    expect(page.get_by_title("Features in this layer: 1/3")).to_have_text("(1/3)")
     expect(page.get_by_text("one point in france")).to_be_hidden()
     expect(page.get_by_text("one line in new zeland")).to_be_hidden()
     expect(page.get_by_text("one polygon in greenland")).to_be_visible()
@@ -159,20 +159,19 @@ def test_data_browser_bbox_filter_should_be_persistent(
     el = page.get_by_text("Current map view")
     expect(el).to_be_visible()
     el.click()
-    browser = page.locator("#umap-ui-container")
+    browser = page.locator(".panel.left.on")
     expect(browser.get_by_text("one point in france")).to_be_visible()
     expect(browser.get_by_text("one line in new zeland")).to_be_hidden()
     expect(browser.get_by_text("one polygon in greenland")).to_be_hidden()
     # Close and reopen the browser to make sure this settings is persistent
-    close = browser.get_by_text("Close")
+    close = browser.get_by_title("Close")
     close.click()
     expect(browser).to_be_hidden()
     sleep(0.5)
     expect(browser.get_by_text("one point in france")).to_be_hidden()
     expect(browser.get_by_text("one line in new zeland")).to_be_hidden()
     expect(browser.get_by_text("one polygon in greenland")).to_be_hidden()
-    page.get_by_title("See data layers").click()
-    page.get_by_role("button", name="Browse data").click()
+    page.get_by_title("See layers").click()
     expect(browser.get_by_text("one point in france")).to_be_visible()
     expect(browser.get_by_text("one line in new zeland")).to_be_hidden()
     expect(browser.get_by_text("one polygon in greenland")).to_be_hidden()
@@ -185,7 +184,7 @@ def test_data_browser_bbox_filtered_is_clickable(live_server, page, bootstrap, m
     el = page.get_by_text("Current map view")
     expect(el).to_be_visible()
     el.click()
-    browser = page.locator("#umap-ui-container")
+    browser = page.locator(".panel.left.on")
     expect(browser.get_by_text("one point in france")).to_be_visible()
     expect(browser.get_by_text("one line in new zeland")).to_be_hidden()
     expect(browser.get_by_text("one polygon in greenland")).to_be_hidden()
@@ -217,18 +216,6 @@ def test_data_browser_with_variable_in_name(live_server, page, bootstrap, map):
     expect(page.get_by_text("one polygon in greenland (polygon)")).to_be_visible()
 
 
-def test_can_open_databrowser_from_layers_list(live_server, map, page, bootstrap):
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    page.get_by_title("See data layers").click()
-    page.get_by_role("button", name="Browse data").click()
-    browser = page.locator(".umap-browse-data")
-    expect(browser).to_be_visible()
-    expect(browser.get_by_text("test datalayer")).to_be_visible()
-    expect(browser.get_by_text("one point in france")).to_be_visible()
-    expect(browser.get_by_text("one line in new zeland")).to_be_visible()
-    expect(browser.get_by_text("one polygon in greenland")).to_be_visible()
-
-
 def test_should_sort_features_in_natural_order(live_server, map, page):
     map.settings["properties"]["onLoadPanel"] = "databrowser"
     map.save()
@@ -238,7 +225,7 @@ def test_should_sort_features_in_natural_order(live_server, map, page):
     datalayer_data["features"][2]["properties"]["name"] = "100. a line"
     DataLayerFactory(map=map, data=datalayer_data)
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    features = page.locator(".umap-browse-data li")
+    features = page.locator(".umap-browser .datalayer li")
     expect(features).to_have_count(3)
     expect(features.nth(0)).to_have_text("1. a poly")
     expect(features.nth(1)).to_have_text("9. a marker")
@@ -249,7 +236,7 @@ def test_should_redraw_list_on_feature_delete(live_server, openmap, page, bootst
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
     # Enable edit
     page.get_by_role("button", name="Edit").click()
-    buttons = page.locator(".umap-browse-data li .feature-delete")
+    buttons = page.locator(".umap-browser .datalayer li .icon-delete")
     expect(buttons).to_have_count(3)
     page.on("dialog", lambda dialog: dialog.accept())
     buttons.nth(0).click()
@@ -265,7 +252,7 @@ def test_should_show_header_for_display_on_load_false(
     datalayer.settings["name"] = "This layer is not loaded"
     datalayer.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    browser = page.locator(".umap-browse-data")
+    browser = page.locator(".umap-browser")
     expect(browser).to_be_visible()
     expect(browser.get_by_text("This layer is not loaded")).to_be_visible()
 
@@ -279,7 +266,7 @@ def test_should_use_color_variable(live_server, map, page):
     datalayer_data["features"][2]["properties"]["mycolor"] = "DarkGreen"
     DataLayerFactory(map=map, data=datalayer_data)
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    features = page.locator(".umap-browse-data li .feature-color")
+    features = page.locator(".umap-browser .datalayer li .feature-color")
     expect(features).to_have_count(3)
     # DarkGreen
     expect(features.nth(0)).to_have_css("background-color", "rgb(0, 100, 0)")
@@ -295,7 +282,7 @@ def test_should_allow_to_toggle_datalayer_visibility(live_server, map, page, boo
     paths = page.locator(".leaflet-overlay-pane path")
     expect(markers).to_have_count(1)
     expect(paths).to_have_count(2)
-    toggle = page.locator("#umap-ui-container").get_by_title("Show/hide layer")
+    toggle = page.locator(".umap-browser").get_by_title("Show/hide layer")
     toggle.click()
     expect(markers).to_have_count(0)
     expect(paths).to_have_count(0)
@@ -303,7 +290,7 @@ def test_should_allow_to_toggle_datalayer_visibility(live_server, map, page, boo
 
 def test_should_have_edit_buttons_in_edit_mode(live_server, openmap, page, bootstrap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    browser = page.locator("#umap-ui-container")
+    browser = page.locator(".umap-browser")
     edit_layer = browser.get_by_title("Edit", exact=True)
     in_table = browser.get_by_title("Edit properties in a table")
     delete_layer = browser.get_by_title("Delete layer")

umap/tests/integration/test_choropleth.py

@@ -49,7 +49,7 @@ def test_basic_choropleth_map_with_custom_brewer(openmap, live_server, page):
     # Now change brewer from UI
     page.get_by_role("button", name="Edit").click()
     page.get_by_role("link", name="Manage layers").click()
-    page.locator("#umap-ui-container").get_by_title("Edit", exact=True).click()
+    page.locator(".panel").get_by_title("Edit", exact=True).click()
     page.get_by_role("heading", name="Choropleth: settings").click()
     page.locator('select[name="brewer"]').select_option("Greens")
 

umap/tests/integration/test_dashboard.py

@@ -36,3 +36,13 @@ def test_dashboard_map_preview(map, live_server, datalayer, login):
     expect(dialog).to_be_visible()
     # Let's check we have a marker on it, so we can guess the map loaded correctly
     expect(dialog.locator(".leaflet-marker-icon")).to_be_visible()
+
+
+def test_no_delete_button_for_editors(map, live_server, datalayer, login, user):
+    map.name = "Map I cannot delete"
+    map.editors.add(user)
+    map.save()
+    page = login(user)
+    page.goto(f"{live_server.url}/en/me")
+    expect(page.get_by_text("Map I cannot delete")).to_be_visible()
+    expect(page.get_by_title("Delete")).to_be_hidden()

umap/tests/integration/test_datalayer.py

@@ -20,14 +20,14 @@ def set_options(datalayer, **options):
 
 def test_honour_displayOnLoad_false(map, live_server, datalayer, page):
     set_options(datalayer, displayOnLoad=False)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
-    layers = page.locator(".umap-browse-datalayers li")
+    layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
-    layers_off = page.locator(".umap-browse-datalayers li.off")
+    layers_off = page.locator(".umap-browser .datalayer.off")
     expect(layers).to_have_count(1)
     expect(layers_off).to_have_count(1)
-    page.get_by_role("button", name="See data layers").click()
+    page.get_by_role("button", name="See layers").click()
     page.get_by_label("Zoom in").click()
     expect(markers).to_be_hidden()
     page.get_by_title("Show/hide layer").click()
@@ -109,10 +109,12 @@ def test_should_honour_color_variable(live_server, map, page):
 
 
 def test_datalayers_in_query_string(live_server, datalayer, map, page):
+    map.settings["properties"]["onLoadPanel"] = "datalayers"
+    map.save()
     with_old_id = DataLayerFactory(old_id=134, map=map, name="with old id")
     set_options(with_old_id, name="with old id")
-    visible = page.locator(".leaflet-control-browse li:not(.off) span")
-    hidden = page.locator(".leaflet-control-browse li.off span")
+    visible = page.locator(".umap-browser .datalayer:not(.off) .datalayer-name")
+    hidden = page.locator(".umap-browser .datalayer.off .datalayer-name")
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(visible).to_have_count(2)
     expect(hidden).to_have_count(0)

umap/tests/integration/test_edit_datalayer.py

@@ -1,3 +1,4 @@
+import platform
 import re
 
 from playwright.sync_api import expect
@@ -11,16 +12,13 @@ def test_should_have_fieldset_for_layer_type_properties(page, live_server, tilel
     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")
@@ -56,32 +54,32 @@ def test_cancel_deleting_datalayer_should_restore(
     live_server, openmap, datalayer, page
 ):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    layers = page.locator(".umap-browse-datalayers li")
+    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("#umap-ui-container").get_by_title("Delete layer").click()
+    page.locator(".panel.right").get_by_title("Delete layer").click()
     expect(markers).to_have_count(0)
-    page.get_by_role("button", name="See data layers").click()
+    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(".leaflet-control-browse").get_by_text("test datalayer")
-    ).to_be_visible()
+    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")
-    layers = page.locator(".umap-browse-datalayers li")
+    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("#umap-ui-container").get_by_title("Edit", exact=True).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)
@@ -105,7 +103,7 @@ def test_can_change_icon_class(live_server, openmap, page):
     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("#umap-ui-container").get_by_title("Edit", exact=True).click()
+    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()
@@ -118,12 +116,12 @@ def test_can_change_name(live_server, openmap, page, datalayer):
         f"{live_server.url}{openmap.get_absolute_url()}?edit&datalayersControl=expanded"
     )
     page.get_by_role("link", name="Manage layers").click()
-    page.locator("#umap-ui-container").get_by_title("Edit", exact=True).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(".leaflet-control-browse li span")).to_contain_text("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()
@@ -149,7 +147,7 @@ def test_can_create_new_datalayer(live_server, openmap, page, datalayer):
     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("#umap-ui-container").get_by_title("Edit", exact=True).first.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()
@@ -173,8 +171,15 @@ def test_can_restore_version(live_server, openmap, page, datalayer):
         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("#umap-ui-container").get_by_title("Edit", exact=True).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()

umap/tests/integration/test_edit_map.py

@@ -1,15 +1,195 @@
+import re
+
 from playwright.sync_api import expect
 
+from umap.models import DataLayer, Map
+
+from ..base import DataLayerFactory
+
 
 def test_can_edit_name(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/en/map/new/")
 
-    page.get_by_title("Edit map properties").click()
+    page.get_by_title("Edit map name and caption").click()
     name_input = page.locator('.map-metadata input[name="name"]')
     expect(name_input).to_be_visible()
     name_input.click()
     name_input.press("Control+a")
     name_input.fill("New map name")
-    expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
+    expect(page.locator(".umap-main-edit-toolbox .map-name").nth(0)).to_have_text(
         "New map name"
     )
+
+
+def test_map_name_impacts_ui(live_server, page, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    gear_icon = page.get_by_title("Edit map name and caption")
+    expect(gear_icon).to_be_visible()
+    gear_icon.click()
+
+    name_input = page.locator("form").locator('input[name="name"]').first
+    expect(name_input).to_be_visible()
+
+    name_input.fill("something else")
+
+    expect(page.get_by_role("button", name="something else").nth(1)).to_be_visible()
+
+
+def test_zoomcontrol_impacts_ui(live_server, page, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    gear_icon = page.get_by_title("Map advanced properties")
+    expect(gear_icon).to_be_visible()
+    gear_icon.click()
+
+    # Should be visible by default
+    zoom_in = page.get_by_label("Zoom in")
+    zoom_out = page.get_by_label("Zoom out")
+
+    expect(zoom_in).to_be_visible()
+    expect(zoom_out).to_be_visible()
+
+    # Hide them
+    page.get_by_role("heading", name="User interface options").click()
+    hide_zoom_controls = (
+        page.locator("div")
+        .filter(has_text=re.compile(r"^Display the zoom control"))
+        .locator("label")
+        .nth(2)
+    )
+    hide_zoom_controls.click()
+
+    expect(zoom_in).to_be_hidden()
+    expect(zoom_out).to_be_hidden()
+
+
+def test_map_color_impacts_data(live_server, page, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    gear_icon = page.get_by_title("Map advanced properties")
+    expect(gear_icon).to_be_visible()
+    gear_icon.click()
+
+    # Click on the Draw a marker button on a new map.
+    create_marker_p1 = page.get_by_title("Draw a marker")
+    expect(create_marker_p1).to_be_visible()
+    create_marker_p1.click()
+
+    # Add a new marker
+    marker_pane_p1 = page.locator(".leaflet-marker-pane > div")
+    map_el = page.locator("#map")
+    map_el.click(position={"x": 200, "y": 200})
+    expect(marker_pane_p1).to_have_count(1)
+
+    # Change the default color
+    page.get_by_role("heading", name="Shape properties").click()
+    page.locator("#umap-feature-shape-properties").get_by_text("define").first.click()
+    page.get_by_title("Lime", exact=True).click()
+
+    # Assert the new color was used
+    marker_style = page.locator(".leaflet-marker-icon .icon_container").get_attribute(
+        "style"
+    )
+    assert "lime" in marker_style
+
+
+def test_limitbounds_impacts_ui(live_server, page, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    gear_icon = page.get_by_title("Map advanced properties")
+    expect(gear_icon).to_be_visible()
+    gear_icon.click()
+
+    page.get_by_role("heading", name="Limit bounds").click()
+    default_zoom_url = f"{live_server.url}/en/map/new/#5/51.110/7.053"
+    page.goto(default_zoom_url)
+    page.get_by_role("button", name="Use current bounds").click()
+
+    zoom_in = page.get_by_label("Zoom in")
+    zoom_out = page.get_by_label("Zoom out")
+
+    # It should be possible to zoom in
+    zoom_in.click()
+    page.wait_for_timeout(500)
+    assert page.url != default_zoom_url
+
+    # But not to zoom out of the window
+    zoom_out.click()  # back to normal
+    page.wait_for_timeout(500)
+    assert "leaflet-disabled" in zoom_out.get_attribute("class")
+
+
+def test_sortkey_impacts_datalayerindex(map, live_server, page):
+    # Create points with a "key" property.
+    # But we want them to sort by key (First, Second, Third)
+    DataLayerFactory(
+        map=map,
+        data={
+            "type": "FeatureCollection",
+            "features": [
+                {
+                    "type": "Feature",
+                    "geometry": {
+                        "type": "Point",
+                        "coordinates": [13.6, 48.5],
+                    },
+                    "properties": {"name": "Z First", "key": "1st Point"},
+                },
+                {
+                    "type": "Feature",
+                    "geometry": {
+                        "type": "Point",
+                        "coordinates": [13.7, 48.4],
+                    },
+                    "properties": {"name": "Y Second", "key": "2d Point"},
+                },
+                {
+                    "type": "Feature",
+                    "geometry": {
+                        "type": "Point",
+                        "coordinates": [13.5, 48.6],
+                    },
+                    "properties": {"name": "X Third", "key": "3rd Point"},
+                },
+            ],
+        },
+    )
+    map.edit_status = Map.ANONYMOUS
+    datalayer = map.datalayer_set.first()
+    datalayer.edit_status = DataLayer.ANONYMOUS
+    datalayer.save()
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+
+    # By default, features are sorted by name  (Third, Second, First)
+    page.get_by_role("button", name="See layers").click()
+    page.get_by_role("heading", name="Show/hide layer").locator("i").click()
+
+    first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)
+    second_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(1)
+    third_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(2)
+    assert "X Third" == first_listed_feature.text_content()
+    assert "Y Second" == second_listed_feature.text_content()
+    assert "Z First" == third_listed_feature.text_content()
+
+    # Change the default sortkey to be "key"
+    page.get_by_role("button", name="Edit").click()
+    page.get_by_role("link", name="Map advanced properties").click()
+    page.get_by_role("heading", name="Default properties").click()
+
+    # Click "define"
+    page.locator(".panel .umap-field-sortKey .define").click()
+    page.locator('input[name="sortKey"]').click()
+    page.locator('input[name="sortKey"]').fill("key")
+
+    # Click the checkmark to apply the changes
+    page.locator(".panel .umap-field-sortKey .blur-button").click()
+
+    # Features should be sorted by key  (First, Second, Third)
+    first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)
+    second_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(1)
+    third_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(2)
+    assert "Z First" == first_listed_feature.text_content()
+    assert "Y Second" == second_listed_feature.text_content()
+    assert "X Third" == third_listed_feature.text_content()