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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.8.0a1
+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.0a1 → umap_project-2.8.0b0}/umap/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-11 17:05+0000\n"
+"POT-Creation-Date: 2024-12-13 08:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -617,57 +617,57 @@ msgstr ""
 msgid "View the map"
 msgstr ""
 
-#: views.py:820
+#: views.py:821
 msgid "See full screen"
 msgstr ""
 
-#: views.py:963
+#: views.py:964
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:999
+#: views.py:1000
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr ""
 
-#: views.py:1002
+#: views.py:1003
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr ""
 
-#: views.py:1009
+#: views.py:1010
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr ""
 
-#: views.py:1012
+#: views.py:1013
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr ""
 
-#: views.py:1023
+#: views.py:1024
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:1026
+#: views.py:1027
 msgid "Map successfully deleted."
 msgstr ""
 
-#: views.py:1052
+#: views.py:1053
 #, python-format
 msgid ""
 "Your map has been cloned! If you want to edit this map from another "
 "computer, please use this link: %(anonymous_url)s"
 msgstr ""
 
-#: views.py:1057
+#: views.py:1058
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1308
+#: views.py:1309
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1330
+#: views.py:1331
 msgid "Permissions updated with success!"
 msgstr ""

{umap_project-2.8.0a1 → umap_project-2.8.0b0}/umap/management/commands/empty_trash.py

@@ -23,10 +23,13 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         days = options["days"]
-        since = datetime.utcnow() - timedelta(days=days)
+        since = (datetime.utcnow() - timedelta(days=days)).date()
         print(f"Deleting map in trash since {since}")
         maps = Map.objects.filter(share_status=Map.DELETED, modified_at__lt=since)
         for map in maps:
+            map_id = map.id
+            map_name = map.name
+            trashed_at = map.modified_at.date()
             if not options["dry_run"]:
                 map.delete()
-            print(f"Deleted map {map.name} ({map.id}), trashed on {map.modified_at}")
+            print(f"Deleted map {map_name} ({map_id}), trashed at {trashed_at}")

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.0a1 → 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.0a1 → 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.0a1 → umap_project-2.8.0b0}/umap/static/umap/js/modules/data/layer.js

