umap-project 3.1.2__py3-none-any.whl → 3.2.0__py3-none-any.whl

umap/static/umap/css/panel.css

@@ -15,14 +15,17 @@
     box-sizing: border-box;
     counter-reset: step;
 }
+
 .panel.dark {
     border: 1px solid #222;
 }
+
 .panel.full {
     width: initial;
     right: -100%;
     z-index: calc(var(--zindex-panels) + 1);
 }
+
 .panel.full.on {
     visibility: visible;
     right: calc(var(--panel-gutter) * 2 + var(--control-size));
@@ -30,29 +33,45 @@
     height: initial;
     max-height: initial;
 }
+
 .panel .umap-popup-content img {
     /* See https://github.com/Leaflet/Leaflet/commit/61d746818b99d362108545c151a27f09d60960ee#commitcomment-6061847 */
     max-width: 99% !important;
 }
+
 .panel .umap-popup-content {
     max-height: inherit;
 }
+
 .panel .body {
-    height: calc(100% - var(--panel-header-height)); /* Minus size of toolbox */
+    /* Minus size of toolbox */
+    height: calc(100% - var(--panel-header-height));
     padding: var(--panel-gutter);
 }
+
 .panel h3 {
     display: flex;
     align-items: center;
 }
+
 .panel .counter::before {
     counter-increment: step;
     content: counter(step) ". ";
 }
+
 .panel .counter {
     display: block;
     margin-top: var(--panel-gutter);
 }
+
+.panel.dark details[open] {
+    border-left: 2px solid var(--color-accent);
+}
+
+.panel.dark details[open] summary {
+    background-color: var(--color-veryDarkGray);
+}
+
 @media all and (orientation:landscape) {
     .panel {
         top: var(--current-header-height);
@@ -60,28 +79,35 @@
         width: var(--panel-width);
         max-width: calc(100% - var(--panel-gutter) * 2 - var(--control-size))
     }
+
     .panel.condensed {
         max-height: calc(min(500px, 100% - var(--current-header-height) - var(--current-footer-height) - var(--panel-gutter) * 2));
         bottom: initial;
     }
+
     .panel.right {
         right: calc(0px - var(--panel-width));
     }
+
     .panel.left {
         left: calc(0px - var(--panel-width));
     }
+
     .panel.left.on {
         left: calc(var(--panel-gutter) * 2 + var(--control-size));
         visibility: visible;
     }
+
     .panel.right.on {
         right: calc(var(--panel-gutter) * 2 + var(--control-size));
         visibility: visible;
     }
+
     .panel-left-on .panel.full {
         left: calc(var(--panel-gutter) * 3 + var(--control-size) + var(--panel-width));
     }
 }
+
 @media all and (orientation:portrait) {
     .panel {
         height: 50%;
@@ -90,18 +116,22 @@
         bottom: var(--current-footer-height);
         right: -100%;
     }
+
     .panel.left {
         left: -100%;
     }
+
     .panel.on {
         right: 0;
         left: 0;
         visibility: visible;
     }
+
     .panel.expanded {
         height: calc(100% - var(--current-footer-height));
         max-height: calc(100% - var(--current-footer-height));
     }
+
     .umap-caption-bar-enabled .panel {
         border-bottom-left-radius: 0;
         border-bottom-right-radius: 0;

umap/static/umap/js/modules/browser.js

@@ -90,7 +90,7 @@ export default class Browser {
     const label = parent.querySelector('.datalayer-name')
     const container = parent.querySelector('ul')
     container.innerHTML = ''
-    datalayer.eachFeature((feature) => this.addFeature(feature, container))
+    datalayer.features.forEach((feature) => this.addFeature(feature, container))
     datalayer.propagate(['properties.name'])
     const total = datalayer.count()
     if (!total) return

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

@@ -3,7 +3,6 @@ import {
   DomUtil,
   GeoJSON,
   LineUtil,
-  stamp,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 import { MutatingForm } from '../form/builder.js'
@@ -84,6 +83,11 @@ class Feature {
     this.pushGeometry()
   }
 
+  get fields() {
+    // Fields are user defined properties
+    return [...this.datalayer.fields, ...this._umap.fields]
+  }
+
   isOnScreen(bounds) {
     return this.ui?.isOnScreen(bounds)
   }
@@ -198,14 +202,13 @@ class Feature {
       if (this._umap.currentFeature === this) {
         this.view()
       }
-      this.datalayer.indexProperties(this)
     }
     this.redraw()
   }
 
   edit(event) {
     if (!this._umap.editEnabled || this.isReadOnly()) return
-    if (this._umap.editedFeature === this && !event.force) return
+    if (this._umap.editedFeature === this && !event?.force) return
     const container = DomUtil.create('div', 'umap-feature-container')
     DomUtil.createTitle(
       container,
@@ -221,30 +224,20 @@ class Feature {
     container.appendChild(builder.build())
 
     const properties = []
-    let labelKeyFound = undefined
-    for (const property of this.datalayer.allProperties()) {
-      if (!labelKeyFound && U.LABEL_KEYS.includes(property)) {
-        labelKeyFound = property
-        continue
+    for (const field of this.fields) {
+      let handler = 'Input'
+      if (field.key === 'description' || field.type === 'Text') {
+        handler = 'Textarea'
       }
-      if (property === 'description') {
-        continue
-      }
-      properties.push([`properties.${property}`, { label: property }])
-    }
-    // We always want name and description for now (properties management to come)
-    properties.unshift('properties.description')
-    if (!labelKeyFound) {
-      labelKeyFound = U.DEFAULT_LABEL_KEY
+      properties.push([`properties.${field.key}`, { label: field.key, handler }])
     }
-    properties.unshift([`properties.${labelKeyFound}`, { label: labelKeyFound }])
     builder = new MutatingForm(this, properties, {
       id: 'umap-feature-properties',
     })
     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 type="button"><i class="icon icon-16 icon-add"></i>${translate('Add a new field')}</button>`
     )
     button.addEventListener('click', () => {
       this.datalayer.addProperty().then(() => this.edit({ force: true }))
@@ -258,7 +251,7 @@ class Feature {
     this.getAdvancedEditActions(advancedActions)
     const onLoad = this._umap.editPanel.open({ content: container })
     onLoad.then(() => {
-      builder.helpers[`properties.${labelKeyFound}`].input.focus()
+      builder.form.querySelector('input')?.focus()
     })
     this._umap.editedFeature = this
     if (!this.ui.isOnScreen(this._umap._leafletMap.getBounds())) this.zoomTo(event)
@@ -378,8 +371,6 @@ class Feature {
 
   connectToDataLayer(datalayer) {
     this.datalayer = datalayer
-    // FIXME should be in layer/ui
-    this.ui.options.renderer = this.datalayer.renderer
   }
 
   disconnectFromDataLayer(datalayer) {
@@ -607,7 +598,7 @@ class Feature {
   }
 
   getRank() {
-    return this.datalayer._index.indexOf(L.stamp(this))
+    return this.datalayer.features.getIndex(this)
   }
 
   redraw() {
@@ -785,12 +776,6 @@ class Path extends Feature {
     this.ui.setLatLngs(latlngs)
   }
 
-  connectToDataLayer(datalayer) {
-    super.connectToDataLayer(datalayer)
-    // We keep markers on their own layer on top of the paths.
-    this.ui.options.pane = this.datalayer.pane
-  }
-
   edit(event) {
     if (this._umap.editEnabled) {
       super.edit(event)