umap-project 2.8.0a2__tar.gz → 2.8.0b0__tar.gz

{umap_project-2.8.0a2 → umap_project-2.8.0b0}/PKG-INFO

@@ -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.0b0/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "2.8.0b0"

umap_project-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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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_project-2.8.0a2 → umap_project-2.8.0b0}/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 %}