umap-project 2.8.2__py3-none-any.whl → 2.9.0b0__py3-none-any.whl

umap/templates/registration/login.html

@@ -3,7 +3,7 @@
 {% load i18n %}
 
 {% block head_title %}
-  {% trans "Login" %}
+  {% trans "Login" %} - {{ SITE_DESCRIPTION }}
 {% endblock head_title %}
 {% load umap_tags i18n %}
 
@@ -55,10 +55,7 @@
         <ul class="login-grid block-grid">
           {% for name in backends.backends %}
             <li>
-              <a rel="nofollow"
-                 href="{% url "social:begin" name %}"
-                 class="umap-login-popup login-{{ name }}"
-                 title="{{ name|title }}"></a>
+              {% include "umap/components/provider.html" with name=name %}
             </li>
           {% endfor %}
         </ul>

umap/templates/umap/about.html

@@ -1,4 +1,9 @@
 {% extends "umap/content.html" %}
+{% load i18n %}
+
+{% block head_title %}
+  {% translate "About" %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
 
 {% block maincontent %}
   {% include "umap/about_summary.html" %}

umap/templates/umap/about_summary.html

@@ -60,10 +60,10 @@
       {% spaceless %}
         <div class="button-bar {% if demo_map %}half{% endif %}">
           {% if not UMAP_READONLY %}
-            <a href="{% url 'map_new' %}" class="button button-primary half">{% trans "Create a map" %}</a>
+            <a href="{% url 'map_new' %}" class="button button-primary">{% trans "Create a map" %}</a>
           {% endif %}
           {% if demo_map %}
-            <a href="{{ demo_map.get_absolute_url }}" class="button half neutral">{% trans "Play with the demo" %}</a>
+            <a href="{{ demo_map.get_absolute_url }}" class="button neutral">{% trans "Play with the demo" %}</a>
           {% endif %}
         </div>
       {% endspaceless %}

umap/templates/umap/components/provider.html

@@ -0,0 +1,8 @@
+{% load static %}
+<a href="{% url "social:begin" name %}"
+   class="umap-login-popup"
+   title="{{ name|title }}">
+    {% with "umap/img/providers/"|add:name|add:".png" as path %}
+     <img src="{% static path %}" width="92px" height="92px" alt="{{ name }}" />
+    {% endwith %}
+ </a>

umap/templates/umap/js.html

@@ -30,8 +30,6 @@
 <script src="{% static 'umap/vendors/fullscreen/Leaflet.fullscreen.min.js' %}"
         defer></script>
 <script src="{% static 'umap/vendors/toolbar/leaflet.toolbar.js' %}" defer></script>
-<script src="{% static 'umap/vendors/formbuilder/Leaflet.FormBuilder.js' %}"
-        defer></script>
 <script src="{% static 'umap/vendors/measurable/Leaflet.Measurable.js' %}"
         defer></script>
 <script src="{% static 'umap/vendors/iconlayers/iconLayers.js' %}" defer></script>
@@ -40,7 +38,6 @@
 <script src="{% static 'umap/vendors/simple-statistics/simple-statistics.min.js' %}"
         defer></script>
 <script src="{% static 'umap/js/umap.core.js' %}" defer></script>
-<script src="{% static 'umap/js/umap.forms.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.controls.js' %}" defer></script>
 <script type="module" src="{% static 'umap/js/components/fragment.js' %}" defer></script>
 {% endautoescape %}

umap/templates/umap/map_detail.html

@@ -3,7 +3,7 @@
 {% load umap_tags i18n %}
 
 {% block head_title %}
-  {{ map.name }} - {{ SITE_NAME }}
+  {{ map.name }} - {{ SITE_NAME }} - {{ SITE_DESCRIPTION }}
 {% endblock head_title %}
 {% block body_class %}
   map_detail

umap/templates/umap/password_change.html

@@ -2,6 +2,10 @@
 
 {% load i18n %}
 
+{% block head_title %}
+  {% translate "Password change" %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
+
 {% block content %}
   <h2 class="section">
     {% trans "Password change" %}

umap/templates/umap/password_change_done.html

@@ -2,6 +2,10 @@
 
 {% load i18n %}
 
+{% block head_title %}
+  {% translate "Password change successful" %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
+
 {% block content %}
   <h2 class="section">
     {% trans "Password change successful" %}

umap/templates/umap/search.html

@@ -2,6 +2,10 @@
 
 {% load i18n %}
 
+{% block head_title %}
+  {% translate "Explore maps" %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
+
 {% block messages %}
   {# We don't want maps from the results list to display errors in the main page. #}
 {% endblock messages %}

umap/templates/umap/team_confirm_delete.html

@@ -2,6 +2,10 @@
 
 {% load i18n %}
 
+{% block head_title %}
+  {% translate "Team deletion" %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
+
 {% block maincontent %}
   {% include "umap/dashboard_menu.html" with selected="teams" %}
   <div class="wrapper">

umap/templates/umap/team_detail.html

@@ -2,6 +2,10 @@
 
 {% load i18n %}
 
+{% block head_title %}
+  {% blocktranslate %}{{ current_team }}’s maps{% endblocktranslate %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
+
 {% block maincontent %}
   <div class="wrapper">
       <div class="row">

umap/templates/umap/team_form.html

@@ -2,6 +2,10 @@
 
 {% load i18n %}
 
+{% block head_title %}
+  {% translate "Create or edit a team" %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
+
 {% block maincontent %}
   {% include "umap/dashboard_menu.html" with selected="teams" %}
   <div class="wrapper">

umap/templates/umap/user_dashboard.html

@@ -3,7 +3,7 @@
 {% load i18n static %}
 
 {% block head_title %}
-  {{ SITE_NAME }} - {% trans "My Dashboard" %}
+  {% translate "My Dashboard" %} - {{ SITE_DESCRIPTION }}
 {% endblock head_title %}
 {% block maincontent %}
   {% trans "Search my maps" as placeholder %}

umap/templates/umap/user_teams.html

@@ -2,6 +2,10 @@
 
 {% load i18n %}
 
+{% block head_title %}
+  {% translate "My Teams" %} - {{ SITE_DESCRIPTION }}
+{% endblock head_title %}
+
 {% block maincontent %}
   {% include "umap/dashboard_menu.html" with selected="teams" %}
   <div class="wrapper">

umap/tests/base.py

@@ -127,6 +127,9 @@ class DataLayerFactory(factory.django.DjangoModelFactory):
     def _adjust_kwargs(cls, **kwargs):
         if "data" in kwargs:
             data = copy.deepcopy(kwargs.pop("data"))
+            data.setdefault("_umap_options", {})
+            if "name" in data["_umap_options"] and kwargs["name"] == cls.name:
+                kwargs["name"] = data["_umap_options"]["name"]
             if "settings" not in kwargs:
                 kwargs["settings"] = data.get("_umap_options", {})
         else:
@@ -135,7 +138,6 @@ class DataLayerFactory(factory.django.DjangoModelFactory):
                 **DataLayerFactory.settings._defaults,
                 **kwargs["settings"],
             }
-        data.setdefault("_umap_options", {})
         kwargs["settings"]["name"] = kwargs["name"]
         data["_umap_options"]["name"] = kwargs["name"]
         data.setdefault("type", "FeatureCollection")

umap/tests/integration/conftest.py

@@ -1,12 +1,13 @@
 import os
 import re
-import subprocess
-import time
-from pathlib import Path
 
 import pytest
+from daphne.testing import DaphneProcess
+from django.contrib.staticfiles.handlers import ASGIStaticFilesHandler
 from playwright.sync_api import expect
 
+from umap.asgi import application
+
 from ..base import mock_tiles
 
 
@@ -67,23 +68,15 @@ def login(new_page, settings, live_server):
     return do_login
 
 
-@pytest.fixture
-def websocket_server():
-    # Find the test-settings, and put them in the current environment
-    settings_path = (Path(__file__).parent.parent / "settings.py").absolute().as_posix()
-    os.environ["UMAP_SETTINGS"] = settings_path
-
-    ds_proc = subprocess.Popen(
-        [
-            "umap",
-            "run_websocket_server",
-        ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-    )
-    time.sleep(2)
-    # Ensure it started properly before yielding
-    assert not ds_proc.poll(), ds_proc.stdout.read().decode("utf-8")
-    yield ds_proc
-    # Shut it down at the end of the pytest session
-    ds_proc.terminate()
+@pytest.fixture(scope="function")
+def asgi_live_server(request, live_server):
+    server = DaphneProcess("localhost", lambda: ASGIStaticFilesHandler(application))
+    server.start()
+    server.ready.wait()
+    port = server.port.value
+    server.url = f"http://localhost:{port}"
+
+    yield server
+
+    server.terminate()
+    server.join()

umap/tests/integration/test_basics.py

@@ -8,7 +8,7 @@ from umap.models import Map
 
 def test_page_title(page, live_server):
     page.goto(live_server.url)
-    expect(page).to_have_title("uMap")
+    expect(page).to_have_title("uMap - Online map creator")
 
 
 @pytest.mark.parametrize(
@@ -83,7 +83,7 @@ def test_login_from_map_page(live_server, page, tilelayer, settings, user, conte
         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")
+    expect(login_page).to_have_title("Login - Online map creator")
     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/")):

umap/tests/integration/test_caption.py

@@ -25,6 +25,7 @@ def test_caption(live_server, page, map):
         panel.locator(".caption-item .off").get_by_text(non_loaded.name)
     ).to_be_visible()
     expect(panel.locator(".caption-item").get_by_text(hidden.name)).to_be_hidden()
+    expect(panel.get_by_text("Created at")).to_be_visible()
 
 
 def test_caption_should_display_owner_as_author(live_server, page, map):

umap/tests/integration/test_draw_polygon.py

@@ -484,12 +484,12 @@ def test_vertexmarker_not_shown_if_too_many(live_server, map, page, settings):
     page.get_by_role("button", name="Import data", exact=True).click()
     page.locator("path").click()
     page.get_by_role("link", name="Toggle edit mode (⇧+Click)").click()
-    expect(page.locator("#umap-tooltip-container")).to_contain_text(
+    expect(page.locator(".umap-tooltip-container")).to_contain_text(
         "Please zoom in to edit the geometry"
     )
     expect(page.locator(".leaflet-vertex-icon")).to_be_hidden()
     page.get_by_label("Zoom in").click()
-    expect(page.locator("#umap-tooltip-container")).to_contain_text(
+    expect(page.locator(".umap-tooltip-container")).to_contain_text(
         "Please zoom in to edit the geometry"
     )
     page.get_by_label("Zoom in").click()
@@ -497,6 +497,6 @@ def test_vertexmarker_not_shown_if_too_many(live_server, map, page, settings):
     page.get_by_label("Zoom out").click()
     page.wait_for_timeout(500)
     expect(page.locator(".leaflet-vertex-icon")).to_be_hidden()
-    expect(page.locator("#umap-tooltip-container")).to_contain_text(
+    expect(page.locator(".umap-tooltip-container")).to_contain_text(
         "Please zoom in to edit the geometry"
     )

umap/tests/integration/test_edit_datalayer.py

@@ -103,7 +103,7 @@ def test_can_change_icon_class(live_server, openmap, page):
     expect(page.locator(".umap-circle-icon")).to_be_hidden()
     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.locator(".umap-field-iconClass button.define").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()

umap/tests/integration/test_edit_map.py

@@ -60,8 +60,8 @@ def test_zoomcontrol_impacts_ui(live_server, page, tilelayer):
     # Hide them
     page.get_by_text("User interface options").click()
     hide_zoom_controls = (
-        page.locator("div")
-        .filter(has_text=re.compile(r"^Display the zoom control"))
+        page.locator(".panel")
+        .filter(has_text=re.compile("Display the zoom control"))
         .locator("label")
         .nth(2)
     )
@@ -191,7 +191,7 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
     page.locator('input[name="sortKey"]').fill("key")
 
     # Click the checkmark to apply the changes
-    page.locator(".panel .umap-field-sortKey .blur-button").click()
+    page.locator(".panel .umap-field-sortKey .blur-container button").click()
 
     # Features should be sorted by key  (First, Second, Third)
     first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)

umap/tests/integration/test_edit_polygon.py

@@ -101,7 +101,7 @@ def test_can_remove_stroke(live_server, openmap, page, bootstrap):
     page.get_by_role("link", name="Toggle edit mode").click()
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-stroke .define").first.click()
-    page.locator(".umap-field-stroke label").first.click()
+    page.locator(".umap-field-stroke .show-on-defined label").first.click()
     expect(page.locator(".leaflet-overlay-pane path[stroke='DarkBlue']")).to_have_count(
         0
     )

umap/tests/integration/test_import.py

@@ -24,6 +24,7 @@ def test_layers_list_is_updated(live_server, tilelayer, page):
     page.get_by_role("button", name="Add a layer").click()
     page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("foobar")
+    page.wait_for_timeout(300)  # Time for the input debounce.
     page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
     # Should still work
     page.locator("[name=layer-id]").select_option(label="Import in a new layer")
@@ -70,7 +71,6 @@ def test_umap_import_from_file(live_server, tilelayer, page):
     expect(nonloaded).to_have_count(1)
 
 
-@pytest.mark.skip
 def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
     settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/map/new/")
@@ -122,6 +122,28 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
     expect(paths).to_have_count(3)
 
 
+def test_import_invalid_data(tilelayer, live_server, page):
+    uncaught_errors = []
+    page.on("pageerror", lambda exc: uncaught_errors.append(exc))
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Open browser").click()
+    layers = page.locator(".umap-browser .datalayer")
+    markers = page.locator(".leaflet-marker-icon")
+    paths = page.locator("path")
+    expect(markers).to_have_count(0)
+    expect(paths).to_have_count(0)
+    expect(layers).to_have_count(0)
+    button = page.get_by_title("Import data")
+    expect(button).to_be_visible()
+    button.click()
+    textarea = page.locator(".umap-upload textarea")
+    textarea.fill("invalid data")
+    for format in ["geojson", "csv", "gpx", "kml", "georss", "osm", "umap"]:
+        page.locator('select[name="format"]').select_option(format)
+        page.get_by_role("button", name="Import data", exact=True).click()
+        assert not uncaught_errors, f"Error with format {format}"
+
+
 def test_import_kml_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_title("Open browser").click()

umap/tests/integration/test_optimistic_merge.py

@@ -285,6 +285,7 @@ def test_should_display_alert_on_conflict(context, live_server, datalayer, openm
     # Change name on page one and save
     page_one.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
     page_one.locator('input[name="name"]').fill("name from page one")
+    page_one.wait_for_timeout(300)  # Time for the input debounce.
     with page_one.expect_response(re.compile(r".*/datalayer/update/.*")):
         page_one.get_by_role("button", name="Save").click()
 

umap/tests/integration/test_picto.py

@@ -57,7 +57,7 @@ def test_can_change_picto_at_map_level(openmap, live_server, page, pictos):
     define.click()
     # No picto defined yet, so recent should not be visible
     expect(page.get_by_text("Recent")).to_be_hidden()
-    symbols = page.locator(".umap-pictogram-choice")
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(symbols).to_have_count(2)
     search = page.locator(".umap-pictogram-body input")
     search.type("star")
@@ -90,8 +90,8 @@ def test_can_change_picto_at_datalayer_level(openmap, live_server, page, pictos)
     expect(define).to_be_visible()
     expect(undefine).to_be_hidden()
     define.click()
-    # Map has an icon defined, so it shold open on Recent tab
-    symbols = page.locator(".umap-pictogram-choice")
+    # Map has an icon defined, so it should open on Recent tab
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(page.get_by_text("Recent")).to_be_visible()
     expect(symbols).to_have_count(1)
     symbol_tab = page.get_by_role("button", name="Symbol")
@@ -128,8 +128,8 @@ def test_can_change_picto_at_marker_level(openmap, live_server, page, pictos):
     expect(define).to_be_visible()
     expect(undefine).to_be_hidden()
     define.click()
-    # Map has an icon defined, so it shold open on Recent tab
-    symbols = page.locator(".umap-pictogram-choice")
+    # Map has an icon defined, so it shuold open on Recent tab
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(page.get_by_text("Recent")).to_be_visible()
     expect(symbols).to_have_count(1)
     symbol_tab = page.get_by_role("button", name="Symbol")
@@ -180,7 +180,7 @@ def test_can_use_remote_url_as_picto(openmap, live_server, page, pictos):
     expect(modify).to_be_visible()
     modify.click()
     # Should be on Recent tab
-    symbols = page.locator(".umap-pictogram-choice")
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(page.get_by_text("Recent")).to_be_visible()
     expect(symbols).to_have_count(1)
 
@@ -215,10 +215,10 @@ def test_can_use_char_as_picto(openmap, live_server, page, pictos):
     close.click()
     edit_settings.click()
     shape_settings.click()
-    preview = page.locator(".umap-pictogram-choice")
+    preview = page.locator(".header .umap-pictogram-choice")
     expect(preview).to_be_visible()
     preview.click()
     # Should be on URL tab
-    symbols = page.locator(".umap-pictogram-choice")
+    symbols = page.locator(".umap-pictogram-body .umap-pictogram-choice")
     expect(page.get_by_text("Recent")).to_be_visible()
     expect(symbols).to_have_count(1)

umap/tests/integration/test_save.py

@@ -24,6 +24,7 @@ def test_reseting_map_would_remove_from_save_queue(
     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()
     assert len(requests) == 1

umap/tests/integration/test_star.py

@@ -8,20 +8,24 @@ from umap.models import Star
 pytestmark = pytest.mark.django_db
 
 
-def test_star_control_is_visible_if_logged_in(map, live_server, page, login, user):
+def test_star_button_is_active_if_logged_in(map, live_server, page, login, user):
     login(user)
     assert not Star.objects.count()
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    page.get_by_title("More controls").click()
-    control = page.locator(".leaflet-control-star")
-    expect(control).to_be_visible()
+    page.get_by_title("About").click()
+    button = page.locator(".icon-star")
+    expect(button).to_be_visible()
     with page.expect_response(re.compile(".*/star/")):
-        control.click()
+        button.click()
+    expect(button).to_be_hidden()
+    # Button has changed
+    expect(page.locator(".icon-starred")).to_be_visible()
     assert Star.objects.count() == 1
 
 
-def test_no_star_control_if_not_logged_in(map, live_server, page):
+def test_star_button_inctive_if_not_logged_in(map, live_server, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
-    page.get_by_title("More controls").click()
-    control = page.locator(".leaflet-control-star")
-    expect(control).to_be_hidden()
+    page.get_by_title("About").click()
+    button = page.locator(".icon-star")
+    button.click()
+    expect(page.get_by_text("You must be logged in")).to_be_visible()

umap/tests/integration/test_tableeditor.py

@@ -74,6 +74,7 @@ def test_table_editor(live_server, openmap, datalayer, page):
     page.locator("dialog").get_by_role("button", name="OK").click()
     page.locator("td").nth(2).dblclick()
     page.locator('input[name="newprop"]').fill("newvalue")
+    page.wait_for_timeout(300)  # Time for the input debounce.
     page.keyboard.press("Enter")
     page.locator("thead button[data-property=name]").click()
     page.get_by_role("button", name="Delete this column").click()