umap-project 2.8.0a2__py3-none-any.whl → 2.8.1__py3-none-any.whl

umap/static/umap/locale/zh_TW.json

@@ -183,12 +183,12 @@
     "Icon shape": "圖示圖形",
     "Icon symbol": "圖示標誌",
     "If false, the polygon or line will act as a part of the underlying map.": "選擇「否」時，多邊形物件會被當成為底圖的一部分。",
-    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}",
-    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}",
+    "Iframe with custom height (in px): {{{https://iframe.url.com|height}}}": "iframe 的自訂高度 (px)：{{{https://iframe.url.com|height}}}",
+    "Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}": "iframe 的自訂高度與寬度 (px)：{{{https://iframe.url.com|height*width}}}",
     "iframe": "iframe",
-    "Iframe: {{{https://iframe.url.com}}}": "Iframe: {{{https://iframe.url.com}}}",
-    "Image with custom width (in px): {{https://image.url.com|width}}": "Image with custom width (in px): {{https://image.url.com|width}}",
-    "Image: {{https://image.url.com}}": "Image: {{https://image.url.com}}",
+    "Iframe: {{{https://iframe.url.com}}}": "iframe：{{{https://iframe.url.com}}}",
+    "Image with custom width (in px): {{https://image.url.com|width}}": "圖片有自訂寬度 (px)：{{https://image.url.com|width}}",
+    "Image: {{https://image.url.com}}": "圖片：{{https://image.url.com}}",
     "Import data": "匯入資料",
     "Import in a new layer": "匯入至新圖層",
     "Imports all umap data, including layers and settings.": "匯入所有 umap 資料，包含圖層與設定。",
@@ -216,7 +216,7 @@
     "Limit bounds": "限制範圍",
     "Link to view the map": "檢視地圖的連結",
     "Link to…": "連結至...",
-    "Link with text: [[https://example.com|text of the link]]": "Link with text: [[https://example.com|text of the link]]",
+    "Link with text: [[https://example.com|text of the link]]": "有文字的連結：[[https://example.com|text of the link]]",
     "Long credits": "詳細工作人員名單",
     "Longitude": "經度",
     "Make main shape": "設為主要外形",
@@ -320,7 +320,7 @@
     "Show this layer in the caption": "在標題顯示此圖層",
     "Show/hide layer": "顯示/隱藏圖層",
     "Side panel": "側邊框",
-    "Simple link: [[https://example.com]]": "Simple link: [[https://example.com]]",
+    "Simple link: [[https://example.com]]": "簡單連結： [[https://example.com]]",
     "Simplify": "簡化",
     "Skipping unknown geometry.type: {type}": "略過不明的 geometry.type: {type}",
     "Slideshow": "投影片",
@@ -517,8 +517,10 @@
     "zoom to data extent": "切換至資料範圍",
     "download visible data": "下載可視資料",
     "{connectedPeers} peer(s) currently connected to this map": "這份地圖已經有 {connectedPeers} 伙伴連線",
-    "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"
+    "Import helpers": "匯入幫手",
+    "Import helpers will fill the URL field for you.": "匯入幫會為你填入網址",
+    "Wikipedia": "維基百科",
+    "Save draft": "儲存草稿",
+    "No data has been found for import": "匯入時沒有找到資料",
+    "Successfully imported {count} feature(s)": "成功匯入 {count} 圖徵"
 }

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/unittests/sync.js

