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

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.8.0a2"
+VERSION = "2.8.0b0"

umap/settings/local_s3.py

@@ -0,0 +1,45 @@
+from umap.settings.local import *
+
+DATABASES = {
+    "default": {
+        "ENGINE": "django.contrib.gis.db.backends.postgis",
+        "NAME": "umaps3",
+    }
+}
+
+STORAGES = {
+    "default": {
+        "BACKEND": "storages.backends.s3.S3Storage",
+        "OPTIONS": {
+            "access_key": "OScTD3CClCcO54Ax2DLz",
+            "secret_key": "eK9tfPRHoFh0nKLkZpJJoC4RJS1ptGfko3iBBd5k",
+            "bucket_name": "umap-default",
+            "region_name": "eu",
+            "endpoint_url": "http://127.0.0.1:9000",
+        },
+    },
+    "data": {
+        "BACKEND": "umap.storage.s3.S3DataStorage",
+        "OPTIONS": {
+            "access_key": "OScTD3CClCcO54Ax2DLz",
+            "secret_key": "eK9tfPRHoFh0nKLkZpJJoC4RJS1ptGfko3iBBd5k",
+            "bucket_name": "umap",
+            "region_name": "eu",
+            "endpoint_url": "http://127.0.0.1:9000",
+        },
+    },
+    "staticfiles": {
+        "BACKEND": "storages.backends.s3.S3Storage",
+        "OPTIONS": {
+            "access_key": "OScTD3CClCcO54Ax2DLz",
+            "secret_key": "eK9tfPRHoFh0nKLkZpJJoC4RJS1ptGfko3iBBd5k",
+            "bucket_name": "umap-staticfiles",
+            "region_name": "eu",
+            "endpoint_url": "http://127.0.0.1:9000",
+            "default_acl": "public-read",
+            # "querystring_auth": False,
+        },
+    },
+}
+
+# STATIC_URL = "http://127.0.0.1:9000/umap-staticfiles/"

umap/static/umap/css/form.css

@@ -1,3 +1,6 @@
+.umap-form-inline {
+    display: inline;
+}
 input[type="text"], input[type="password"], input[type="date"],
 input[type="datetime-local"], input[type="email"], input[type="number"],
 input[type="search"], input[type="tel"], input[type="time"], input[type="file"],

umap/static/umap/js/modules/data/features.js

@@ -658,6 +658,18 @@ class Feature {
     )
     return items
   }
