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

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.8.0"
+VERSION = "2.8.0a0"

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-13 08:26+0000\n"
+"POT-Creation-Date: 2024-12-11 17:05+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:821
+#: views.py:820
 msgid "See full screen"
 msgstr ""
 
-#: views.py:964
+#: views.py:963
 msgid "Map editors updated with success!"
 msgstr ""
 
-#: views.py:1000
+#: views.py:999
 #, python-format
 msgid "The uMap edit link for your map: %(map_name)s"
 msgstr ""
 
-#: views.py:1003
+#: views.py:1002
 #, python-format
 msgid "Here is your secret edit link: %(link)s"
 msgstr ""
 
-#: views.py:1010
+#: views.py:1009
 #, python-format
 msgid "Can't send email to %(email)s"
 msgstr ""
 
-#: views.py:1013
+#: views.py:1012
 #, python-format
 msgid "Email sent to %(email)s"
 msgstr ""
 
-#: views.py:1024
+#: views.py:1023
 msgid "Only its owner can delete the map."
 msgstr ""
 
-#: views.py:1027
+#: views.py:1026
 msgid "Map successfully deleted."
 msgstr ""
 
-#: views.py:1053
+#: views.py:1052
 #, 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:1058
+#: views.py:1057
 msgid "Congratulations, your map has been cloned!"
 msgstr ""
 
-#: views.py:1309
+#: views.py:1308
 msgid "Layer successfully deleted."
 msgstr ""
 
-#: views.py:1331
+#: views.py:1330
 msgid "Permissions updated with success!"
 msgstr ""

umap/management/commands/empty_trash.py

@@ -23,13 +23,10 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         days = options["days"]
-        since = (datetime.utcnow() - timedelta(days=days)).date()
+        since = datetime.utcnow() - timedelta(days=days)
         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 at {trashed_at}")
+            print(f"Deleted map {map.name} ({map.id}), trashed on {map.modified_at}")

umap/management/commands/migrate_to_S3.py

@@ -2,7 +2,7 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 
 from umap.models import DataLayer
-from umap.storage.fs import FSDataStorage
+from umap.storage import UmapFileSystem
 
 
 class Command(BaseCommand):
@@ -11,9 +11,9 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         assert settings.UMAP_READONLY, "You must run that script with a read-only uMap."
         assert (
-            settings.STORAGES["data"]["BACKEND"] == "umap.storage.s3.S3DataStorage"
+            settings.STORAGES["data"]["BACKEND"] == "umap.storage.UmapS3"
         ), "You must configure your storages to point to S3"
-        fs_storage = FSDataStorage()
+        fs_storage = UmapFileSystem()
         for datalayer in DataLayer.objects.all():
             geojson_fs_path = str(datalayer.geojson)
             try:

umap/settings/base.py

@@ -176,10 +176,10 @@ STORAGES = {
         "BACKEND": "django.core.files.storage.FileSystemStorage",
     },
     "data": {
-        "BACKEND": "umap.storage.fs.FSDataStorage",
+        "BACKEND": "umap.storage.UmapFileSystem",
     },
     "staticfiles": {
-        "BACKEND": "umap.storage.staticfiles.UmapManifestStaticFilesStorage",
+        "BACKEND": "umap.storage.UmapManifestStaticFilesStorage",
     },
 }
 # Add application/json and application/geo+json to default django-storages setting

umap/static/umap/css/form.css

@@ -1,6 +1,3 @@
-.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

@@ -199,9 +199,8 @@ class Feature {
       this._umap.slideshow.current = this
     }
     this._umap.currentFeature = this
-    this.attachPopup().then(() => {
-      this.ui.openPopup(latlng || this.center)
-    })
+    this.attachPopup()
+    this.ui.openPopup(latlng || this.center)
   }
 
   render(fields) {
@@ -356,11 +355,9 @@ class Feature {
     return loadPopup(this.getOption('popupShape') || old)
   }
 
-  async attachPopup() {
+  attachPopup() {
     const Class = this.getPopupClass()
-    const popup = new Class(this)
-    this.ui.bindPopup(popup)
-    return popup.loadContent()
+    this.ui.bindPopup(new Class(this))
   }
 
   async confirmDelete() {
@@ -661,18 +658,6 @@ 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

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

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

@@ -1,8 +1,4 @@
-import {
-  DomEvent,
-  DomUtil,
-  LatLngBounds,
-} from '../../vendors/leaflet/leaflet-src.esm.js'
+import { DomEvent, DomUtil } 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'
@@ -64,10 +60,7 @@ 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',
-      back: () => this.showImporters(),
-    })
+    this.dialog = new Dialog({ className: 'importers dark' })
   }
 
   loadImporters() {
@@ -175,7 +168,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, back: false })
+    this.dialog.open({ template: element, cancel: false, accept: false })
   }
 
   build() {
@@ -277,12 +270,16 @@ export default class Importer extends Utils.WithTemplate {
   }
 
   submit() {
+    let hasErrors
     if (this.format === 'umap') {
-      this.full()
+      hasErrors = !this.full()
     } else if (!this.url) {
-      this.copy()
+      hasErrors = !this.copy()
     } else if (this.action) {
-      this[this.action]()
+      hasErrors = !this[this.action]()
+    }
+    if (hasErrors === false) {
+      Alert.info(translate('Data successfully imported!'))
     }
   }
 
@@ -297,9 +294,8 @@ export default class Importer extends Utils.WithTemplate {
       } else if (this.url) {
         this._umap.importFromUrl(this.url, this.format)
       }
-      this.onSuccess()
     } catch (e) {
-      this.onError(translate('Invalid umap data'))
+      Alert.error(translate('Invalid umap data'))
       console.error(e)
       return false
     }
