umap-project 2.9.3__py3-none-any.whl → 3.0.0__py3-none-any.whl

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

@@ -1,26 +1,25 @@
 // FIXME: this module should not depend on Leaflet
 import {
-  DomUtil,
   DomEvent,
-  stamp,
+  DomUtil,
   GeoJSON,
+  stamp,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
-import * as Utils from '../utils.js'
-import { Default as DefaultLayer } from '../rendering/layers/base.js'
-import { Cluster } from '../rendering/layers/cluster.js'
-import { Heat } from '../rendering/layers/heat.js'
-import { Categorized, Choropleth, Circles } from '../rendering/layers/classified.js'
 import {
   uMapAlert as Alert,
   uMapAlertConflict as AlertConflict,
 } from '../../components/alerts/alert.js'
+import { MutatingForm } from '../form/builder.js'
 import { translate } from '../i18n.js'
 import { DataLayerPermissions } from '../permissions.js'
-import { Point, LineString, Polygon } from './features.js'
-import TableEditor from '../tableeditor.js'
-import { ServerStored } from '../saving.js'
+import { Default as DefaultLayer } from '../rendering/layers/base.js'
+import { Categorized, Choropleth, Circles } from '../rendering/layers/classified.js'
+import { Cluster } from '../rendering/layers/cluster.js'
+import { Heat } from '../rendering/layers/heat.js'
 import * as Schema from '../schema.js'
-import { MutatingForm } from '../form/builder.js'
+import TableEditor from '../tableeditor.js'
+import * as Utils from '../utils.js'
+import { LineString, Point, Polygon } from './features.js'
 
 export const LAYER_TYPES = [
   DefaultLayer,
@@ -36,9 +35,8 @@ const LAYER_MAP = LAYER_TYPES.reduce((acc, klass) => {
   return acc
 }, {})
 
-export class DataLayer extends ServerStored {
+export class DataLayer {
   constructor(umap, leafletMap, data = {}) {
-    super()
     this._umap = umap
     this.sync = umap.syncEngine.proxy(this)
     this._index = Array()
@@ -49,7 +47,6 @@ export class DataLayer extends ServerStored {
     this._leafletMap = leafletMap
     this.parentPane = this._leafletMap.getPane('overlayPane')
     this.pane = this._leafletMap.createPane(`datalayer${stamp(this)}`, this.parentPane)
-    this.pane.dataset.id = stamp(this)
     // FIXME: should be on layer
     this.renderer = L.svg({ pane: this.pane })
     this.defaultOptions = {
@@ -66,6 +63,7 @@ export class DataLayer extends ServerStored {
     data.id = data.id || crypto.randomUUID()
 
     this.setOptions(data)
+    this.pane.dataset.id = this.id
 
     if (!Utils.isObject(this.options.remoteData)) {
       this.options.remoteData = {}
@@ -83,7 +81,7 @@ export class DataLayer extends ServerStored {
     this.connectToMap()
     this.permissions = new DataLayerPermissions(this._umap, this)
 
-    this._needsFetch = this.createdOnServer
+    this._needsFetch = this.createdOnServer || this.isRemoteLayer()
     if (!this.createdOnServer) {
       if (this.showAtLoad()) this.show()
     }
@@ -114,7 +112,6 @@ export class DataLayer extends ServerStored {
 
   set isDeleted(status) {
     this._isDeleted = status
-    if (status) this.isDirty = status
   }
 
   get isDeleted() {
@@ -144,11 +141,10 @@ export class DataLayer extends ServerStored {
           if (fields.includes('options.type')) {
             this.resetLayer()
           }
-          this.hide()
           for (const field of fields) {
             this.layer.onEdit(field, builder)
           }
-          this.show()
+          this.redraw()
           break
         case 'remote-data':
           this.fetchRemoteData()
@@ -265,18 +261,19 @@ export class DataLayer extends ServerStored {
     if (geojson._storage) geojson._umap_options = geojson._storage // Retrocompat
     geojson._umap_options.id = this.id
     if (geojson._umap_options) this.setOptions(geojson._umap_options)
-    if (this.isRemoteLayer()) await this.fetchRemoteData()
-    else this.fromGeoJSON(geojson, false)
+    if (this.isRemoteLayer()) {
+      await this.fetchRemoteData()
+    } else {
+      this.fromGeoJSON(geojson, false)
+    }
   }
 
   clear() {
-    this.layer.clearLayers()
-    this._features = {}
-    this._index = Array()
-    if (this._geojson) {
-      this.backupData()
-      this._geojson = null
+    this.sync.startBatch()
+    for (const feature of Object.values(this._features)) {
+      feature.del()
     }
+    this.sync.commitBatch()
     this.dataChanged()
   }
 
@@ -330,8 +327,9 @@ export class DataLayer extends ServerStored {
       this.clear()
       return this._umap.formatter
         .parse(raw, this.options.remoteData.format)
-        .then((geojson) => this.fromGeoJSON(geojson))
+        .then((geojson) => this.fromGeoJSON(geojson, false))
         .catch((error) => {
+          console.debug(error)
           Alert.error(
             translate('Cannot parse remote data for layer "{layer}" with url "{url}"', {
               layer: this.getName(),
@@ -366,9 +364,8 @@ export class DataLayer extends ServerStored {
   }
 
   connectToMap() {
-    const id = stamp(this)
-    if (!this._umap.datalayers[id]) {
-      this._umap.datalayers[id] = this
+    if (!this._umap.datalayers[this.id]) {
+      this._umap.datalayers[this.id] = this
     }
     if (!this._umap.datalayersIndex.includes(this)) {
       this._umap.datalayersIndex.push(this)
@@ -417,7 +414,10 @@ export class DataLayer extends ServerStored {
 
   removeFeature(feature, sync) {
     const id = stamp(feature)
-    if (sync !== false) feature.sync.delete()
+    if (sync !== false) {
+      const oldValue = feature.toGeoJSON()
+      feature.sync.delete(oldValue)
+    }
     this.hideFeature(feature)
     delete this._umap.featuresIndex[feature.getSlug()]
     feature.disconnectFromDataLayer(this)
@@ -518,7 +518,7 @@ export class DataLayer extends ServerStored {
     }
     if (feature && !feature.isEmpty()) {
       this.addFeature(feature)
-      if (sync) feature.onCommit()
+      if (sync) feature.sync.upsert(feature.toGeoJSON(), null)
       return feature
     }
   }
@@ -526,12 +526,14 @@ export class DataLayer extends ServerStored {
   async importRaw(raw, format) {
     return this._umap.formatter
       .parse(raw, format)
-      .then((geojson) => this.addData(geojson))
-      .then((data) => {
-        if (data?.length) this.isDirty = true
+      .then((geojson) => {
+        this.sync.startBatch()
+        const data = this.addData(geojson)
+        this.sync.commitBatch()
         return data
       })
       .catch((error) => {
+        console.debug(error)
         Alert.error(translate('Import failed: invalid data'))
       })
   }
@@ -595,17 +597,17 @@ export class DataLayer extends ServerStored {
   }
 
   del(sync = true) {
+    const oldValue = Utils.CopyJSON(this.umapGeoJSON())
     this.erase()
     if (sync) {
       this.isDeleted = true
-      this.sync.delete()
+      this.sync.delete(oldValue)
     }
   }
 
   empty() {
     if (this.isRemoteLayer()) return
     this.clear()
-    this.isDirty = true
   }
 
   clone() {
@@ -629,29 +631,9 @@ export class DataLayer extends ServerStored {
     this.clear()
   }
 
-  reset() {
-    if (!this.createdOnServer) {
-      this.erase()
-      return
-    }
-
-    this.resetOptions()
-    this.parentPane.appendChild(this.pane)
-    if (this._leaflet_events_bk && !this._leaflet_events) {
-      this._leaflet_events = this._leaflet_events_bk
-    }
-    this.clear()
-    this.hide()
-    if (this.isRemoteLayer()) this.fetchRemoteData()
-    else if (this._geojson_bk) this.fromGeoJSON(this._geojson_bk)
-    this.show()
-    this.isDirty = false
-  }
-
   redraw() {
     if (!this.isVisible()) return
-    this.hide()
-    this.show()
+    this.eachFeature((feature) => feature.redraw())
   }
 
   edit() {
@@ -831,8 +813,9 @@ export class DataLayer extends ServerStored {
       this
     )
 
-    if (this._umap.properties.urls.datalayer_versions)
+    if (this._umap.properties.urls.datalayer_versions) {
       this.buildVersionsFieldset(container)
+    }
 
     const advancedActions = DomUtil.createFieldset(
       container,
@@ -907,10 +890,15 @@ export class DataLayer extends ServerStored {
     const appendVersion = (data) => {
       const date = new Date(Number.parseInt(data.at, 10))
       const content = `${date.toLocaleString(U.lang)} (${Number.parseInt(data.size) / 1000}Kb)`
-      const el = DomUtil.create('div', 'umap-datalayer-version', versionsContainer)
-      const button = DomUtil.createButton('', el, '', () => this.restore(data.ref))
-      button.title = translate('Restore this version')
-      DomUtil.add('span', '', el, content)
+      const [el, { button }] = Utils.loadTemplateWithRefs(
+        `<div class="umap-datalayer-version">
+          <button type="button" title="${translate('Restore this version')}" data-ref=button>
+            <i class="icon icon-16 icon-restore"></i> ${content}
+          </button>
+        </div>`
+      )
+      versionsContainer.appendChild(el)
+      button.addEventListener('click', () => this.restore(data.ref))
     }
 
     const versionsContainer = DomUtil.createFieldset(container, translate('Versions'), {
@@ -934,11 +922,19 @@ export class DataLayer extends ServerStored {
         )
         if (!error) {
           if (geojson._storage) geojson._umap_options = geojson._storage // Retrocompat.
-          if (geojson._umap_options) this.setOptions(geojson._umap_options)
+          if (geojson._umap_options) {
+            const oldOptions = Utils.CopyJSON(this.options)
+            this.setOptions(geojson._umap_options)
+            this.sync.update('options', this.options, oldOptions)
+          }
           this.empty()
-          if (this.isRemoteLayer()) this.fetchRemoteData()
-          else this.addData(geojson)
-          this.isDirty = true
+          if (this.isRemoteLayer()) {
+            this.fetchRemoteData()
+          } else {
+            this.sync.startBatch()
+            this.addData(geojson)
+            this.sync.commitBatch()
+          }
         }
       })
   }
@@ -960,12 +956,18 @@ export class DataLayer extends ServerStored {
     this.propagateHide()
   }
 
-  toggle() {
+  toggle(force) {
     // From now on, do not try to how/hidedataChanged
     // automatically this layer.
+    let display = force
     this._forcedVisibility = true
-    if (!this.isVisible()) this.show()
+    if (force === undefined) {
+      if (!this.isVisible()) display = true
+      else display = false
+    }
+    if (display) this.show()
     else this.hide()
+    this._umap.bottomBar.redraw()
   }
 
   zoomTo() {
@@ -1086,7 +1088,11 @@ export class DataLayer extends ServerStored {
 
   setReferenceVersion({ response, sync }) {
     this._referenceVersion = response.headers.get('X-Datalayer-Version')
-    if (sync) this.sync.update('_referenceVersion', this._referenceVersion)
+    if (sync) {
+      this.sync.update('_referenceVersion', this._referenceVersion, null, {
+        undo: false,
+      })
+    }
   }
 
   async save() {
@@ -1115,6 +1121,10 @@ export class DataLayer extends ServerStored {
   }
 
   async _trySave(url, headers, formData) {
+    if (this._forceSave) {
+      headers = {}
+      this._forceSave = false
+    }
     const [data, response, error] = await this._umap.server.post(url, headers, formData)
     if (error) {
       if (response && response.status === 412) {
@@ -1124,15 +1134,8 @@ export class DataLayer extends ServerStored {
               'This situation is tricky, you have to choose carefully which version is pertinent.'
           ),
           async () => {
-            // Save again this layer
-            const status = await this._trySave(url, {}, formData)
-            if (status) {
-              this.isDirty = false
-
-              // Call the main save, in case something else needs to be saved
-              // as the conflict stopped the saving flow
-              await this._umap.saveAll()
-            }
+            this._forceSave = true
+            await this._umap.saveAll()
           }
         )
       }
@@ -1167,7 +1170,7 @@ export class DataLayer extends ServerStored {
   }
 
   commitDelete() {
-    delete this._umap.datalayers[stamp(this)]
+    delete this._umap.datalayers[this.id]
   }
 
   getName() {
@@ -1234,25 +1237,16 @@ export class DataLayer extends ServerStored {
       translate('Delete layer')
     )
     if (this.isReadOnly()) {
-      DomUtil.addClass(container, 'readonly')
+      container.classList.add('readonly')
     } else {
-      DomEvent.on(edit, 'click', this.edit, this)
-      DomEvent.on(table, 'click', this.tableEdit, this)
-      DomEvent.on(
-        remove,
-        'click',
-        function () {
-          if (!this.isVisible()) return
-          this._umap.dialog
-            .confirm(translate('Are you sure you want to delete this layer?'))
-            .then(() => {
-              this.del()
-            })
-        },
-        this
-      )
+      edit.addEventListener('click', () => this.edit())
+      table.addEventListener('click', () => this.tableEdit())
+      remove.addEventListener('click', () => {
+        if (!this.isVisible()) return
+        this.del()
+      })
     }
-    DomEvent.on(toggle, 'click', this.toggle, this)
+    DomEvent.on(toggle, 'click', () => this.toggle())
     DomEvent.on(zoomTo, 'click', this.zoomTo, this)
     container.classList.add(this.getHidableClass())
     container.classList.toggle('off', !this.isVisible())

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

@@ -135,7 +135,13 @@ export default class Facets {
     for (const [property, { label, type }] of parsed) {
       dumped.push([property, label, type].filter(Boolean).join('|'))
     }
-    return dumped.join(',')
+    const oldValue = this._umap.properties.facetKey
+    this._umap.properties.facetKey = dumped.join(',')
+    this._umap.sync.update(
+      'properties.facetKey',
+      this._umap.properties.facetKey,
+      oldValue
+    )
   }
 
   has(property) {
@@ -146,15 +152,13 @@ export default class Facets {
     const defined = this.getDefined()
     if (!defined.has(property)) {
       defined.set(property, { label, type })
-      this._umap.properties.facetKey = this.dumps(defined)
-      this._umap.isDirty = true
+      this.dumps(defined)
     }
   }
 
   remove(property) {
     const defined = this.getDefined()
     defined.delete(property)
-    this._umap.properties.facetKey = this.dumps(defined)
-    this._umap.isDirty = true
+    this.dumps(defined)
   }
 }

umap/static/umap/js/modules/form/builder.js

@@ -1,7 +1,7 @@
-import getClass from './fields.js'
-import * as Utils from '../utils.js'
-import { SCHEMA } from '../schema.js'
 import { translate } from '../i18n.js'
+import { SCHEMA } from '../schema.js'
+import * as Utils from '../utils.js'
+import getClass from './fields.js'
 
 export class Form extends Utils.WithEvents {
   constructor(obj, fields, properties) {
@@ -70,21 +70,7 @@ export class Form extends Utils.WithEvents {
   }
 
   setter(field, value) {
-    const path = field.split('.')
-    let obj = this.obj
-    let what
-    for (let i = 0, l = path.length; i < l; i++) {
-      what = path[i]
-      if (what === path[l - 1]) {
-        if (typeof value === 'undefined') {
-          delete obj[what]
-        } else {
-          obj[what] = value
-        }
-      } else {
-        obj = obj[what]
-      }
-    }
+    Utils.setObjectValue(this.obj, field, value)
   }
 
   restoreField(field) {
@@ -144,14 +130,8 @@ export class MutatingForm extends Form {
     }
     for (const [key, defaults] of Object.entries(SCHEMA)) {
       const properties = Object.assign({}, defaults)
-      if (properties.type === Boolean) {
-        if (properties.nullable) properties.handler = 'NullableChoices'
-        else properties.handler = 'Switch'
-      } else if (properties.type === 'Text') {
-        properties.handler = 'Textarea'
-      } else if (properties.type === Number) {
-        if (properties.step) properties.handler = 'Range'
-        else properties.handler = 'IntInput'
+      if (properties.type === Array) {
+        properties.handler = 'CheckBoxes'
       } else if (properties.choices) {
         const text_length = properties.choices.reduce(
           (acc, [_, label]) => acc + label.length,
@@ -165,6 +145,14 @@ export class MutatingForm extends Form {
           properties.handler = 'Select'
           properties.selectOptions = properties.choices
         }
+      } else if (properties.type === Boolean) {
+        if (properties.nullable) properties.handler = 'NullableChoices'
+        else properties.handler = 'Switch'
+      } else if (properties.type === 'Text') {
+        properties.handler = 'Textarea'
+      } else if (properties.type === Number) {
+        if (properties.step) properties.handler = 'Range'
+        else properties.handler = 'IntInput'
       } else {
         switch (key) {
           case 'color':
@@ -190,13 +178,17 @@ export class MutatingForm extends Form {
   }
 
   setter(field, value) {
-    super.setter(field, value)
-    this.obj.isDirty = true
+    const oldValue = this.getter(field)
+    if ('setter' in this.obj) {
+      this.obj.setter(field, value)
+    } else {
+      super.setter(field, value)
+    }
     if ('render' in this.obj) {
       this.obj.render([field], this)
     }
     if ('sync' in this.obj) {
-      this.obj.sync.update(field, value)
+      this.obj.sync.update(field, value, oldValue)
     }
   }
 

umap/static/umap/js/modules/form/fields.js

@@ -1,12 +1,12 @@
-import * as Utils from '../utils.js'
-import { translate } from '../i18n.js'
 import {
   AjaxAutocomplete,
   AjaxAutocompleteMultiple,
   AutocompleteDatalist,
 } from '../autocomplete.js'
-import { SCHEMA } from '../schema.js'
+import { translate } from '../i18n.js'
 import * as Icon from '../rendering/icon.js'
+import { SCHEMA } from '../schema.js'
+import * as Utils from '../utils.js'
 
 const Fields = {}
 
@@ -152,7 +152,9 @@ Fields.Textarea = class extends BaseElement {
       this.textarea.value = value
     }
   }
-
+  clear() {
+    this.textarea.value = ''
+  }
   value() {
     return this.textarea.value
   }
@@ -254,8 +256,8 @@ Fields.BlurInput = class extends Fields.Input {
 const IntegerMixin = (Base) =>
   class extends Base {
     value() {
-      return !isNaN(this.input.value) && this.input.value !== ''
-        ? parseInt(this.input.value, 10)
+      return !Number.isNaN(this.input.value) && this.input.value !== ''
+        ? Number.parseInt(this.input.value, 10)
         : undefined
     }
 
@@ -270,8 +272,8 @@ Fields.BlurIntInput = class extends IntegerMixin(Fields.BlurInput) {}
 const FloatMixin = (Base) =>
   class extends Base {
     value() {
-      return !isNaN(this.input.value) && this.input.value !== ''
-        ? parseFloat(this.input.value)
+      return !Number.isNaN(this.input.value) && this.input.value !== ''
+        ? Number.parseFloat(this.input.value)
         : undefined
     }
 
@@ -324,6 +326,29 @@ Fields.CheckBox = class extends BaseElement {
   }
 }
 
+Fields.CheckBoxes = class extends BaseElement {
+  getInputTemplate(value, label) {
+    return `<label><input type=checkbox value="${value}" name="${this.name}" data-ref=input />${label}</label>`
+  }
+
+  build() {
+    const initial = this.get() || []
+    for (const [value, label] of this.properties.choices) {
+      const [root, { input }] = Utils.loadTemplateWithRefs(
+        this.getInputTemplate(value, label)
+      )
+      this.container.appendChild(root)
+      input.checked = initial.includes(value)
+      input.addEventListener('change', () => this.sync())
+    }
+    super.build()
+  }
+
+  value() {
+    return Array.from(this.root.querySelectorAll('input:checked')).map((el) => el.value)
+  }
+}
+
 Fields.Select = class extends BaseElement {
   getTemplate() {
     return `<select name="${this.name}" data-ref=select></select>`
@@ -390,7 +415,7 @@ Fields.Select = class extends BaseElement {
 
 Fields.IntSelect = class extends Fields.Select {
   value() {
-    return parseInt(super.value(), 10)
+    return Number.parseInt(super.value(), 10)
   }
 }
 
@@ -541,14 +566,14 @@ Fields.DataLayerSwitcher = class extends Fields.Select {
         !datalayer.isDataReadOnly() &&
         datalayer.isBrowsable()
       ) {
-        options.push([L.stamp(datalayer), datalayer.getName()])
+        options.push([datalayer.id, datalayer.getName()])
       }
     })
     return options
   }
 
   toHTML() {
-    return L.stamp(this.obj.datalayer)
+    return this.obj.datalayer.id
   }
 
   toJS() {
@@ -805,7 +830,7 @@ Fields.IconUrl = class extends Fields.BlurInput {
       categories[category] = categories[category] || []
       categories[category].push(props)
     }
-    const sorted = Object.entries(categories).toSorted(([a], [b]) =>
+    const sorted = Object.entries(categories).sort(([a], [b]) =>
       Utils.naturalSort(a, b, U.lang)
     )
     for (const [name, items] of sorted) {
@@ -1296,12 +1321,13 @@ Fields.ManageEditors = class extends BaseElement {
       placeholder: translate("Type editor's username"),
     }
     this.autocomplete = new AjaxAutocompleteMultiple(this.container, options)
-    this._values = this.toHTML()
-    if (this._values)
+    this._values = this.toHTML() || []
+    if (this._values) {
       for (let i = 0; i < this._values.length; i++)
         this.autocomplete.displaySelected({
           item: { value: this._values[i].id, label: this._values[i].name },
         })
+    }
   }
 
   value() {

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

@@ -1,6 +1,6 @@
+import { uMapAlert as Alert } from '../components/alerts/alert.js'
 /* Uses globals for: csv2geojson, osmtogeojson (not available as ESM) */
 import { translate } from './i18n.js'
-import { uMapAlert as Alert } from '../components/alerts/alert.js'
 
 export const EXPORT_FORMATS = {
   geojson: {

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

@@ -1,13 +1,17 @@
 import { uMapAlert as Alert } from '../components/alerts/alert.js'
-import { AjaxAutocomplete, AjaxAutocompleteMultiple, AutocompleteDatalist } from './autocomplete.js'
+import {
+  AjaxAutocomplete,
+  AjaxAutocompleteMultiple,
+  AutocompleteDatalist,
+} from './autocomplete.js'
+import { LineString, Point, Polygon } from './data/features.js'
+import { LAYER_TYPES } from './data/layer.js'
 import Help from './help.js'
+import * as Icon from './rendering/icon.js'
+import { LeafletMarker, LeafletPolygon, LeafletPolyline } from './rendering/ui.js'
 import { ServerRequest } from './request.js'
 import { SCHEMA } from './schema.js'
 import * as Utils from './utils.js'
-import * as Icon from './rendering/icon.js'
-import { LAYER_TYPES } from './data/layer.js'
-import { Point, LineString, Polygon } from './data/features.js'
-import { LeafletMarker, LeafletPolyline, LeafletPolygon } from './rendering/ui.js'
 
 // Import modules and export them to the global scope.
 // For the not yet module-compatible JS out there.