+
+  isActive() {
+    return this._umap.activeFeature === this
+  }
+
+  activate() {
+    this._umap.activeFeature = this
+  }
+
+  deactivate() {
+    if (this._umap.activeFeature === this) this._umap.activeFeature = undefined
+  }
 }
 
 export class Point extends Feature {

umap/static/umap/js/modules/data/layer.js

@@ -526,15 +526,13 @@ export class DataLayer extends ServerStored {
   }
 
   async importFromFiles(files, type) {
-    let all = []
+    const toLoad = []
     for (const file of files) {
-      const features = await this.importFromFile(file, type)
-      if (features) {
-        all = all.concat(features)
-      }
+      toLoad.push(this.importFromFile(file, type))
     }
+    const features = await Promise.all(toLoad)
     return new Promise((resolve) => {
-      resolve(all)
+      resolve([].concat(...features))
     })
   }
 

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

@@ -64,7 +64,10 @@ export default class Importer extends Utils.WithTemplate {
     this.TYPES = ['geojson', 'csv', 'gpx', 'kml', 'osm', 'georss', 'umap']
     this.IMPORTERS = []
     this.loadImporters()
-    this.dialog = new Dialog({ className: 'importers dark' })
+    this.dialog = new Dialog({
+      className: 'importers dark',
+      back: () => this.showImporters(),
+    })
   }
 
   loadImporters() {
@@ -172,7 +175,7 @@ export default class Importer extends Utils.WithTemplate {
       button.addEventListener('click', () => plugin.open(this))
       grid.appendChild(button)
     }
-    this.dialog.open({ template: element, cancel: false, accept: false })
+    this.dialog.open({ template: element, cancel: false, accept: false, back: false })
   }
 
   build() {
@@ -355,9 +358,11 @@ export default class Importer extends Utils.WithTemplate {
 
   onSuccess(count) {
     if (count) {
-      Alert.success(translate('Successfully imported {count} feature(s)'), {
-        count: count,
-      })
+      Alert.success(
+        translate('Successfully imported {count} feature(s)', {
+          count: count,
+        })
+      )
     } else {
       Alert.success(translate('Data successfully imported!'))
     }

umap/static/umap/js/modules/rendering/icon.js

@@ -22,7 +22,7 @@ export function getClass(name) {
 
 export const RECENT = []
 
-const BaseIcon = L.DivIcon.extend({
+const BaseIcon = DivIcon.extend({
   initialize: function (options) {
     const default_options = {
       iconSize: null, // Made in css
@@ -86,6 +86,7 @@ const DefaultIcon = BaseIcon.extend({
   },
 
   _setIconStyles: function (img, name) {
+    if (this.feature.isActive()) this.options.className += ' umap-icon-active'
     BaseIcon.prototype._setIconStyles.call(this, img, name)
     const color = this._getColor()
     const opacity = this._getOpacity()

umap/static/umap/js/modules/rendering/map.js

@@ -233,12 +233,8 @@ const ManageTilelayerMixin = {
   },
 
   updateTileLayers: function () {
-    const callback = (tilelayer) => {
-      this.options.tilelayer = tilelayer.toJSON()
-      this._umap.isDirty = true
-    }
     if (this._controls.tilelayersChooser) {
-      this._controls.tilelayersChooser.openSwitcher({ callback, edit: true })
+      this._controls.tilelayersChooser.openSwitcher({ edit: true })
     }
   },
 }
@@ -263,8 +259,12 @@ export const LeafletMap = BaseMap.extend({
     this.loader.onAdd(this)
 
     if (!this.options.noControl) {
-      DomEvent.on(document.body, 'dataloading', (e) => this.fire('dataloading', e))
-      DomEvent.on(document.body, 'dataload', (e) => this.fire('dataload', e))
+      DomEvent.on(document.body, 'dataloading', (event) =>
+        this.fire('dataloading', event.detail)
+      )
+      DomEvent.on(document.body, 'dataload', (event) =>
+        this.fire('dataload', event.detail)
+      )
       this.on('click', this.closeInplaceToolbar)
     }
 

umap/static/umap/js/modules/rendering/ui.js

@@ -238,11 +238,15 @@ export const LeafletMarker = Marker.extend({
   },
 
   highlight: function () {
-    DomUtil.addClass(this.options.icon.elements.main, 'umap-icon-active')
+    this.feature.activate()
+    this._redraw()
+    this._bringToFront()
   },
 
   resetHighlight: function () {
-    DomUtil.removeClass(this.options.icon.elements.main, 'umap-icon-active')
+    this.feature.deactivate()
+    this._redraw()
+    this._resetZIndex()
   },
 
   getPopupToolbarAnchor: function () {

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

@@ -47,8 +47,8 @@ class BaseRequest {
 // In case of error, an alert is sent, but non 20X status are not handled
 // The consumer must check the response status by hand
 export class Request extends BaseRequest {
-  fire(name, params) {
-    document.body.dispatchEvent(new CustomEvent(name, params))
+  fire(name, detail) {
+    document.body.dispatchEvent(new CustomEvent(name, { detail }))
   }
 
   async _fetch(method, uri, headers, data) {

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

@@ -6,6 +6,7 @@ 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">
@@ -123,6 +124,10 @@ 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,6 +218,14 @@ 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)
@@ -570,9 +578,11 @@ export default class Umap extends ServerStored {
     }
     this.datalayersLoaded = true
     this.fire('datalayersloaded')
+    const toLoad = []
     for (const datalayer of this.datalayersIndex) {
-      if (datalayer.showAtLoad()) await datalayer.show()
+      if (datalayer.showAtLoad()) toLoad.push(datalayer.show())
     }
+    await Promise.all(toLoad)
     this.dataloaded = true
     this.fire('dataloaded')
   }
@@ -643,6 +653,12 @@ 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')
   }
 
@@ -1184,7 +1200,7 @@ export default class Umap extends ServerStored {
   geometry() {
     /* Return a GeoJSON geometry Object */
     const latlng = this._leafletMap.latLng(
-      this._leafletMap.options.center || this._leafletMap.getCenter()
+      this.properties.center || this._leafletMap.getCenter()
     )
     return {
       type: 'Point',
@@ -1426,9 +1442,14 @@ 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 title = DomUtil.add('span', '', row, datalayer.options.name)
+      const builder = new U.FormBuilder(
+        datalayer,
+        [['options.name', { handler: 'EditableText' }]],
+        { className: 'umap-form-inline' }
+      )
+      const form = builder.build()
+      row.appendChild(form)
       row.classList.toggle('off', !datalayer.isVisible())
-      title.textContent = datalayer.options.name
       row.dataset.id = stamp(datalayer)
     })
     const onReorder = (src, dst, initialIndex, finalIndex) => {
@@ -1662,8 +1683,8 @@ export default class Umap extends ServerStored {
   }
 
   _setCenterAndZoom() {
-    this._leafletMap.options.center = this._leafletMap.getCenter()
-    this._leafletMap.options.zoom = this._leafletMap.getZoom()
+    this.properties.center = this._leafletMap.getCenter()
+    this.properties.zoom = this._leafletMap.getZoom()
     this.isDirty = true
     this._defaultExtent = false
   }

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

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

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/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()

umap/tests/test_views.py

@@ -267,80 +267,6 @@ def test_change_user_slug(client, user, settings):
     assert f"/en/user/{user.pk}/" in response.content.decode()
 
 
-@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"
-
-
-@pytest.mark.django_db
-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
-
-
-@pytest.mark.django_db
-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
-
-
-@pytest.mark.django_db
-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.django_db
-def test_user_dashboard_display_user_team_maps(client, map, team, user):
-    user.teams.add(team)
-    user.save()
-    map.team = team
-    map.save()
-    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
-
-
-@pytest.mark.django_db
-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
-
-
 @pytest.mark.django_db
 def test_logout_should_return_redirect(client, user, settings):
     client.login(username=user.username, password="123123")

umap/views.py

@@ -317,7 +317,11 @@ class TeamMaps(PaginatorMixin, DetailView):
     context_object_name = "current_team"
 
     def get_maps(self):
-        return Map.public.filter(team=self.object).order_by("-modified_at")
+        qs = Map.public
+        user = self.request.user
+        if user.is_authenticated and user in self.object.users.all():
+            qs = Map.objects
+        return qs.filter(team=self.object).order_by("-modified_at")
 
     def get_context_data(self, **kwargs):
         kwargs.update(

{umap_project-2.8.0a2.dist-info → umap_project-2.8.0b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.8.0a2
+Version: 2.8.0b0
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>

{umap_project-2.8.0a2.dist-info → umap_project-2.8.0b0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=0_15wRSL9SkA85FevSlxLo6H6SAySXR0t2XW5TtIIQA,20
+umap/__init__.py,sha256=HZ0yMvM34f8qnnOHbQ9kawpYuPlBrkN42-iKFemdmLQ,20
 umap/admin.py,sha256=LoQytPGK6pLBqZ5QgQ9DIPAxhTG31cTtHOCqO9BY5S4,2645
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/asgi.py,sha256=CuVSNBwNb4AvuaD_Ha3ehtvf-c46ijZoVOSoP6WhXp8,432
@@ -12,7 +12,7 @@ umap/middleware.py,sha256=p8EPW_gYW8Wh2lk0DNIAkZQbYlBZugW7Yq4iiA7L4aE,514
 umap/models.py,sha256=4SzhKdyWXfJMdzEpCyVPnzbTT-TGbDusAy7SP_8UuwI,17929
 umap/urls.py,sha256=LA3zxyu-GDo8kVqdyU7_bdbDGhDJV8_yFW4oEPTXw4s,7559
 umap/utils.py,sha256=19i8ibi-1IXxafT4k_yOHMhD-DsPH74Ll9qw-UrUkM4,5856
-umap/views.py,sha256=hMBxefWDUZQUVUb5C477cVyL7hp7OfppZlu4_sw9L4o,46266
+umap/views.py,sha256=Z1_X5FaAhco-O_Np6FP8nXDgG-bqOL005R_qWT_GsMg,46414
 umap/websocket_server.py,sha256=D9sTHhKg0DG37b8bw7KWTKMDc6TPyTkNLCVkh2mlFOo,6604
 umap/wsgi.py,sha256=IopIgnDZbCus3XpSetTHnra9VyzWi0Y2tJo-CmfTWCY,1132
 umap/bin/__init__.py,sha256=iA3ON4A6NCpenrn3q2OgefUKF5QRFIQS-FtS0pxruI8,234
@@ -149,6 +149,7 @@ umap/settings/__init__.py,sha256=aPJkOTk0uFusIBA-uOjdUi10R5Cxt4jl5yv2_uCTUvo,170
 umap/settings/base.py,sha256=rhaIDby2wSb4v8IBx_6xqHVnIigD4G0xzdHX2-9UfNM,11096
 umap/settings/dev.py,sha256=pj1mpmZXiI2syW8pB01wcVeqCFABF3V-nlOxArir4cw,386
 umap/settings/local.py.sample,sha256=wpnoe7qtXer_xBuhWbcbqcSCotTJRu6h8hG7N-sD0b4,3157
+umap/settings/local_s3.py,sha256=tunaCRn_I7P0IZH-UJpB1I5ft2kE0ZIBY8GYZeLYyfM,1387
 umap/static/.gitignore,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/static/umap/base.css,sha256=oUvs6YBtFZCgOEk7tVhnlkooORFZ5e1I9qSFGNeBrlw,3771
 umap/static/umap/bitbucket.png,sha256=Z-xsnM3QOUn9tJQ0RjPXCpALghrzaDDZP7wSePSjSr8,9125
@@ -156,16 +157,16 @@ umap/static/umap/content.css,sha256=04_50AU8iF26_979Ds0sMby4LlKIpm3J08zsv1-blIY,
 umap/static/umap/font.css,sha256=fYmTKNd_Ts6TrmBbnLRgyeUS4vpfxkEqhLR-pkd3KrA,904
 umap/static/umap/github.png,sha256=Yiw6VX71qO87vNgJaDuirn3JVlUwrzIpkT9vbtROg1o,1564
 umap/static/umap/keycloak.png,sha256=K-23F1dda0wD_39dXN5KmGqmgFvde6baNiZ8gdk0NyY,16598
-umap/static/umap/map.css,sha256=thD4iHeGokMMbMKXj-QFlSwyyjZh5YHSSqUUR8Ts2EM,28473
+umap/static/umap/map.css,sha256=B82ED0WSOrJs4kh943ThK-vi5sU6250DStSsDkfYhVw,25208
 umap/static/umap/nav.css,sha256=IKB8Ga8TRal8naxjsgrcrnCO2eaKUL3YNofJB9IN9l0,1865
 umap/static/umap/openstreetmap.png,sha256=xccBb_RsN7uchm7fRowVLjrzmCtj1-1PLByurkdjcr8,19408
 umap/static/umap/theme.css,sha256=gkbyghlT5kNfz0Qyg1JL7xalqvHVx321eO9qlnvcaAU,49
 umap/static/umap/twitter.png,sha256=BnVH7PcYlgKW56KHSOMRPevji2DvhJmvzFjl3-iF7c0,3225
-umap/static/umap/vars.css,sha256=ckkSD9F7D9-IM8P-6qnU8CAxIPS6yq-rNQnzsoofUPo,1856
+umap/static/umap/vars.css,sha256=OUwPeNbExmoMkyCwmBtqOese9JqjvC87hvJRDP4u4S8,1825
 umap/static/umap/css/bar.css,sha256=u40xqJQtYgBDfhdELlXxkh9kPmn7T2pMEJQWeiG6EvA,4851
 umap/static/umap/css/contextmenu.css,sha256=AdPajFTy2M_yHbkMKDYdh45gRO4amNd0OXRYYDNZSI4,437
 umap/static/umap/css/dialog.css,sha256=9qwy9rOcTQY6SPkteM7dW1t36XQBJVoGETQatSOvffM,879
-umap/static/umap/css/form.css,sha256=CPBhU9tXuHeo6yng68v1LQcTEfsdM3nv2VNCWMYW3QM,13589
+umap/static/umap/css/form.css,sha256=BW5R_mr4xXN1HaT97v6IPSFMQUH4tsxOm1eJkrpyVJI,13632
 umap/static/umap/css/icon.css,sha256=-lFltPt6bgAhzXPWqYW97JTY3Y22dbR7KXoOmLZQiU8,4328
 umap/static/umap/css/importers.css,sha256=iS3krkVPpqUQlPNQXSyByyho7rHBzxYqm04bPyKo_qY,1455
 umap/static/umap/css/panel.css,sha256=fRPw-dyrcRegoOxTOWTDjBwuI_aHNPmmBOY16flsCBI,3073
@@ -221,9 +222,9 @@ umap/static/umap/img/source/16-white.svg,sha256=0xOMZOwpZW72QHt4SPao4BEr2lE6kZvW
 umap/static/umap/img/source/16.svg,sha256=r3ZFL-rjyozbiboXDQOkoCLHW-0LTQa4Di9qF7z7qV0,44441
 umap/static/umap/img/source/24-white.svg,sha256=t5713m3RdG9vunV2nUhLY4o4xT9v7ke3NY42g9FeAnE,29206
 umap/static/umap/img/source/24.svg,sha256=2HY-QmZc2_eV3TyqGLlzqgJXCLVbrzKQV5Q6JLWgNiI,38319
-umap/static/umap/js/umap.controls.js,sha256=gY3ej4xzkrFsaySkUD_bYXcaSKLgFN6P_e65cDch8hE,29947
+umap/static/umap/js/umap.controls.js,sha256=gk6IFPepAJ6QRAX48PJWwukVjbxpzf3UANw0fF0VabQ,30016
 umap/static/umap/js/umap.core.js,sha256=FGx6GVcfrE_sn_izOt5r4DLkbO3-bv28jeXV8kwwUio,7029
-umap/static/umap/js/umap.forms.js,sha256=X0aTpmG5D2z-bSuD_Rpw73hx3o8Zz7d7qfBuvTpnYW4,31978
+umap/static/umap/js/umap.forms.js,sha256=clc4Kb3F8jpGXlLiilgW6EQtFmEXmnXx9BfmkFEhkFo,32962
 umap/static/umap/js/components/base.js,sha256=gDb1fGuNCC1KEu4PlQflC1PDNyrulhqLhmlsjyCJpps,1575
 umap/static/umap/js/components/fragment.js,sha256=-rOrcyPpZ5ihD_hh0C1qrYpaim11JYh5fg0x_od_m5U,379
 umap/static/umap/js/components/alerts/alert.css,sha256=fSmbDDjXjEYLfgnEAVDhyqWiBOUy2YhVRy0_den-7Dk,4930
@@ -237,32 +238,32 @@ umap/static/umap/js/modules/formatter.js,sha256=drbIxbDGrcHOUtzJtC4B5iKpm8-YNg_b
 umap/static/umap/js/modules/global.js,sha256=7jm6NLZ5PM2yrkbWHdWkoDFcevgIAMqE-vZQRXcIgEo,934
 umap/static/umap/js/modules/help.js,sha256=0vsDTFGcPz2coG_LBeGPSUQupZTFUes6kCwQCPBUjuU,9694
 umap/static/umap/js/modules/i18n.js,sha256=dEpjsWoEZa-Tr5_MDO0tuWkt7kLL3crxXqhttyP-khU,1387
-umap/static/umap/js/modules/importer.js,sha256=6wqs2z-jrfcwvSFvmPuJWDnP9s1dUEe2Oi1ili3FZ0M,10961
+umap/static/umap/js/modules/importer.js,sha256=1RTRY9w_fn24lMTlpH_ktbDvvNCO1VHDihN3oSu25co,11045
 umap/static/umap/js/modules/leaflet-configure.js,sha256=P3aD8iNGxuVNv-xW4Di4txAjNmnlpKtCCzDvPaKEdQ8,243
 umap/static/umap/js/modules/orderable.js,sha256=zDtcElZ_MVPoGba8Iv9bxOzk4vuN7C-5XVl4UomDYHE,2521
 umap/static/umap/js/modules/permissions.js,sha256=RxKrfjLo6hdGuAvwQrzUUJJznD5RkmSkAHVMidA9iKQ,8497
-umap/static/umap/js/modules/request.js,sha256=hMy3dleGRxstKsksbNa15w7jk4H9-nAV_ub-JdNhDD8,3881
+umap/static/umap/js/modules/request.js,sha256=9GRJoOPbdkHL9OFP6Joaf5wzsJckPyiG2O7AxQciTik,3885
 umap/static/umap/js/modules/rules.js,sha256=z_QmGH5HdS1HVtJXBjQsGkz7kus_E2NocZAqaP7BN1g,7433
 umap/static/umap/js/modules/saving.js,sha256=oO6S23KldT19e3xM_iupw0ZDruyyCNHBx5e5wtrejhI,689
 umap/static/umap/js/modules/schema.js,sha256=RuBO5obpccTPH_iPXRU-lwyj1SoX9bp619tknrPiZjI,13141
 umap/static/umap/js/modules/share.js,sha256=s1X59VpMqut_Vhg7l7LV2IZDm9obRVbDH9wZbG5kX3c,7182
 umap/static/umap/js/modules/slideshow.js,sha256=zcRzOMkJvhps1npGRjHkdK4Ce3UkqOsv8OsDgQWO-bg,3567
 umap/static/umap/js/modules/tableeditor.js,sha256=6p2YE2-NF4NkwLDQkqrl90P_PwOYdFao0-ac_AkOwWs,9854
-umap/static/umap/js/modules/umap.js,sha256=VSU8p94tLKZBGeL1NWWmrsT81RTZNW1oROOxsUqeAxI,50071
+umap/static/umap/js/modules/umap.js,sha256=4ZlODvjcUXMV6w1232yV95eD1YlJYajUy4l27E3rRxU,50575
 umap/static/umap/js/modules/urls.js,sha256=76cFqycj2O8huuoYYBvxnVt2Fc2UDbgrRsiv6lQmcSY,890
 umap/static/umap/js/modules/utils.js,sha256=fYzo-WjRzDZsdjv3CI9U4Es3AqOfuBCJuRq997m2EfQ,12309
-umap/static/umap/js/modules/data/features.js,sha256=rd5WpZoai3u4baWxi_8m2vtwGLuI-9hdH4PGnrjqg_4,31667
-umap/static/umap/js/modules/data/layer.js,sha256=uLEVGp3gFq7obA9Ij-RVz-VWqo9SwLQd1uBzmaKYo9o,35101
+umap/static/umap/js/modules/data/features.js,sha256=rYkQ-rMDN6t69K0WyAqyHrg5YAMS3GDbkrK1LrudXAU,31890
+umap/static/umap/js/modules/data/layer.js,sha256=rLoAqwPfxURJNSSweoaq1WsAlxOyGT1yFHAIuta4AsY,35097
 umap/static/umap/js/modules/importers/cadastrefr.js,sha256=KHqxHleFRFzNi98gegvUM1R6eJorAGGcMft_ktUg-ug,2262
 umap/static/umap/js/modules/importers/communesfr.js,sha256=6q6ilmYhhuSmgdrvfTyEDNyMLbc9J9Bt8VMZVXB8ZOA,1723
 umap/static/umap/js/modules/importers/datasets.js,sha256=StZbRiq_1vqe0OO1w66k5Lwzju8RntmHpWe9HWIDfRE,1372
 umap/static/umap/js/modules/importers/geodatamine.js,sha256=vIxANzNc1TAe3QcZroIxqNvos1vexBmKDTtzErBNiY4,2949
 umap/static/umap/js/modules/importers/overpass.js,sha256=cY2kb3Fs8tA6PqBjGyc5bI0mg7L1ijapIAkVGwEhSwI,3341
-umap/static/umap/js/modules/rendering/icon.js,sha256=hguSJt3wDqe0oSQIm1zrYSbyktKVQUWv-QTo5fYdlc8,7861
-umap/static/umap/js/modules/rendering/map.js,sha256=rmI6Y6HHWxWVNokhXl0ADkQDoHzJda5KRdrIZGWrzKI,12956
+umap/static/umap/js/modules/rendering/icon.js,sha256=ZMN6R6ji1au3Iq7XrVLkXgDOzTveU-bMsnFewL0Kaz0,7938
+umap/static/umap/js/modules/rendering/map.js,sha256=tASIpjHaTDlveiErTbmxH4eMywdVMQ9pZjZHQUykSf4,12880
 umap/static/umap/js/modules/rendering/popup.js,sha256=EHfOSPb8BmbGK6-DcGekfbIDpNjH-y8L2QnpfbJEr3Y,2604
 umap/static/umap/js/modules/rendering/template.js,sha256=LRLhU8kKoZpvyPR2h1E3XyfS4BY07p3b82KPZPk5rbU,7890
-umap/static/umap/js/modules/rendering/ui.js,sha256=KmAoFiLjiA6IqWzn8gK4U7H_361aAIXZjNWVgnxm_go,14323
+umap/static/umap/js/modules/rendering/ui.js,sha256=Pz7vS8jhbTy7k70mXBFwR8OH1McI98NeRCT6Fc_x7pM,14317
 umap/static/umap/js/modules/rendering/layers/base.js,sha256=DeXxRwTatoxxGStT1tWyNQVCrIkbgd7ZaawIPxWIcOQ,2525
 umap/static/umap/js/modules/rendering/layers/classified.js,sha256=h4cKB4sZ05MTwlE_kur292HRHxdaSkuwIMmW5JaU-Ac,14679
 umap/static/umap/js/modules/rendering/layers/cluster.js,sha256=970BbIdiOUQTdNRRRA_4sY2L-1fTe6wb0wBFeuHZxww,3368
@@ -274,7 +275,7 @@ umap/static/umap/js/modules/sync/websocket.js,sha256=1UtvsTAm-gkfpBRcLPykPvDyax3
 umap/static/umap/js/modules/ui/bar.js,sha256=zoWNOKhs-Sf5pFTlPFoEAysS-AUF6ZlXdO5UA9jom2A,7570
 umap/static/umap/js/modules/ui/base.js,sha256=8PN8TRIBqTANRufwVvV0XzOdaYQuRCnlWGbTGq8FZiM,2491
 umap/static/umap/js/modules/ui/contextmenu.js,sha256=VzC94uGUt8DkzC60Gcbz-MxivfSITEqUC91Fkpq1gjk,2550
-umap/static/umap/js/modules/ui/dialog.js,sha256=Jh2jb4qjxx_eTGAU9cRZHwWhtyk2HFVg7dkP8eCtBLQ,5403
+umap/static/umap/js/modules/ui/dialog.js,sha256=geAcMf2ajpNpDePDbaOz_kOiWOZWtpOHT7kBYqOHEa0,5620
 umap/static/umap/js/modules/ui/panel.js,sha256=phPWwCFxQ9AJ9auPPayD5Xtf6yQemQSZHlVlLANfTx0,3240
 umap/static/umap/js/modules/ui/tooltip.js,sha256=M2KBb5CA4AvaA-6QgfpUKMYQuGXzTqx4ZVA9fkMRBEs,1642
 umap/static/umap/locale/am_ET.js,sha256=TsgZgJkMMmFAJE0nJIq62r8hHvFgLLjcA6axXQlkbog,33822
@@ -454,7 +455,7 @@ umap/storage/s3.py,sha256=KAYu3vAqXbd5UhaoPxG6zcGtBfKZOzzi-6uY6YEuIcY,1962
 umap/storage/staticfiles.py,sha256=mxFcenC1JECmpNy4H0e7vX8GObDZVXzs1RPjQFWNd5k,2473
 umap/templates/404.html,sha256=1yLlD8rSF_9cfjm5FYy--P46HLVbHeFkJiW9nRzM--E,399
 umap/templates/500.html,sha256=Z8x47OVfYXquAYAlmRB0EJVTCiCaBppFFiFEmoYsMYY,5202
-umap/templates/base.html,sha256=_Q0Ikwese3vlUl0pKQdzHDy_oRT9OV4uWh0RGFaYAQA,1499
+umap/templates/base.html,sha256=wb-WxYqyJ-GVQWJYrpVqLE4FYz3hOu0lJic6XL8VPxY,1548
 umap/templates/auth/user_detail.html,sha256=ud6AnM2ZK9WN8SuAnmKhZlGN0Wbi-GOzy09hoPfL04I,525
 umap/templates/auth/user_form.html,sha256=h9NZi9KIC_5jkvj5KAsxX5CdiYCrQ2lrl9qpr5ObPcg,1730
 umap/templates/auth/user_stars.html,sha256=LAGZU50ki2SCqZ0o_NBfN7T2RDl-L_1EGLixu5OH4AY,545
@@ -464,17 +465,17 @@ umap/templates/umap/about_summary.html,sha256=5pvCvX34YHk_XCtZfcRSznvRwi_-UJMioD
 umap/templates/umap/branding.html,sha256=8IzkIWqiZckgkX9FC-n1v6f8JIB2q7DcX3JHscxsaYA,60
 umap/templates/umap/content.html,sha256=KfNQ18LcbxFd00tHQeirGy5Vh75qQNM6pj0bQbcy4Bo,2246
 umap/templates/umap/content_footer.html,sha256=wkdc4Usuq4-vDIJHPxv-KS6KL4gBkUl7ARyU7zz1Zis,1154
-umap/templates/umap/css.html,sha256=kOo_21HmUKEfZk6rUtZaBbiidens27wDUH3fdYEoU-k,2266
+umap/templates/umap/css.html,sha256=rlqw64vDT-mpl3Ckv6izFuU-BQHJwXw9Aw1TeFmhL80,2308
 umap/templates/umap/dashboard_menu.html,sha256=DEzGwiL_U1ntDpY0Ybda5ijDMSNw-n7Vb-V7HrsqYgo,688
 umap/templates/umap/footer.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/templates/umap/header.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/templates/umap/home.html,sha256=021I4eVLjMWvhsIqo2k2FADXla2c4UClAJ1uy9R5KVI,839
-umap/templates/umap/js.html,sha256=txh_b153ORSG9OSMxgQp9jbZHwtVoWWzt6fBFiIK7sE,2425
+umap/templates/umap/js.html,sha256=5BFbBGsBpebyGgn8yTnj-TEZ1qrWQUTjDC4AJHLdnug,2466
 umap/templates/umap/locale.js,sha256=AP-mSJQq5RyC3eNaBbk-sOsD80r0_qlvuK1afXdsVo4,112
 umap/templates/umap/login_popup_end.html,sha256=kcENvhycpVvvIzbNasX1rcSI_67A6pttkWCxy0vHC8g,693
 umap/templates/umap/map_detail.html,sha256=xMOsbF7NWJ-mpShR0ciJ8MrTeG2OYDm8OIL0yHbW6eg,1192
 umap/templates/umap/map_fragment.html,sha256=ZRIA3W2tuIecv2LtxyKNSW4k7PmCxRlFmI6TIKC1EV8,152
-umap/templates/umap/map_init.html,sha256=rfx8IUol6YTQwBcyaYBEuFDvFzTtFqs5Jh1Yc5gdGbs,285
+umap/templates/umap/map_init.html,sha256=5hX7FE0vN6P70KFf8aKusOCERGzy9JoCPg7oyoIWfLQ,334
 umap/templates/umap/map_list.html,sha256=Jb-VU3dQdRWsW80nyyRq1Eb6UrhAoIfGleu1cNMJKwc,673
 umap/templates/umap/map_table.html,sha256=WrH86ybY_GzzRmALfON_oni9aFuIswgOtpTSJ5h8SEY,5778
 umap/templates/umap/messages.html,sha256=liEsg-I26XHb0FOBAbzFsZl2RfNQtGt-HKoE6jHefbI,190
@@ -487,9 +488,9 @@ umap/templates/umap/success.html,sha256=3FG4yWwtdF3zvVWQ2ZAjCkgv0kcSNZlUjgYy_b-X
 umap/templates/umap/team_confirm_delete.html,sha256=D4EKfuzVjAexHKPHRsSHpjuAjMNl0iCPtaW2NEGUk2A,448
 umap/templates/umap/team_detail.html,sha256=4gd8YjvVqGysXNJtzAaZwOpBAADLzJ_ekFRPQp1sHYM,699
 umap/templates/umap/team_form.html,sha256=yG_zxmJfEwLC5Mof-4SHYcx6lfkOjbGVusQGT7iqSNs,1922
-umap/templates/umap/user_dashboard.html,sha256=kMKk8YHDJkLzs9M9ZBMkrshnDtknrt2dn6OXQb3FeMw,2478
+umap/templates/umap/user_dashboard.html,sha256=nls1Nzhwvv1QKI3fOV_2QPuQocCKVZ3STvBKXaKUJZ8,2527
 umap/templates/umap/user_teams.html,sha256=MfelqIwoLRVjvX-KpVtwqh0I7pNx3oDRhqmSRdpT4bs,1570
-umap/templates/umap/components/alerts/alert.html,sha256=eQRALES_PzIP3qs16eXq9SGz2KWODr4VY0tyl_hARCw,3482
+umap/templates/umap/components/alerts/alert.html,sha256=ZvisQkz2GfK2jxEqTosYH72N5gIK1604ATVNa_vHT7U,3564
 umap/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/templatetags/umap_tags.py,sha256=OumX1AI9uWzNP3zbjexTz7lGp10FweW0NRFSsdQ_cuU,1759
 umap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -497,6 +498,7 @@ umap/tests/base.py,sha256=x9GVS5eAzc1CHyNxx5gd2w0AJCeHIr4nmX4yak8LhyM,4768
 umap/tests/conftest.py,sha256=KQCZanCTl1ABLIKOuyxS_cpBoXGiwjDc29jsLBiSWxY,1633
 umap/tests/settings.py,sha256=tY70LMFXyo_WijswqGyeWai7vBzM62k7IA8pkkbc9y4,816
 umap/tests/test_clean_tilelayer.py,sha256=wGTd_AHOTmQ4QMswAyc-1_lJmQOSyhY3OahLAusEIdA,2515
+umap/tests/test_dashboard.py,sha256=w9IgKdupP9JpixLqvNl6UKbglgFVN_dG_R9Zvw1SJy0,2880
 umap/tests/test_datalayer.py,sha256=NWX7o-sLOrq3nHT0GDywz5vtJU4HJhZZh11r_rWxhVA,9539
 umap/tests/test_datalayer_s3.py,sha256=6V3AK22AXkFNjx5__SyBk0Uj0rTDAjJQv67r7D_MDVc,4155
 umap/tests/test_datalayer_views.py,sha256=Fx_oQF3hBC2FVHTTjTScXbFS2d7FRKdBL7QFFexvKkg,22880
@@ -506,10 +508,10 @@ umap/tests/test_map.py,sha256=vrtheSMQNk45kBIcJ0QY9K7HKYee5yg4Vnp78DyaIwQ,5170
 umap/tests/test_map_views.py,sha256=EKLJnQ-xk_bkaJ6P7OJ2bnya5orbaSnWFV8GIYcjDNk,33823
 umap/tests/test_merge_features.py,sha256=uLZSW00WAI8_nZS0KPP8gg8U4nnky-XGb-VhhKUxv1M,2275
 umap/tests/test_statics.py,sha256=xKuxT8Xj5Ii7gKISuiSfDj7dpjmJ2Ierby3Lg-haZCg,1264
-umap/tests/test_team_views.py,sha256=vExhJ3c1cJ7vgxe0G20UzTKkzR5D2UgAapk09muUg5w,4481
+umap/tests/test_team_views.py,sha256=edmqn_tx4XQ1sEQtB7CpuJT6WwQQiUyUYu8-ESZxFcw,5615
 umap/tests/test_tilelayer.py,sha256=toVpVutEvMLWKx5uH7ZbGNPGzqICZx1_S2OOpIfYPfQ,603
 umap/tests/test_utils.py,sha256=noh-AFL3qV-dNZYr8L1acsYC02SI710Bq2ZXV-jBEzk,407
-umap/tests/test_views.py,sha256=R8uTHHbZmYcDFpzFiFhNod214v15GI1r1yVJmtqeu2E,18444
+umap/tests/test_views.py,sha256=5KXUH46dtjCItm4nqyrpvgnmM6_YMQ3zjcRPTC8rKBo,15820
 umap/tests/test_websocket_server.py,sha256=BQ9Sy5VC9kBAfPWVxqcXoi9yfq12nfNvBE_j5rTFk7w,696
 umap/tests/fixtures/categorized_highway.geojson,sha256=p7QHOd8nXi7yVq37gY6Ca8BXkjaLnDxW9Fq0Zcm3Fk4,15830
 umap/tests/fixtures/choropleth_region_chomage.geojson,sha256=mVVbYlf92Sr3wWH9ETm43FdHz1U3zjsn91HuU5H5r4Y,21325
@@ -529,6 +531,7 @@ umap/tests/fixtures/test_upload_empty_coordinates.json,sha256=-mJ_1orzUAROfE4PXc
 umap/tests/fixtures/test_upload_georss.xml,sha256=lfmVA0qGDakCG48jjsLmSIE1U6iZ9yyFuqqX6Srt8Js,1160
 umap/tests/fixtures/test_upload_missing_name.json,sha256=klSMHb6laTghzU4AdIG1_p5UZ1LbAJCCKnJea0qEFAI,4566
 umap/tests/fixtures/test_upload_non_linear_ring.json,sha256=WOR0NnJHNUUW6VKzZyIxU7WL1llnAmEVJwCWla6XOds,1525
+umap/tests/fixtures/test_upload_simple_marker.json,sha256=jH15G5PxgVO-DZb4TPxVMAi1_uzhkvZcFkVUb50CS3Q,393
 umap/tests/integration/__init__.py,sha256=nqQ2miDnSZOKDuFhQ5saFN3qQuK73Cs6xL9Od-mEKG4,57
 umap/tests/integration/conftest.py,sha256=OTKeDdLBpFUsqFCnHD-QY2X1iv5m4jIaE__4T4qKdDY,2468
 umap/tests/integration/helpers.py,sha256=vvGX5b-DS2fMVDdeXz1lH2IleZkRHjyL7DVvatJU8Do,344
@@ -545,14 +548,14 @@ umap/tests/integration/test_dashboard.py,sha256=LClLBc8lgDM1-NGhkvUSUMLmMuKt3sR1
 umap/tests/integration/test_datalayer.py,sha256=cxsf65noYTucEMLuUz8DfJ9abXHhAq0n65MvdBmBRVo,5492
 umap/tests/integration/test_draw_polygon.py,sha256=Ub_1Witps_BLwMMmQ4M0vPIyQOEQ_Bq82znpJdWpCfY,25385
 umap/tests/integration/test_draw_polyline.py,sha256=lPr5hz-wHL9oC2B3yveNHC-OxdzWvcf8fHMBZbXTuss,14801
-umap/tests/integration/test_edit_datalayer.py,sha256=Q2y7IEd66f637pkjGYRs_EtFsfQJg40Dk-5ey44_LpA,9798
+umap/tests/integration/test_edit_datalayer.py,sha256=vC_bpfw_eMvYzhu3x6E2vS4gDFb55Ud5p64mfRqZBf4,10292
 umap/tests/integration/test_edit_map.py,sha256=d76M4J6rumDQ6sKaOyTA45dWAkwAOtoUuNkW-GsA-fo,7134
 umap/tests/integration/test_edit_marker.py,sha256=sj4n2mCYQ-qZ02jFHA566Wg_y9F6oXb1AxddnthSQHI,4746
 umap/tests/integration/test_edit_polygon.py,sha256=JeIW6NcBltIl958uJ_T-0dRCT5gOo9JrNtULvg7nxf4,5286
 umap/tests/integration/test_export_map.py,sha256=jH0BXm-7Ov26OEkve9-xKMfRwXwR73zRrZLIQusyUOY,12112
 umap/tests/integration/test_facets_browser.py,sha256=J--y2rpI__0RIPzcTx4Kn2UwuurFdh-6i_Y4c6GxUyY,10658
 umap/tests/integration/test_features_id_generation.py,sha256=e99_8AxeMAi53JjVGlsI32zlrXGAU19FHJfTuYdiBVQ,1511
-umap/tests/integration/test_import.py,sha256=88ep2QaVJ26GF45dPIjwy9S3yCiVulZkTbEUYLDUPKA,30533
+umap/tests/integration/test_import.py,sha256=dBkj-E9LSUTZvcMK8-MratR5aDz0jLrWEuh6Mek0vzg,31266
 umap/tests/integration/test_map.py,sha256=2ZO54RFVycJKGczfioX0nU1oCu29FVC9hR6wbT4s1NE,8736
 umap/tests/integration/test_map_list.py,sha256=l1FImKnJkY7DupYX8waKaUZqhnORR20L8dzaqu-eF8E,1280
 umap/tests/integration/test_map_preview.py,sha256=kP0vkEiUN7EJNCvZgNeUAzrrXfgwpU0S2UnmOBV4P5A,3540
@@ -572,8 +575,8 @@ umap/tests/integration/test_view_marker.py,sha256=ZLS6-GOWYpjeoYGHiHa7HesXJTLu9w
 umap/tests/integration/test_view_polygon.py,sha256=NMJC6Nt9VpQ8FIU9Pqq2OspHv49xsWlsoXCr8iBa0VA,2060
 umap/tests/integration/test_view_polyline.py,sha256=aJoXKmLhJaN0yhPdDCVskZNGx3q3mLDkjVPhZ30cadA,13959
 umap/tests/integration/test_websocket_sync.py,sha256=Xjn8z7Gj2PAmPmLkMTsHztFmhzsfyE3vg-wfewpA2I4,15511
-umap_project-2.8.0a2.dist-info/METADATA,sha256=Z8IXnRgLp4AOUzTAkfRUB5hatnauca2C0V7NrLZieHk,2993
-umap_project-2.8.0a2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-umap_project-2.8.0a2.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-2.8.0a2.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-2.8.0a2.dist-info/RECORD,,
+umap_project-2.8.0b0.dist-info/METADATA,sha256=ekXJ1EOo5be6Xif-mk4mOSVmu58OjcCme27jSfmpLEA,2993
+umap_project-2.8.0b0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+umap_project-2.8.0b0.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-2.8.0b0.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-2.8.0b0.dist-info/RECORD,,