@@ -310,7 +306,7 @@ export default class Importer extends Utils.WithTemplate {
       return false
     }
     if (!this.format) {
-      this.onError(translate('Please choose a format'))
+      Alert.error(translate('Please choose a format'))
       return false
     }
     const layer = this.layer
@@ -322,67 +318,26 @@ export default class Importer extends Utils.WithTemplate {
       layer.options.remoteData.proxy = true
       layer.options.remoteData.ttl = SCHEMA.ttl.default
     }
-    layer.fetchRemoteData(true).then((features) => {
-      if (features?.length) {
-        layer.zoomTo()
-        this.onSuccess()
-      } else {
-        this.onError()
-      }
-    })
+    layer.fetchRemoteData(true)
   }
 
-  async copy() {
+  copy() {
     // Format may be guessed from file later.
     // Usefull in case of multiple files with different formats.
     if (!this.format && !this.files.length) {
-      this.onError(translate('Please choose a format'))
+      Alert.error(translate('Please choose a format'))
       return false
     }
-    let promise
     const layer = this.layer
     if (this.clear) layer.empty()
     if (this.files.length) {
-      promise = layer.importFromFiles(this.files, this.format)
+      for (const file of this.files) {
+        this._umap.processFileToImport(file, layer, this.format)
+      }
     } else if (this.raw) {
-      promise = layer.importRaw(this.raw, this.format)
+      layer.importRaw(this.raw, this.format)
     } else if (this.url) {
-      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)
+      layer.importFromUrl(this.url, this.format)
     }
   }
 }

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