@@ -8,8 +8,11 @@ import { MapUpdater } from '../js/modules/sync/updaters.js'
 import { SyncEngine, Operations } from '../js/modules/sync/engine.js'
 
 describe('SyncEngine', () => {
+  const websocketTokenURI = 'http://localhost:8000/api/v1/maps/1/websocket_auth_token/'
+  const websocketURI = 'ws://localhost:8000/ws/maps/1/'
+
   it('should initialize methods even before start', () => {
-    const engine = new SyncEngine({})
+    const engine = new SyncEngine({}, websocketTokenURI, websocketURI)
     engine.upsert()
     engine.update()
     engine.delete()

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/403.html

@@ -0,0 +1,12 @@
+{% extends "40x.html" %}
+
+{% load i18n %}
+
+{% block content %}
+  <div class="content-40x">
+      <h1>{{ exception }}</h1>
+      <p>{% blocktrans %}<a href="https://discover.umap-project.org/support/faq/#map-statuses" target="_blank">Find out here the documentation</a> on how to manage map’s permissions.{% endblocktrans %}</p>
+      <hr>
+      <p><a href="{% url 'home' %}">{% trans "← Go to the homepage" %}</a></p>
+  </div>
+{% endblock content %}

umap/templates/404.html

@@ -1,19 +1,10 @@
-{% extends "base.html" %}
+{% extends "40x.html" %}
 
 {% load i18n static %}
 
 {% block content %}
-  <div class="content404">
-    <a href="{% url "home" %}"
-       title="{% trans "Take me to the home page" %}">
-      <h1>
-        4
-        <img alt="0" width="128px" height="128px" src="{% static "umap/img/logo.svg" %}">
-        4
-      </h1>
-      <h2>
-        Not Found
-      </h2>
-    </a>
+  <div class="content-40x content-404">
+    <h1>{% trans "404 Page Not Found" %}</h1>
+    <p><a href="{% url 'home' %}">{% trans "← Go to the homepage" %}</a></p>
   </div>
 {% endblock content %}

umap/templates/40x.html

@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+
+{% load umap_tags %}
+{% block body_class %}page-40x{% endblock body_class %}
+{% block extra_head %}
+  {% umap_css %}
+  {{ block.super }}
+  {% umap_js %}
+{% endblock extra_head %}

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/conftest.py

@@ -51,12 +51,12 @@ def page(new_page):
 
 
 @pytest.fixture
-def login(context, settings, live_server):
-    def do_login(user):
+def login(new_page, settings, live_server):
+    def do_login(user, **kwargs):
         # TODO use storage state to do login only once per session
         # https://playwright.dev/python/docs/auth
         settings.ENABLE_ACCOUNT_LOGIN = True
-        page = context.new_page()
+        page = new_page(**kwargs)
         page.goto(f"{live_server.url}/en/")
         page.locator(".login").click()
         page.get_by_placeholder("Username").fill(user.username)

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/integration/test_websocket_sync.py

@@ -39,6 +39,9 @@ def test_websocket_connection_can_sync_markers(
     a_map_el.click(position={"x": 220, "y": 220})
     expect(a_marker_pane).to_have_count(1)
     expect(b_marker_pane).to_have_count(1)
+    # Peer B should not be in state dirty
+    expect(peerB.get_by_role("button", name="View")).to_be_visible()
+    expect(peerB.get_by_role("button", name="Cancel edits")).to_be_hidden()
     peerA.locator("body").type("Synced name")
     peerA.locator("body").press("Escape")
 
@@ -415,3 +418,69 @@ def test_should_sync_datalayers(new_page, live_server, websocket_server, tilelay
         peerA.get_by_role("button", name="Save").click()
 
     assert DataLayer.objects.count() == 2
+
+
+@pytest.mark.xdist_group(name="websockets")
+def test_create_and_sync_map(
+    new_page, live_server, websocket_server, tilelayer, login, user
+):
+    # Create a syncable map with peerA
+    peerA = login(user, prefix="Page A")
+    peerA.goto(f"{live_server.url}/en/map/new/")
+    with peerA.expect_response(re.compile("./map/create/.*")):
+        peerA.get_by_role("button", name="Save Draft").click()
+    peerA.get_by_role("link", name="Map advanced properties").click()
+    peerA.get_by_text("Real-time collaboration", exact=True).click()
+    peerA.get_by_text("Enable real-time").click()
+    peerA.get_by_role("link", name="Update permissions and editors").click()
+    peerA.locator('select[name="share_status"]').select_option(str(Map.PUBLIC))
+    with peerA.expect_response(re.compile("./update/settings/.*")):
+        peerA.get_by_role("button", name="Save").click()
+    expect(peerA.get_by_role("button", name="Cancel edits")).to_be_hidden()
+    # Quit edit mode
+    peerA.get_by_role("button", name="View").click()
+
+    # Open map and go to edit mode with peer B
+    peerB = new_page("Page B")
+    peerB.goto(peerA.url)
+    peerB.get_by_role("button", name="Edit").click()
+
+    # Create a marker from peerA
+    markersA = peerA.locator(".leaflet-marker-pane > div")
+    markersB = peerB.locator(".leaflet-marker-pane > div")
+    expect(markersA).to_have_count(0)
+    expect(markersB).to_have_count(0)
+
+    # Add a marker from peer A
+    peerA.get_by_role("button", name="Edit").click()
+    peerA.get_by_title("Draw a marker").click()
+    peerA.locator("#map").click(position={"x": 220, "y": 220})
+    expect(markersA).to_have_count(1)
+    expect(markersB).to_have_count(1)
+
+    # Save and quit edit mode again
+    with peerA.expect_response(re.compile("./datalayer/create/.*")):
+        peerA.get_by_role("button", name="Save").click()
+    peerA.get_by_role("button", name="View").click()
+    expect(markersA).to_have_count(1)
+    expect(markersB).to_have_count(1)
+    peerA.wait_for_timeout(500)
+    expect(markersA).to_have_count(1)
+    expect(markersB).to_have_count(1)
+
+    # Peer B should not be in state dirty
+    expect(peerB.get_by_role("button", name="View")).to_be_visible()
+    expect(peerB.get_by_role("button", name="Cancel edits")).to_be_hidden()
+
+    # Add a marker from peer B
+    peerB.get_by_title("Draw a marker").click()
+    peerB.locator("#map").click(position={"x": 200, "y": 200})
+    expect(markersB).to_have_count(2)
+    expect(markersA).to_have_count(1)
+    with peerB.expect_response(re.compile("./datalayer/update/.*")):
+        peerB.get_by_role("button", name="Save").click()
+    expect(markersB).to_have_count(2)
+    expect(markersA).to_have_count(1)
+    peerA.get_by_role("button", name="Edit").click()
+    expect(markersA).to_have_count(2)
+    expect(markersB).to_have_count(2)