@@ -252,10 +252,11 @@ export class DataLayer extends ServerStored {
   }
 
   fromGeoJSON(geojson, sync = true) {
-    this.addData(geojson, sync)
+    const features = this.addData(geojson, sync)
     this._geojson = geojson
     this.onDataLoaded()
     this.dataChanged()
+    return features
   }
 
   onDataLoaded() {
@@ -315,7 +316,7 @@ export class DataLayer extends ServerStored {
     const response = await this._umap.request.get(url)
     if (response?.ok) {
       this.clear()
-      this._umap.formatter
+      return this._umap.formatter
         .parse(await response.text(), this.options.remoteData.format)
         .then((geojson) => this.fromGeoJSON(geojson))
     }
@@ -443,10 +444,11 @@ export class DataLayer extends ServerStored {
     try {
       // Do not fail if remote data is somehow invalid,
       // otherwise the layer becomes uneditable.
-      this.makeFeatures(geojson, sync)
+      return this.makeFeatures(geojson, sync)
     } catch (err) {
       console.log('Error with DataLayer', this.id)
       console.error(err)
+      return []
     }
   }
 
@@ -463,10 +465,13 @@ export class DataLayer extends ServerStored {
       ? geojson
       : geojson.features || geojson.geometries
     if (!collection) return
+    const features = []
     this.sortFeatures(collection)
-    for (const feature of collection) {
-      this.makeFeature(feature, sync)
+    for (const featureJson of collection) {
+      const feature = this.makeFeature(featureJson, sync)
+      if (feature) features.push(feature)
     }
+    return features
   }
 
   makeFeature(geojson = {}, sync = true, id = null) {
@@ -503,31 +508,45 @@ export class DataLayer extends ServerStored {
   }
 
   async importRaw(raw, format) {
-    this._umap.formatter
+    return this._umap.formatter
       .parse(raw, format)
       .then((geojson) => this.addData(geojson))
-      .then(() => this.zoomTo())
-    this.isDirty = true
+      .then((data) => {
+        if (data?.length) this.isDirty = true
+        return data
+      })
   }
 
-  importFromFiles(files, type) {
-    for (const f of files) {
-      this.importFromFile(f, type)
+  readFile(f) {
+    return new Promise((resolve) => {
+      const reader = new FileReader()
+      reader.onloadend = () => resolve(reader.result)
+      reader.readAsText(f)
+    })
+  }
+
+  async importFromFiles(files, type) {
+    const toLoad = []
+    for (const file of files) {
+      toLoad.push(this.importFromFile(file, type))
     }
+    const features = await Promise.all(toLoad)
+    return new Promise((resolve) => {
+      resolve([].concat(...features))
+    })
   }
 
-  importFromFile(f, type) {
-    const reader = new FileReader()
+  async importFromFile(file, type) {
     type = type || Utils.detectFileType(f)
-    reader.readAsText(f)
-    reader.onload = (e) => this.importRaw(e.target.result, type)
+    const raw = await this.readFile(file)
+    return this.importRaw(raw, type)
   }
 
   async importFromUrl(uri, type) {
     uri = this._umap.renderUrl(uri)
     const response = await this._umap.request.get(uri)
     if (response?.ok) {
-      this.importRaw(await response.text(), type)
+      return this.importRaw(await response.text(), type)
     }
   }
 
@@ -930,9 +949,9 @@ export class DataLayer extends ServerStored {
     else this.hide()
   }
 
-  zoomTo() {
+  zoomTo(bounds) {
     if (!this.isVisible()) return
-    const bounds = this.layer.getBounds()
+    bounds = bounds || this.layer.getBounds()
     if (bounds.isValid()) {
       const options = { maxZoom: this.getOption('zoomTo') }
       this._leafletMap.fitBounds(bounds, options)

{umap_project-2.8.0a1 → umap_project-2.8.0b0}/umap/static/umap/js/modules/importer.js

@@ -1,4 +1,8 @@
-import { DomEvent, DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
+import {
+  DomEvent,
+  DomUtil,
+  LatLngBounds,
+} from '../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../components/alerts/alert.js'
 import { translate } from './i18n.js'
 import { SCHEMA } from './schema.js'
@@ -60,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() {
@@ -168,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() {
@@ -270,16 +277,12 @@ export default class Importer extends Utils.WithTemplate {
   }
 
   submit() {
-    let hasErrors
     if (this.format === 'umap') {
-      hasErrors = !this.full()
+      this.full()
     } else if (!this.url) {
-      hasErrors = !this.copy()
+      this.copy()
     } else if (this.action) {
-      hasErrors = !this[this.action]()
-    }
-    if (hasErrors === false) {
-      Alert.info(translate('Data successfully imported!'))
+      this[this.action]()
     }
   }
 
@@ -294,8 +297,9 @@ export default class Importer extends Utils.WithTemplate {
       } else if (this.url) {
         this._umap.importFromUrl(this.url, this.format)
       }
+      this.onSuccess()
     } catch (e) {
-      Alert.error(translate('Invalid umap data'))
+      this.onError(translate('Invalid umap data'))
       console.error(e)
       return false
     }
@@ -306,7 +310,7 @@ export default class Importer extends Utils.WithTemplate {
       return false
     }
     if (!this.format) {
-      Alert.error(translate('Please choose a format'))
+      this.onError(translate('Please choose a format'))
       return false
     }
     const layer = this.layer
@@ -318,26 +322,67 @@ export default class Importer extends Utils.WithTemplate {
       layer.options.remoteData.proxy = true
       layer.options.remoteData.ttl = SCHEMA.ttl.default
     }
-    layer.fetchRemoteData(true)
+    layer.fetchRemoteData(true).then((features) => {
+      if (features?.length) {
+        layer.zoomTo()
+        this.onSuccess()
+      } else {
+        this.onError()
+      }
+    })
   }
 
-  copy() {
+  async copy() {
     // Format may be guessed from file later.
     // Usefull in case of multiple files with different formats.
     if (!this.format && !this.files.length) {
-      Alert.error(translate('Please choose a format'))
+      this.onError(translate('Please choose a format'))
       return false
     }
+    let promise
     const layer = this.layer
     if (this.clear) layer.empty()
     if (this.files.length) {
-      for (const file of this.files) {
-        this._umap.processFileToImport(file, layer, this.format)
-      }
+      promise = layer.importFromFiles(this.files, this.format)
     } else if (this.raw) {
-      layer.importRaw(this.raw, this.format)
+      promise = layer.importRaw(this.raw, this.format)
     } else if (this.url) {
-      layer.importFromUrl(this.url, this.format)
+      promise = layer.importFromUrl(this.url, this.format)
+    }
+    if (promise) promise.then((data) => this.onCopyFinished(layer, data))
+  }
+
+  onError(message = translate('No data has been found for import')) {
+    Alert.error(message)
+  }
+
+  onSuccess(count) {
+    if (count) {
+      Alert.success(
+        translate('Successfully imported {count} feature(s)', {
+          count: count,
+        })
+      )
+    } else {
+      Alert.success(translate('Data successfully imported!'))
+    }
+  }
+
+  onCopyFinished(layer, features) {
+    // undefined features means error, let original error message pop
+    if (!features) return
+    if (!features.length) {
+      this.onError()
+    } else {
+      const bounds = new LatLngBounds()
+      for (const feature of features) {
+        const featureBounds = feature.ui.getBounds
+          ? feature.ui.getBounds()
+          : feature.ui.getCenter()
+        bounds.extend(featureBounds)
+      }
+      this.onSuccess(features.length)
+      layer.zoomTo(bounds)
     }
   }
 }

{umap_project-2.8.0a1 → 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.0a1 → 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.0a1 → 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.0a1 → 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.0a1 → 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.0a1 → 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)
@@ -316,12 +324,14 @@ export default class Umap extends ServerStored {
         dataUrl = this.renderUrl(dataUrl)
         dataUrl = this.proxyUrl(dataUrl)
         const datalayer = this.createDataLayer()
-        await datalayer.importFromUrl(dataUrl, dataFormat)
+        await datalayer
+          .importFromUrl(dataUrl, dataFormat)
+          .then(() => datalayer.zoomTo())
       }
     } else if (data) {
       data = decodeURIComponent(data)
       const datalayer = this.createDataLayer()
-      await datalayer.importRaw(data, dataFormat)
+      await datalayer.importRaw(data, dataFormat).then(() => datalayer.zoomTo())
     }
   }
 
@@ -568,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')
   }
@@ -641,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')
   }
 
@@ -1182,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',
@@ -1424,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) => {
@@ -1514,7 +1537,7 @@ export default class Umap extends ServerStored {
   processFileToImport(file, layer, type) {
     type = type || Utils.detectFileType(file)
     if (!type) {
-      U.Alert.error(
+      Alert.error(
         translate('Unable to detect format of file {filename}', {
           filename: file.name,
         })
@@ -1660,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.0a1 → 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')
   },
 })