umap-project 2.8.0a1__py3-none-any.whl → 2.8.0b0__py3-none-any.whl

umap/static/umap/js/umap.forms.js

@@ -259,6 +259,35 @@ L.FormBuilder.CheckBox.include({
   },
 })
 
+L.FormBuilder.EditableText = L.FormBuilder.Element.extend({
+  build: function () {
+    this.input = L.DomUtil.create('span', this.options.className || '', this.parentNode)
+    this.input.contentEditable = true
+    this.fetch()
+    L.DomEvent.on(this.input, 'input', this.sync, this)
+    L.DomEvent.on(this.input, 'keypress', this.onKeyPress, this)
+  },
+
+  getParentNode: function () {
+    return this.form
+  },
+
+  value: function () {
+    return this.input.textContent
+  },
+
+  fetch: function () {
+    this.input.textContent = this.toHTML()
+  },
+
+  onKeyPress: function (event) {
+    if (event.keyCode === 13) {
+      event.preventDefault()
+      this.input.blur()
+    }
+  },
+})
+
 L.FormBuilder.ColorPicker = L.FormBuilder.Input.extend({
   colors: U.COLORS,
   getParentNode: function () {
@@ -1192,6 +1221,21 @@ U.FormBuilder = L.FormBuilder.extend({
     }
   },
 
+  getter: function (field) {
+    const path = field.split('.')
+    let value = this.obj
+    let sub
+    for (sub of path) {
+      try {
+        value = value[sub]
+      } catch {
+        console.log(field)
+      }
+    }
+    if (value === undefined) values = U.SCHEMA[sub]?.default
+    return value
+  },
+
   finish: (event) => {
     event.helper?.input?.blur()
   },

umap/static/umap/locale/en.js

@@ -520,7 +520,9 @@ const locale = {
     "Import helpers": "Import helpers",
     "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "Save draft": "Save draft",
+    "No data has been found for import": "No data has been found for import",
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -520,5 +520,7 @@
     "Import helpers": "Import helpers",
     "Import helpers will fill the URL field for you.": "Import helpers will fill the URL field for you.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Save draft"
+    "Save draft": "Save draft",
+    "No data has been found for import": "No data has been found for import",
+    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)"
 }

umap/static/umap/locale/fr.js

@@ -520,7 +520,9 @@ const locale = {
     "Import helpers": "Assistants d'import",
     "Import helpers will fill the URL field for you.": "Les assistants d'import vont renseigner le champ URL pour vous.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Enregistrer le brouillon"
+    "Save draft": "Enregistrer le brouillon",
+    "No data has been found for import": "Aucunes données à importer",
+    "Successfully imported {count} feature(s)": "{count} élément(s) ajouté(s) à la carte"
 }
 L.registerLocale("fr", locale)
 L.setLocale("fr")

umap/static/umap/locale/fr.json

@@ -520,5 +520,7 @@
     "Import helpers": "Assistants d'import",
     "Import helpers will fill the URL field for you.": "Les assistants d'import vont renseigner le champ URL pour vous.",
     "Wikipedia": "Wikipedia",
-    "Save draft": "Enregistrer le brouillon"
+    "Save draft": "Enregistrer le brouillon",
+    "No data has been found for import": "Aucunes données à importer",
+    "Successfully imported {count} feature(s)": "{count} élément(s) ajouté(s) à la carte"
 }

umap/static/umap/map.css

@@ -924,7 +924,6 @@ a.umap-control-caption,
     width: 2px;
 }
 .umap-icon-active {
-    z-index: var(--zindex-icon-active)!important;
     opacity: 1.0!important;
 }
 .umap-edit-enabled .readonly {
@@ -935,173 +934,42 @@ a.umap-control-caption,
 /* ********************************* */
 /*         Ajax loader               */
 /* ********************************* */
-.umap-loading .umap-loader
-{
-    display: block;
-    -webkit-animation: shift-rightwards 3s ease-in-out infinite;
-    -moz-animation: shift-rightwards 3s ease-in-out infinite;
-    -ms-animation: shift-rightwards 3s ease-in-out infinite;
-    -o-animation: shift-rightwards 3s ease-in-out infinite;
-    animation: shift-rightwards 3s ease-in-out infinite;
-    -webkit-animation-delay: .2s;
-    -moz-animation-delay: .2s;
-    -o-animation-delay: .2s;
-    animation-delay: .2s;
-}
 .umap-loader {
-    position: absolute;
-    display: none;
-    top: 0;
-    left: 0;
-    right: 0;
-    height: 4px;
-    z-index: var(--zindex-loader);
-    background-color: #79c1c0 !important;
-    -webkit-transform: translateX(100%);
-    -moz-transform: translateX(100%);
-    -o-transform: translateX(100%);
-    transform: translateX(100%);
-}
-
-
-@-webkit-keyframes shift-rightwards
-{
-    0%
-    {
-        -webkit-transform:translateX(-100%);
-        -moz-transform:translateX(-100%);
-        -o-transform:translateX(-100%);
-        transform:translateX(-100%);
-    }
-
-    40%
-    {
-        -webkit-transform:translateX(0%);
-        -moz-transform:translateX(0%);
-        -o-transform:translateX(0%);
-        transform:translateX(0%);
-    }
-
-    60%
-    {
-        -webkit-transform:translateX(0%);
-        -moz-transform:translateX(0%);
-        -o-transform:translateX(0%);
-        transform:translateX(0%);
-    }
-
-    100%
-    {
-        -webkit-transform:translateX(100%);
-        -moz-transform:translateX(100%);
-        -o-transform:translateX(100%);
-        transform:translateX(100%);
-    }
-
-}
-@-moz-keyframes shift-rightwards
-{
-    0%
-    {
-        -webkit-transform:translateX(-100%);
-        -moz-transform:translateX(-100%);
-        -o-transform:translateX(-100%);
-        transform:translateX(-100%);
-    }
-
-    40%
-    {
-        -webkit-transform:translateX(0%);
-        -moz-transform:translateX(0%);
-        -o-transform:translateX(0%);
-        transform:translateX(0%);
-    }
-
-    60%
-    {
-        -webkit-transform:translateX(0%);
-        -moz-transform:translateX(0%);
-        -o-transform:translateX(0%);
-        transform:translateX(0%);
-    }
-
-    100%
-    {
-        -webkit-transform:translateX(100%);
-        -moz-transform:translateX(100%);
-        -o-transform:translateX(100%);
-        transform:translateX(100%);
-    }
-
-}
-@-o-keyframes shift-rightwards
-{
-    0%
-    {
-        -webkit-transform:translateX(-100%);
-        -moz-transform:translateX(-100%);
-        -o-transform:translateX(-100%);
-        transform:translateX(-100%);
-    }
-
-    40%
-    {
-        -webkit-transform:translateX(0%);
-        -moz-transform:translateX(0%);
-        -o-transform:translateX(0%);
-        transform:translateX(0%);
-    }
-
-    60%
-    {
-        -webkit-transform:translateX(0%);
-        -moz-transform:translateX(0%);
-        -o-transform:translateX(0%);
-        transform:translateX(0%);
-    }
-
-    100%
-    {
-        -webkit-transform:translateX(100%);
-        -moz-transform:translateX(100%);
-        -o-transform:translateX(100%);
-        transform:translateX(100%);
-    }
-
+  width: 100%;
+  height: 6px;
+  display: inline-block;
+  position: absolute;
+  background: var(--color-brightCyan);
+  overflow: hidden;
+  display: none;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 4px;
+  z-index: var(--zindex-loader);
+}
+.umap-loader::after {
+  content: '';
+  box-sizing: border-box;
+  width: 0;
+  height: 4.8px;
+  background: var(--color-darkerGray);
+  position: absolute;
+  top: 0;
+  left: 0;
+  animation: animFw 10s linear infinite;
+}
+
+@keyframes animFw {
+  0% {
+    width: 0;
+  }
+  100% {
+    width: 100%;
+  }
 }
-@keyframes shift-rightwards
-{
-    0%
-    {
-        -webkit-transform:translateX(-100%);
-        -moz-transform:translateX(-100%);
-        -o-transform:translateX(-100%);
-        transform:translateX(-100%);
-    }
-
-    40%
-    {
-        -webkit-transform:translateX(0%);
-        -moz-transform:translateX(0%);
-        -o-transform:translateX(0%);
-        transform:translateX(0%);
-    }
-
-    60%
-    {
-        -webkit-transform:translateX(0%);
-        -moz-transform:translateX(0%);
-        -o-transform:translateX(0%);
-        transform:translateX(0%);
-    }
-
-    100%
-    {
-        -webkit-transform:translateX(100%);
-        -moz-transform:translateX(100%);
-        -o-transform:translateX(100%);
-        transform:translateX(100%);
-    }
+.umap-loading .umap-loader {
+  display: block;
 }
 
 /* *************************** */

umap/static/umap/vars.css

@@ -48,7 +48,6 @@
     --zindex-autocomplete: 470;
     --zindex-dialog: 460;
     --zindex-contextmenu: 455;
-    --zindex-icon-active: 450;
     --zindex-tooltip: 445;
     --zindex-panels: 440;
     --zindex-controls: 430;

umap/templates/base.html

@@ -18,6 +18,7 @@
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     {# See https://evilmartians.com/chronicles/how-to-favicon-in-2021-six-files-that-fit-most-needs #}
+    {% autoescape off %}
     <link rel="icon"
           href="{% static 'umap/favicons/favicon.ico' %}"
           sizes="32x32">
@@ -28,6 +29,7 @@
           href="{% static 'umap/favicons/apple-touch-icon.png' %}">
     <!-- 180×180 -->
     <link rel="manifest" href="/manifest.webmanifest">
+    {% endautoescape %}
   </head>
   <body class="{% block body_class %}{% endblock body_class %}">
     {% block header %}

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

@@ -1,8 +1,10 @@
 {% load i18n static %}
 
+{% autoescape off %}
 <style type="text/css">
     @import "{% static 'umap/js/components/alerts/alert.css' %}";
 </style>
+{% endautoescape %}
 <template id="umap-alert-template">
   <div role="dialog" class="dark window umap-alert">
     <div>
@@ -97,6 +99,7 @@
   </div>
 </template>
 <umap-alert-conflict></umap-alert-conflict>
+{% autoescape off %}
 <script type="module">
   import { register } from '{% static 'umap/js/components/base.js' %}'
   import {
@@ -108,3 +111,4 @@
   register(uMapAlertCreation, 'umap-alert-creation')
   register(uMapAlertConflict, 'umap-alert-conflict')
 </script>
+{% endautoescape %}

umap/templates/umap/css.html

@@ -1,5 +1,7 @@
 {% load static %}
 
+{% autoescape off %}
+
 <link rel="stylesheet"
       href="{% static 'umap/vendors/leaflet/leaflet.css' %}" />
 <link rel="stylesheet"
@@ -39,3 +41,4 @@
 <link rel="stylesheet" href="{% static 'umap/css/tableeditor.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/css/bar.css' %}" />
 <link rel="stylesheet" href="{% static 'umap/theme.css' %}" />
+{% endautoescape %}

umap/templates/umap/js.html

@@ -1,5 +1,6 @@
 {% load static %}
 
+{% autoescape off %}
 <script type="module"
         src="{% static 'umap/vendors/leaflet/leaflet-src.esm.js' %}"
         defer></script>
@@ -42,3 +43,4 @@
 <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_init.html

@@ -5,7 +5,9 @@
 </div>
 <!-- djlint:off -->
 <script defer type="module">
+    {% autoescape off %}
     import Umap from '{% static "umap/js/modules/umap.js" %}'
+    {% endautoescape %}
     U.MAP = new Umap("map", {{ map_settings|notag|safe }})
 </script>
 <!-- djlint:on -->

umap/templates/umap/user_dashboard.html

@@ -46,7 +46,9 @@
 {% block bottom_js %}
   {{ block.super }}
   <script type="module">
+    {% autoescape off %}
     import Umap from '{% static "umap/js/modules/umap.js" %}'
+    {% endautoescape %}
     const CACHE = {}
     for (const mapOpener of document.querySelectorAll("button.map-opener")) {
       mapOpener.addEventListener('click', (event) => {

umap/tests/fixtures/test_upload_simple_marker.json

@@ -0,0 +1,19 @@
+{
+    "crs": null,
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "geometry": {
+                "coordinates": [
+                    -1.09314,
+                    50.791718
+                ],
+                "type": "Point"
+            },
+            "properties": {
+                "name": "Portsmouth"
+            }
+        }
+    ]
+}

umap/tests/integration/test_edit_datalayer.py

@@ -221,3 +221,14 @@ def test_deleting_datalayer_should_remove_from_caption(
     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()
+
+
+def test_can_edit_datalayer_name_in_list(live_server, openmap, datalayer, page):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_text("test datalayer").click()
+    page.get_by_text("test datalayer").fill("test datalayer foobar")
+    page.get_by_role("button", name="Open browser").click()
+    expect(
+        page.locator(".panel.left").get_by_text("test datalayer foobar")
+    ).to_be_visible()

umap/tests/integration/test_import.py

@@ -9,7 +9,6 @@ from playwright.sync_api import expect
 
 from umap.models import DataLayer
 
-from ..base import mock_tiles
 from .helpers import save_and_get_json
 
 pytestmark = pytest.mark.django_db
@@ -765,3 +764,23 @@ def test_import_georss_from_textarea(tilelayer, live_server, page):
     # A layer has been created
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(1)
+
+
+def test_import_from_multiple_files(live_server, page, tilelayer):
+    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
+    FIXTURES = Path(__file__).parent.parent / "fixtures"
+    paths = [
+        FIXTURES / "test_upload_data.json",
+        FIXTURES / "test_upload_simple_marker.json",
+    ]
+    file_chooser.set_files(paths)
+    markers = page.locator(".leaflet-marker-icon")
+    expect(markers).to_have_count(0)
+    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)

umap/tests/test_dashboard.py

@@ -0,0 +1,82 @@
+import pytest
+from django.contrib.auth import get_user_model
+from django.urls import reverse
+
+from umap.models import Map
+
+from .base import MapFactory, UserFactory
+
+User = get_user_model()
+
+pytestmark = pytest.mark.django_db
+
+
+def test_user_dashboard_is_restricted_to_logged_in(client):
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 302
+    assert response["Location"] == "/en/login/?next=/en/me"
+
+
+def test_user_dashboard_display_user_maps(client, map):
+    client.login(username=map.owner.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert map.name in body
+    assert f"{map.get_absolute_url()}?edit" in body
+    assert f"{map.get_absolute_url()}?share" in body
+    assert f"/map/{map.pk}/download" in body
+    assert "Everyone (public)" in body
+    assert "Owner only" in body
+
+
+def test_user_dashboard_do_not_display_blocked_user_maps(client, map):
+    map.share_status = Map.BLOCKED
+    map.save()
+    client.login(username=map.owner.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert map.name not in body
+
+
+def test_user_dashboard_do_not_display_deleted_user_maps(client, map):
+    map.share_status = Map.DELETED
+    map.save()
+    client.login(username=map.owner.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert map.name not in body
+
+
+@pytest.mark.parametrize("share_status", [Map.DRAFT, Map.PRIVATE, Map.PUBLIC, Map.OPEN])
+def test_user_dashboard_display_user_team_maps(client, map, team, user, share_status):
+    user.teams.add(team)
+    user.save()
+    map.team = team
+    map.share_status = share_status
+    map.save()
+    assert map.owner != user
+    client.login(username=user.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert map.name in body
+    assert map.get_absolute_url() in body
+
+
+def test_user_dashboard_display_user_maps_distinct(client, map):
+    # cf https://github.com/umap-project/umap/issues/1325
+    anonymap = MapFactory(name="Map witout owner should not appear")
+    user1 = UserFactory(username="user1")
+    user2 = UserFactory(username="user2")
+    map.editors.add(user1)
+    map.editors.add(user2)
+    map.save()
+    client.login(username=map.owner.username, password="123123")
+    response = client.get(reverse("user_dashboard"))
+    assert response.status_code == 200
+    body = response.content.decode()
+    assert body.count(f'<a href="/en/map/test-map_{map.pk}">test map</a>') == 1
+    assert body.count(anonymap.name) == 0

umap/tests/test_team_views.py

@@ -1,7 +1,7 @@
 import pytest
 from django.urls import reverse
 
-from umap.models import Team
+from umap.models import Map, Team
 
 pytestmark = pytest.mark.django_db
 
@@ -15,6 +15,40 @@ def test_can_see_team_maps(client, map, team):
     assert map.name in response.content.decode()
 
 
+@pytest.mark.parametrize("share_status", [Map.PRIVATE, Map.DRAFT])
+def test_others_cannot_see_team_private_maps_in_team_page(
+    client, map, team, user, share_status
+):
+    map.team = team
+    map.share_status = share_status
+    map.save()
+    url = reverse("team_maps", args=(team.pk,))
+    response = client.get(url)
+    assert response.status_code == 200
+    assert map.name not in response.content.decode()
+    # User is not in team
+    client.login(username=user.username, password="123123")
+    response = client.get(url)
+    assert response.status_code == 200
+    assert map.name not in response.content.decode()
+
+
+@pytest.mark.parametrize("share_status", [Map.PRIVATE, Map.DRAFT])
+def test_members_can_see_private_maps_in_team_page(
+    client, map, team, user, share_status
+):
+    map.team = team
+    map.share_status = share_status
+    map.save()
+    user.teams.add(team)
+    user.save()
+    url = reverse("team_maps", args=(team.pk,))
+    client.login(username=user.username, password="123123")
+    response = client.get(url)
+    assert response.status_code == 200
+    assert map.name in response.content.decode()
+
+
 def test_user_can_see_their_teams(client, team, user):
     user.teams.add(team)
     user.save()