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

umap/static/umap/js/modules/ui/dialog.js

@@ -6,7 +6,6 @@ const TEMPLATE = `
     <form method="dialog" data-ref="form">
       <ul class="buttons">
         <li><i class="icon icon-16 icon-close" data-close></i></li>
-        <li hidden data-ref="back"><i class="icon icon-16 icon-back"></i></li>
       </ul>
       <h3 data-ref="message" id="${Math.round(Date.now()).toString(36)}"></h3>
       <fieldset data-ref="fieldset" role="document">
@@ -124,10 +123,6 @@ export default class Dialog extends WithTemplate {
     } else {
       this.elements.template.innerHTML = dialog.template || ''
     }
-    this.elements.back.hidden = !dialog.back
-    if (dialog.back) {
-      this.elements.back.addEventListener('click', dialog.back)
-    }
 
     this.focusable = this.getFocusable()
     this.hasFormData = this.elements.fieldset.elements.length > 0

umap/static/umap/js/modules/umap.js

@@ -218,14 +218,6 @@ export default class Umap extends ServerStored {
     this.fire('seteditedfeature')
   }
 
-  get activeFeature() {
-    return this._activeFeature
-  }
-
-  set activeFeature(feature) {
-    this._activeFeature = feature
-  }
-
   setPropertiesFromQueryString() {
     const asBoolean = (key) => {
       const value = this.searchParams.get(key)
@@ -324,14 +316,12 @@ export default class Umap extends ServerStored {
         dataUrl = this.renderUrl(dataUrl)
         dataUrl = this.proxyUrl(dataUrl)
         const datalayer = this.createDataLayer()
-        await datalayer
-          .importFromUrl(dataUrl, dataFormat)
-          .then(() => datalayer.zoomTo())
+        await datalayer.importFromUrl(dataUrl, dataFormat)
       }
     } else if (data) {
       data = decodeURIComponent(data)
       const datalayer = this.createDataLayer()
-      await datalayer.importRaw(data, dataFormat).then(() => datalayer.zoomTo())
+      await datalayer.importRaw(data, dataFormat)
     }
   }
 
@@ -578,11 +568,9 @@ export default class Umap extends ServerStored {
     }
     this.datalayersLoaded = true
     this.fire('datalayersloaded')
-    const toLoad = []
     for (const datalayer of this.datalayersIndex) {
-      if (datalayer.showAtLoad()) toLoad.push(datalayer.show())
+      if (datalayer.showAtLoad()) await datalayer.show()
     }
-    await Promise.all(toLoad)
     this.dataloaded = true
     this.fire('dataloaded')
   }
@@ -653,12 +641,6 @@ export default class Umap extends ServerStored {
     // have changed, we'll be more subtil when we'll remove the
     // save action
     this.render(['name', 'user', 'permissions'])
-    if (!this._leafletMap.listens('saved')) {
-      // When we save only layers, we don't have the map feedback message
-      this._leafletMap.on('saved', () => {
-        Alert.success(translate('Map has been saved!'))
-      })
-    }
     this.fire('saved')
   }
 
@@ -1117,8 +1099,8 @@ export default class Umap extends ServerStored {
     }
     this.ensurePanesOrder()
     this._leafletMap.initTileLayers()
+    this.isDirty = false
     this.onDataLayersChanged()
-    this.isDirty = !this.id
   }
 
   async save() {
@@ -1200,7 +1182,7 @@ export default class Umap extends ServerStored {
   geometry() {
     /* Return a GeoJSON geometry Object */
     const latlng = this._leafletMap.latLng(
-      this.properties.center || this._leafletMap.getCenter()
+      this._leafletMap.options.center || this._leafletMap.getCenter()
     )
     return {
       type: 'Point',
@@ -1442,14 +1424,9 @@ export default class Umap extends ServerStored {
       const row = DomUtil.create('li', 'orderable', ul)
       DomUtil.createIcon(row, 'icon-drag', translate('Drag to reorder'))
       datalayer.renderToolbox(row)
-      const builder = new U.FormBuilder(
-        datalayer,
-        [['options.name', { handler: 'EditableText' }]],
-        { className: 'umap-form-inline' }
-      )
-      const form = builder.build()
-      row.appendChild(form)
+      const title = DomUtil.add('span', '', row, datalayer.options.name)
       row.classList.toggle('off', !datalayer.isVisible())
+      title.textContent = datalayer.options.name
       row.dataset.id = stamp(datalayer)
     })
     const onReorder = (src, dst, initialIndex, finalIndex) => {
@@ -1537,7 +1514,7 @@ export default class Umap extends ServerStored {
   processFileToImport(file, layer, type) {
     type = type || Utils.detectFileType(file)
     if (!type) {
-      Alert.error(
+      U.Alert.error(
         translate('Unable to detect format of file {filename}', {
           filename: file.name,
         })
@@ -1683,8 +1660,8 @@ export default class Umap extends ServerStored {
   }
 
   _setCenterAndZoom() {
-    this.properties.center = this._leafletMap.getCenter()
-    this.properties.zoom = this._leafletMap.getZoom()
+    this._leafletMap.options.center = this._leafletMap.getCenter()
+    this._leafletMap.options.zoom = this._leafletMap.getZoom()
     this.isDirty = true
     this._defaultExtent = false
   }

umap/static/umap/js/modules/utils.js

@@ -115,8 +115,6 @@ export function escapeHTML(s) {
       'span',
       'dt',
       'dd',
-      'b',
-      'i',
     ],
     ADD_ATTR: [
       'target',

umap/static/umap/js/umap.controls.js

@@ -683,13 +683,10 @@ U.TileLayerChooser = L.Control.extend({
     L.DomEvent.on(
       el,
       'click',
-      () => {
+      function () {
         this.map.selectTileLayer(tilelayer)
         this.map._controls.tilelayers.setLayers()
-        if (options?.edit) {
-          this.map._umap.properties.tilelayer = tilelayer.toJSON()
-          this.map._umap.isDirty = true
-        }
+        if (options?.callback) options.callback(tilelayer)
       },
       this
     )
@@ -945,11 +942,11 @@ L.Control.Loading.include({
   },
 
   _showIndicator: function () {
-    this._map._container.classList.add('umap-loading')
+    L.DomUtil.addClass(this._map._container, 'umap-loading')
   },
 
   _hideIndicator: function () {
-    this._map._container.classList.remove('umap-loading')
+    L.DomUtil.removeClass(this._map._container, 'umap-loading')
   },
 })
 

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

@@ -259,35 +259,6 @@ 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 () {
@@ -1221,21 +1192,6 @@ 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,9 +520,7 @@ 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",
-    "No data has been found for import": "No data has been found for import",
-    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)"
+    "Save draft": "Save draft"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -520,7 +520,5 @@
     "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",
-    "No data has been found for import": "No data has been found for import",
-    "Successfully imported {count} feature(s)": "Successfully imported {count} feature(s)"
+    "Save draft": "Save draft"
 }

umap/static/umap/locale/fr.js

@@ -520,9 +520,7 @@ 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",
-    "No data has been found for import": "Aucunes données à importer",
-    "Successfully imported {count} feature(s)": "{count} élément(s) ajouté(s) à la carte"
+    "Save draft": "Enregistrer le brouillon"
 }
 L.registerLocale("fr", locale)
 L.setLocale("fr")

umap/static/umap/locale/fr.json

@@ -520,7 +520,5 @@
     "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",
-    "No data has been found for import": "Aucunes données à importer",
-    "Successfully imported {count} feature(s)": "{count} élément(s) ajouté(s) à la carte"
+    "Save draft": "Enregistrer le brouillon"
 }

umap/static/umap/map.css

@@ -924,6 +924,7 @@ a.umap-control-caption,
     width: 2px;
 }
 .umap-icon-active {
+    z-index: var(--zindex-icon-active)!important;
     opacity: 1.0!important;
 }
 .umap-edit-enabled .readonly {
@@ -934,42 +935,173 @@ 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 {
-  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%;
-  }
+    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%);
 }
-.umap-loading .umap-loader {
-  display: block;
+
+
+@-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%);
+    }
+
+}
+@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/static/umap/vars.css

@@ -48,6 +48,7 @@
     --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,7 +18,6 @@
     <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">
@@ -29,7 +28,6 @@
           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,10 +1,8 @@
 {% 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>
@@ -99,7 +97,6 @@
   </div>
 </template>
 <umap-alert-conflict></umap-alert-conflict>
-{% autoescape off %}
 <script type="module">
   import { register } from '{% static 'umap/js/components/base.js' %}'
   import {
@@ -111,4 +108,3 @@
   register(uMapAlertCreation, 'umap-alert-creation')
   register(uMapAlertConflict, 'umap-alert-conflict')
 </script>
-{% endautoescape %}

umap/templates/umap/css.html

@@ -1,7 +1,5 @@
 {% load static %}
 
-{% autoescape off %}
-
 <link rel="stylesheet"
       href="{% static 'umap/vendors/leaflet/leaflet.css' %}" />
 <link rel="stylesheet"
@@ -41,4 +39,3 @@
 <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,6 +1,5 @@
 {% load static %}
 
-{% autoescape off %}
 <script type="module"
         src="{% static 'umap/vendors/leaflet/leaflet-src.esm.js' %}"
         defer></script>
@@ -43,4 +42,3 @@
 <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,9 +5,7 @@
 </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,9 +46,7 @@
 {% 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/integration/test_edit_datalayer.py

@@ -221,14 +221,3 @@ 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,6 +9,7 @@ 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
@@ -764,23 +765,3 @@ 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_team_views.py

@@ -1,7 +1,7 @@
 import pytest
 from django.urls import reverse
 
-from umap.models import Map, Team
+from umap.models import Team
 
 pytestmark = pytest.mark.django_db
 
@@ -15,40 +15,6 @@ 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()