umap-project 2.3.0__py3-none-any.whl → 2.4.0__py3-none-any.whl

umap/static/umap/vendors/formbuilder/Leaflet.FormBuilder.js

@@ -61,8 +61,8 @@ L.FormBuilder = L.Evented.extend({
     getter: function (field) {
         var path = field.split('.'),
             value = this.obj;
-        for (var i = 0, l = path.length; i < l; i++) {
-            value = value[path[i]];
+        for (const prop of path) {
+            value = value[prop];
         }
         return value;
     },

umap/templates/umap/components/alerts/alert.html

@@ -0,0 +1,89 @@
+{% load i18n static %}
+
+<style type="text/css">
+  @import "{% static 'umap/js/components/alerts/alert.css' %}";
+</style>
+
+<template id="umap-alert-template">
+  <div role="dialog" class="dark window">
+    <div>
+      <p role="alert"></p>
+    </div>
+    <ul class="buttons">
+      <li>
+        <button class="icon icon-16 icon-close" aria-label="{% translate "Close" %}" data-close></button>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<umap-alert></umap-alert>
+
+<template id="umap-alert-creation-template">
+  <div role="dialog" class="dark window">
+    <div>
+      <h3 role="alert"></h3>
+      {% url "login" as login_url %}
+      <p><em>{% blocktranslate %}Pro-tip: to easily find back your maps, <a href="{{ login_url }}" target="_blank">create an account</a> or <a href="{{ login_url }}" target="_blank">log in</a>.{% endblocktranslate %}</em></p>
+      <div id="link-wrapper">
+        <form>
+          <label for="url">{% translate "Here is your secret link to edit the map, please keep it safe:" %}</label>
+          <fieldset role="group">
+            <input type="url" name="url" id="url">
+            <input type="button" value="{% translate "Copy link" %}">
+          </fieldset>
+        </form>
+      </div>
+      <div id="form-wrapper" hidden>
+        <form>
+          <label for="email">{% translate "Enter your email address to receive the secret link:" %}</label>
+          <fieldset role="group">
+            <input type="email" name="email" id="email" placeholder="{% translate "Email" %}" required>
+            <input type="submit" value="{% translate "Send me the link" %}" class="umap-action">
+          </fieldset>
+        </form>
+      </div>
+    </div>
+    <ul class="buttons">
+      <li>
+        <button class="icon icon-16 icon-close" aria-label="{% translate "Close" %}" data-close></button>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<umap-alert-creation></umap-alert-creation>
+
+<template id="umap-alert-conflict-template">
+  <div role="dialog" class="dark window">
+    <div>
+      <p role="alert"></p>
+      <div id="conflict-wrapper">
+        <form>
+          <a href="#" onclick="document.url" target="_blank">{% translate "See their edits in another tab" %}</a>
+          <input id="your-changes" type="submit" value="{% translate "Keep your changes and loose theirs" %}">
+          <input id="their-changes" type="submit" value="{% translate "Keep their changes and loose yours" %}">
+        </form>
+      </div>
+    </div>
+    <ul class="buttons">
+      <li>
+        <button class="icon icon-16 icon-close" aria-label="{% translate "Close" %}" data-close></button>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<umap-alert-conflict></umap-alert-conflict>
+
+<script type="module">
+  import { register } from '{% static 'umap/js/components/base.js' %}'
+  import {
+    uMapAlert,
+    uMapAlertCreation,
+    uMapAlertConflict
+  } from '{% static 'umap/js/components/alerts/alert.js' %}'
+  register(uMapAlert, 'umap-alert')
+  register(uMapAlertCreation, 'umap-alert-creation')
+  register(uMapAlertConflict, 'umap-alert-conflict')
+</script>

umap/templates/umap/content.html

@@ -12,7 +12,9 @@
   <header class="wrapper row">
     {% include "umap/navigation.html" with title=SITE_NAME %}
   </header>
-  {% include "umap/messages.html" with title=SITE_NAME %}
+  {% block messages %}
+    {% include "umap/messages.html" with title=SITE_NAME %}
+  {% endblock messages %}
 {% endblock header %}
 {% block content %}
   {% if UMAP_READONLY %}
@@ -38,8 +40,7 @@
   {{ block.super }}
   <script type="text/javascript">
     window.addEventListener('DOMContentLoaded', event => {
-      const ui = new U.UI(document.querySelector('header'))
-      const server = new U.ServerRequest(ui)
+      const server = new U.ServerRequest()
       const getMore = async function (e) {
         L.DomEvent.stop(e)
         const [{html}, response, error] = await server.get(this.href)

umap/templates/umap/css.html

@@ -29,4 +29,8 @@
 <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/css/window.css' %}" />
+<link rel="stylesheet" href="{% static 'umap/css/tooltip.css' %}" />
+<link rel="stylesheet" href="{% static 'umap/css/dialog.css' %}" />
+<link rel="stylesheet" href="{% static 'umap/css/importers.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/theme.css' %}" />

umap/templates/umap/home.html

@@ -1,5 +1,8 @@
 {% extends "umap/content.html" %}
 {% load umap_tags i18n %}
+{% block messages %}
+  {# We don't want maps in the list to display errors. #}
+{% endblock messages %}
 {% block maincontent %}
   {% include "umap/search_bar.html" %}
   {% include "umap/about_summary.html" %}

umap/templates/umap/js.html

@@ -46,7 +46,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.autocomplete.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.popup.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.forms.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.icon.js' %}" defer></script>
@@ -57,8 +56,6 @@
 <script src="{% static 'umap/js/umap.controls.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.slideshow.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.tableeditor.js' %}" defer></script>
-<script src="{% static 'umap/js/umap.importer.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.share.js' %}" defer></script>
 <script src="{% static 'umap/js/umap.js' %}" defer></script>
-<script src="{% static 'umap/js/umap.ui.js' %}" defer></script>
 <script src="{% static 'umap/js/components/fragment.js' %}" defer></script>

umap/templates/umap/map_init.html

@@ -1,17 +1,11 @@
 {% load umap_tags %}
+
+{% include "umap/messages.html" %}
 <div id="map"></div>
 <!-- djlint:off -->
 <script defer type="text/javascript">
   window.addEventListener('DOMContentLoaded', (event) => {
     U.MAP = new U.Map("map", {{ map_settings|notag|safe }})
-    {% for m in messages %}
-      {# We have just one, but we need to loop, as for messages API #}
-      U.MAP.ui.alert({
-        content: "{{ m }}",
-        level: "{{ m.tags }}",
-        duration: 100000
-      })
-    {% endfor %}
   })
 </script>
 <!-- djlint:on -->

umap/templates/umap/messages.html

@@ -1,11 +1,9 @@
-<div class="wrapper">
-  <div class="row">
-    {% if messages %}
-      <ul class="messages">
-        {% for message in messages %}
-          <li {% if message.tags %}class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-        {% endfor %}
-      </ul>
-    {% endif %}
-  </div>
-</div>
+{% load i18n %}
+
+{% include "umap/components/alerts/alert.html" %}
+
+{% for message in messages %}
+  <script type="module" defer>
+    U.Alert.success("{{ message }}")
+  </script>
+{% endfor %}

umap/templates/umap/search.html

@@ -1,5 +1,8 @@
 {% extends "umap/content.html" %}
 {% load i18n %}
+{% block messages %}
+  {# We don't want maps from the results list to display errors in the main page. #}
+{% endblock messages %}
 {% block maincontent %}
   {% include "umap/search_bar.html" %}
   <div class="wrapper">

umap/tests/base.py

@@ -125,7 +125,10 @@ class DataLayerFactory(factory.django.DjangoModelFactory):
                 **kwargs["settings"],
             }
         data.setdefault("_umap_options", {})
+        kwargs["settings"]["name"] = kwargs["name"]
         data["_umap_options"]["name"] = kwargs["name"]
+        data.setdefault("type", "FeatureCollection")
+        data.setdefault("features", [])
         kwargs["geojson"] = ContentFile(json.dumps(data), "foo.json")
         return kwargs
 

umap/tests/integration/conftest.py

@@ -1,9 +1,17 @@
 import os
+import subprocess
+import time
+from pathlib import Path
 
 import pytest
 from playwright.sync_api import expect
 
 
+@pytest.fixture(scope="session")
+def browser_context_args(browser_context_args):
+    return {**browser_context_args, "locale": "en-GB", "timezone_id": "Europe/Paris"}
+
+
 @pytest.fixture(autouse=True)
 def set_timeout(context):
     timeout = int(os.environ.get("PLAYWRIGHT_TIMEOUT", 7500))
@@ -33,3 +41,25 @@ def login(context, settings, live_server):
         return page
 
     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()

umap/tests/integration/test_anonymous_owned_map.py

@@ -164,17 +164,14 @@ def test_alert_message_after_create(
     page.goto(f"{live_server.url}/en/map/new")
     save = page.get_by_role("button", name="Save")
     expect(save).to_be_visible()
-    alert = page.locator(".umap-alert")
+    alert = page.locator('umap-alert-creation div[role="dialog"]')
     expect(alert).to_be_hidden()
     with page.expect_response(re.compile(r".*/map/create/")):
         save.click()
     new_map = Map.objects.last()
     expect(alert).to_be_visible()
     expect(
-        alert.get_by_text(
-            "Your map has been created! As you are not logged in, here is your secret "
-            "link to edit the map, please keep it safe:"
-        )
+        alert.get_by_text("Your map has been created with an anonymous account!")
     ).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_visible()
@@ -194,14 +191,15 @@ def test_alert_message_after_create(
 
 def test_email_sending_error_are_catched(tilelayer, page, live_server):
     page.goto(f"{live_server.url}/en/map/new")
-    alert = page.locator(".umap-alert")
+    alert_creation = page.locator('umap-alert-creation div[role="dialog"]')
     with page.expect_response(re.compile(r".*/map/create/")):
         page.get_by_role("button", name="Save").click()
-    alert.get_by_placeholder("Email").fill("foo@bar.com")
+    alert_creation.get_by_placeholder("Email").fill("foo@bar.com")
     with patch("umap.views.send_mail", side_effect=SMTPException) as patched:
         with page.expect_response(re.compile("/en/map/.*/send-edit-link/")):
-            alert.get_by_role("button", name="Send me the link").click()
+            alert_creation.get_by_role("button", name="Send me the link").click()
         assert patched.called
+        alert = page.locator('umap-alert div[role="dialog"]')
         expect(alert.get_by_text("Can't send email to foo@bar.com")).to_be_visible()
 
 
@@ -214,13 +212,10 @@ def test_alert_message_after_create_show_link_even_without_mail(
     page.goto(f"{live_server.url}/en/map/new")
     with page.expect_response(re.compile(r".*/map/create/")):
         page.get_by_role("button", name="Save").click()
-    alert = page.locator(".umap-alert")
+    alert = page.locator('umap-alert-creation div[role="dialog"]')
     expect(alert).to_be_visible()
     expect(
-        alert.get_by_text(
-            "Your map has been created! As you are not logged in, here is your secret "
-            "link to edit the map, please keep it safe:"
-        )
+        alert.get_by_text("Your map has been created with an anonymous account!")
     ).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()

umap/tests/integration/test_browser.py

@@ -1,3 +1,4 @@
+import re
 from copy import deepcopy
 from time import sleep
 
@@ -14,12 +15,16 @@ DATALAYER_DATA = {
     "features": [
         {
             "type": "Feature",
-            "properties": {"name": "one point in france", "foo": "point"},
+            "properties": {"name": "one point in france", "foo": "point", "bar": "one"},
             "geometry": {"type": "Point", "coordinates": [3.339844, 46.920255]},
         },
         {
             "type": "Feature",
-            "properties": {"name": "one polygon in greenland", "foo": "polygon"},
+            "properties": {
+                "name": "one polygon in greenland",
+                "foo": "polygon",
+                "bar": "two",
+            },
             "geometry": {
                 "type": "Polygon",
                 "coordinates": [
@@ -35,7 +40,11 @@ DATALAYER_DATA = {
         },
         {
             "type": "Feature",
-            "properties": {"name": "one line in new zeland", "foo": "line"},
+            "properties": {
+                "name": "one line in new zeland",
+                "foo": "line",
+                "bar": "three",
+            },
             "geometry": {
                 "type": "LineString",
                 "coordinates": [
@@ -63,8 +72,9 @@ 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-browser")
-    expect(el).to_be_visible()
+    panel = page.locator(".panel.left.on")
+    expect(panel).to_have_class(re.compile(".*expanded.*"))
+    expect(panel.locator(".umap-browser")).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()
     expect(page.get_by_text("one polygon in greenland")).to_be_visible()
@@ -101,6 +111,71 @@ def test_data_browser_should_be_filterable(live_server, page, bootstrap, map):
     expect(paths).to_have_count(0)
 
 
+def test_filter_uses_layer_setting_if_any(live_server, page, bootstrap, map):
+    datalayer = map.datalayer_set.first()
+    datalayer.settings["labelKey"] = "foo"
+    datalayer.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
+    markers = page.locator(".leaflet-marker-icon")
+    paths = page.locator(".leaflet-overlay-pane path")
+    expect(markers).to_have_count(1)
+    expect(paths).to_have_count(2)
+    expect(page.get_by_text("point")).to_be_visible()
+    expect(page.get_by_text("polygon")).to_be_visible()
+    expect(page.get_by_text("line")).to_be_visible()
+    page.locator(".filters summary").click()
+    filter_ = page.locator("input[name='filter']")
+    expect(filter_).to_be_visible()
+    filter_.type("po")
+    expect(page.get_by_title("Features in this layer: 2/3")).to_be_visible()
+    expect(page.get_by_title("Features in this layer: 2/3")).to_have_text("(2/3)")
+    expect(page.get_by_text("line")).to_be_hidden()
+    expect(page.get_by_text("point")).to_be_visible()
+    expect(page.get_by_text("polygon")).to_be_visible()
+    expect(markers).to_have_count(1)
+    expect(paths).to_have_count(1)  # Only polygon
+    # Empty the filter
+    filter_.fill("")
+    filter_.blur()
+    expect(markers).to_have_count(1)
+    expect(paths).to_have_count(2)
+    filter_.type("point")
+    expect(page.get_by_text("point")).to_be_visible()
+    expect(page.get_by_text("line")).to_be_hidden()
+    expect(page.get_by_text("polygon")).to_be_hidden()
+    expect(markers).to_have_count(1)
+    expect(paths).to_have_count(0)
+
+
+def test_filter_works_with_variable_in_labelKey(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "databrowser"
+    map.save()
+    data = deepcopy(DATALAYER_DATA)
+    data["_umap_options"]["labelKey"] = "{name} ({bar})"
+    DataLayerFactory(map=map, data=data)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.get_by_title("Features in this layer: 3")).to_be_visible()
+    markers = page.locator(".leaflet-marker-icon")
+    paths = page.locator(".leaflet-overlay-pane path")
+    expect(markers).to_have_count(1)
+    expect(paths).to_have_count(2)
+    expect(page.get_by_text("one point in france (one)")).to_be_visible()
+    expect(page.get_by_text("one line in new zeland (three)")).to_be_visible()
+    expect(page.get_by_text("one polygon in greenland (two)")).to_be_visible()
+    page.locator(".filters summary").click()
+    filter_ = page.locator("input[name='filter']")
+    expect(filter_).to_be_visible()
+    filter_.type("two")
+    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_text("one polygon in greenland (two)")).to_be_visible()
+    expect(page.get_by_text("one line in new zeland (three)")).to_be_hidden()
+    expect(page.get_by_text("one point in france (one)")).to_be_hidden()
+    expect(markers).to_have_count(0)
+    expect(paths).to_have_count(1)  # Only polygon
+
+
 def test_data_browser_can_show_only_visible_features(live_server, page, bootstrap, map):
     # Zoom on France
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/51.000/2.000")
@@ -176,7 +251,7 @@ def test_data_browser_bbox_filter_should_be_persistent(
     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 layers").click()
+    page.get_by_title("Open browser").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()

umap/tests/integration/test_caption.py

@@ -0,0 +1,27 @@
+import re
+
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+
+def test_caption(live_server, page, map):
+    map.settings["properties"]["onLoadPanel"] = "caption"
+    map.save()
+    basic = DataLayerFactory(map=map, name="Basic layer")
+    non_loaded = DataLayerFactory(
+        map=map, name="Non loaded", settings={"displayOnLoad": False}
+    )
+    hidden = DataLayerFactory(map=map, name="Hidden", settings={"inCaption": False})
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    panel = page.locator(".panel.left.on")
+    expect(panel).to_have_class(re.compile(".*condensed.*"))
+    expect(panel.locator(".umap-caption")).to_be_visible()
+    expect(panel.locator(".datalayer-legend").get_by_text(basic.name)).to_be_visible()
+    expect(
+        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()