umap-project 3.0.6__py3-none-any.whl → 3.1.0__py3-none-any.whl

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

@@ -205,7 +205,7 @@ class Feature {
 
   edit(event) {
     if (!this._umap.editEnabled || this.isReadOnly()) return
-    if (this._umap.editedFeature === this) return
+    if (this._umap.editedFeature === this && !event.force) return
     const container = DomUtil.create('div', 'umap-feature-container')
     DomUtil.createTitle(
       container,
@@ -241,7 +241,15 @@ class Feature {
     builder = new MutatingForm(this, properties, {
       id: 'umap-feature-properties',
     })
-    container.appendChild(builder.build())
+    const form = builder.build()
+    container.appendChild(form)
+    const button = Utils.loadTemplate(
+      `<button type="button"><i class="icon icon-16 icon-add"></i>${translate('Add a new property')}</button>`
+    )
+    button.addEventListener('click', () => {
+      this.datalayer.addProperty().then(() => this.edit({ force: true }))
+    })
+    form.appendChild(button)
     this.appendEditFieldsets(container)
     const advancedActions = DomUtil.createFieldset(
       container,
@@ -272,6 +280,8 @@ class Feature {
     container.appendChild(button)
   }
 
+  addExtraEditFieldset() {}
+
   appendEditFieldsets(container) {
     const optionsFields = this.getShapeOptions()
     let builder = new MutatingForm(this, optionsFields, {
@@ -283,6 +293,8 @@ class Feature {
     )
     shapeProperties.appendChild(builder.build())
 
+    this.addExtraEditFieldset(container)
+
     const advancedOptions = this.getAdvancedOptions()
     builder = new MutatingForm(this, advancedOptions, {
       id: 'umap-feature-advanced-properties',
@@ -336,7 +348,10 @@ class Feature {
   }
 
   hasPopupFooter() {
-    if (this.datalayer.isRemoteLayer() && this.datalayer.options.remoteData.dynamic) {
+    if (
+      this.datalayer.isRemoteLayer() &&
+      this.datalayer.properties.remoteData.dynamic
+    ) {
       return false
     }
     return this._umap.getProperty('displayPopupFooter')
@@ -414,7 +429,7 @@ class Feature {
     } else if (Utils.usableOption(this.properties._umap_options, option)) {
       value = this.properties._umap_options[option]
     } else if (this.datalayer) {
-      value = this.datalayer.getOption(option, this)
+      value = this.datalayer.getProperty(option, this)
     } else {
       value = this._umap.getProperty(option)
     }
@@ -469,12 +484,16 @@ class Feature {
   }
 
   deleteProperty(property) {
+    const oldValue = this.properties[property]
     delete this.properties[property]
+    this.sync.update(`properties.${property}`, undefined, oldValue)
   }
 
   renameProperty(from, to) {
+    const oldValue = this.properties[from]
     this.properties[to] = this.properties[from]
     this.deleteProperty(from)
+    this.sync.update(`properties.${to}`, oldValue, undefined)
   }
 
   toGeoJSON() {
@@ -1100,6 +1119,23 @@ export class LineString extends Path {
     }
     return items
   }
+
+  addExtraEditFieldset(container) {
+    const options = [
+      'properties._umap_options.textPath',
+      'properties._umap_options.textPathColor',
+      'properties._umap_options.textPathRepeat',
+      'properties._umap_options.textPathRotate',
+      'properties._umap_options.textPathSize',
+      'properties._umap_options.textPathOffset',
+      'properties._umap_options.textPathPosition',
+    ]
+    const builder = new MutatingForm(this, options, {
+      id: 'umap-feature-line-decoration',
+    })
+    const fieldset = DomUtil.createFieldset(container, translate('Line decoration'))
+    fieldset.appendChild(builder.build())
+  }
 }
 
 export class Polygon extends Path {