@@ -22,7 +22,7 @@ export function getClass(name) {
 
 export const RECENT = []
 
-const BaseIcon = DivIcon.extend({
+const BaseIcon = L.DivIcon.extend({
   initialize: function (options) {
     const default_options = {
       iconSize: null, // Made in css
@@ -86,7 +86,6 @@ 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,8 +233,12 @@ const ManageTilelayerMixin = {
   },
 
   updateTileLayers: function () {
+    const callback = (tilelayer) => {
+      this.options.tilelayer = tilelayer.toJSON()
+      this._umap.isDirty = true
+    }
     if (this._controls.tilelayersChooser) {
-      this._controls.tilelayersChooser.openSwitcher({ edit: true })
+      this._controls.tilelayersChooser.openSwitcher({ callback, edit: true })
     }
   },
 }
@@ -259,12 +263,8 @@ export const LeafletMap = BaseMap.extend({
     this.loader.onAdd(this)
 
     if (!this.options.noControl) {
-      DomEvent.on(document.body, 'dataloading', (event) =>
-        this.fire('dataloading', event.detail)
-      )
-      DomEvent.on(document.body, 'dataload', (event) =>
-        this.fire('dataload', event.detail)
-      )
+      DomEvent.on(document.body, 'dataloading', (e) => this.fire('dataloading', e))
+      DomEvent.on(document.body, 'dataload', (e) => this.fire('dataload', e))
       this.on('click', this.closeInplaceToolbar)
     }
 

umap/static/umap/js/modules/rendering/popup.js

@@ -21,22 +21,23 @@ export default function loadPopup(name) {
 const Popup = BasePopup.extend({
   initialize: function (feature) {
     this.feature = feature
-    BasePopup.prototype.initialize.call(this, {}, feature.ui)
+    this.container = DomUtil.create('div', 'umap-popup')
+    this.format()
+    BasePopup.prototype.initialize.call(this, {}, feature)
+    this.setContent(this.container)
   },
 
-  loadContent: async function () {
-    const container = DomUtil.create('div', 'umap-popup')
+  format: function () {
     const name = this.feature.getOption('popupTemplate')
-    this.content = await loadTemplate(name, this.feature, container)
-    const elements = container.querySelectorAll('img,iframe')
+    this.content = loadTemplate(name, this.feature, this.container)
+    const elements = this.container.querySelectorAll('img,iframe')
     for (const element of elements) {
       this.onElementLoaded(element)
     }
-    if (!elements.length && container.textContent.replace('\n', '') === '') {
-      container.innerHTML = ''
-      DomUtil.add('h3', '', container, this.feature.getDisplayName())
+    if (!elements.length && this.container.textContent.replace('\n', '') === '') {
+      this.container.innerHTML = ''
+      DomUtil.add('h3', '', this.container, this.feature.getDisplayName())
     }
-    this.setContent(container)
   },
 
   onElementLoaded: function (el) {

umap/static/umap/js/modules/rendering/template.js

@@ -2,9 +2,8 @@ import { DomUtil, DomEvent } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { translate, getLocale } from '../i18n.js'
 import * as Utils from '../utils.js'
 import * as Icon from './icon.js'
-import { Request } from '../request.js'
 
-export default async function loadTemplate(name, feature, container) {
+export default function loadTemplate(name, feature, container) {
   let klass = PopupTemplate
   switch (name) {
     case 'GeoRSSLink':
@@ -19,12 +18,9 @@ export default async function loadTemplate(name, feature, container) {
     case 'OSM':
       klass = OSM
       break
-    case 'Wikipedia':
-      klass = Wikipedia
-      break
   }
   const content = new klass()
-  return await content.render(feature, container)
+  return content.render(feature, container)
 }
 
 class PopupTemplate {
@@ -80,10 +76,10 @@ class PopupTemplate {
     }
   }
 
-  async render(feature, container) {
+  render(feature, container) {
     const title = this.renderTitle(feature)
     if (title) container.appendChild(title)
-    const body = await this.renderBody(feature)
+    const body = this.renderBody(feature)
     if (body) DomUtil.add('div', 'umap-popup-content', container, body)
     const footer = this.renderFooter(feature)
     if (footer) container.appendChild(footer)
@@ -115,7 +111,7 @@ class Table extends TitleMixin(PopupTemplate) {
     )
   }
 
-  async renderBody(feature) {
+  renderBody(feature) {
     const table = document.createElement('table')
 
     for (const key in feature.properties) {
@@ -129,7 +125,7 @@ class Table extends TitleMixin(PopupTemplate) {
 }
 
 class GeoRSSImage extends TitleMixin(PopupTemplate) {
-  async renderBody(feature) {
+  renderBody(feature) {
     const body = DomUtil.create('a')
     body.href = feature.properties.link
     body.target = '_blank'
@@ -146,7 +142,7 @@ class GeoRSSImage extends TitleMixin(PopupTemplate) {
 }
 
 class GeoRSSLink extends PopupTemplate {
-  async renderBody(feature) {
+  renderBody(feature) {
     if (feature.properties.link) {
       return Utils.loadTemplate(
         `<a href="${feature.properties.link}" target="_blank"><h3>${feature.getDisplayName()}</h3></a>`
@@ -155,7 +151,7 @@ class GeoRSSLink extends PopupTemplate {
   }
 }
 
-class OSM extends PopupTemplate {
+class OSM extends TitleMixin(PopupTemplate) {
   renderTitle(feature) {
     const title = DomUtil.add('h3', 'popup-title')
     const color = feature.getPreviewColor()
@@ -176,7 +172,7 @@ class OSM extends PopupTemplate {
     return props.name
   }
 
-  async renderBody(feature) {
+  renderBody(feature) {
     const props = feature.properties
     const body = document.createElement('div')
     const locale = getLocale()
@@ -242,43 +238,3 @@ class OSM extends PopupTemplate {
     return body
   }
 }
-
-const _WIKIPEDIA_CACHE = {}
-
-class Wikipedia extends PopupTemplate {
-  async callWikipedia(wikipedia) {
-    if (wikipedia && _WIKIPEDIA_CACHE[wikipedia]) return _WIKIPEDIA_CACHE[wikipedia]
-    // Wikipedia value should be in form of "{locale}:{title}", according to https://wiki.openstreetmap.org/wiki/Key:wikipedia
-    const [locale, page] = wikipedia.split(':')
-    const url = `https://${locale}.wikipedia.org/w/api.php?action=query&format=json&origin=*&pithumbsize=500&prop=extracts|pageimages&titles=${page}`
-    const request = new Request()
-    const response = await request.get(url)
-    if (response?.ok) {
-      const data = await response.json()
-      _WIKIPEDIA_CACHE[wikipedia] = data
-      return data
-    }
-  }
-
-  async renderBody(feature) {
-    const body = document.createElement('div')
-    const wikipedia = feature.properties.wikipedia
-    if (!wikipedia) return ''
-    const data = await this.callWikipedia(wikipedia)
-    if (data) {
-      const page = Object.values(data.query.pages)[0]
-      const title = page.title || feature.getDisplayName()
-      const extract = page.extract || ''
-      const thumbnail = page.thumbnail?.source
-      const [content, { image }] = Utils.loadTemplateWithRefs(
-        `<div><h3>${Utils.escapeHTML(title)}</h3><img data-ref="image" hidden src="" />${Utils.escapeHTML(extract)}</div>`
-      )
-      if (thumbnail) {
-        image.src = thumbnail
-        image.hidden = false
-      }
-      body.appendChild(content)
-    }
-    return body
-  }
-}