umap-project 3.4.0b1__py3-none-any.whl → 3.4.2__py3-none-any.whl

umap/static/umap/js/modules/autocomplete.js

@@ -1,13 +1,9 @@
-import {
-  DomEvent,
-  DomUtil,
-  Util,
-  setOptions,
-} from '../../vendors/leaflet/leaflet-src.esm.js'
+import { DomEvent, Util, setOptions } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from './i18n.js'
 import { Request, ServerRequest } from './request.js'
 import { escapeHTML, generateId } from './utils.js'
 import * as Utils from './utils.js'
+import * as DOMUtils from './domutils.js'
 
 export class BaseAutocomplete {
   constructor(parent, options) {
@@ -41,26 +37,18 @@ export class BaseAutocomplete {
   }
 
   createInput() {
-    this.input = DomUtil.element({
-      tagName: 'input',
-      type: 'text',
-      parent: this.parent,
-      placeholder: this.options.placeholder,
-      autocomplete: 'off',
-      className: this.options.className,
-      name: this.options.name || 'autocomplete',
-    })
-    DomEvent.on(this.input, 'keydown', this.onKeyDown, this)
-    DomEvent.on(this.input, 'keyup', this.onKeyUp, this)
-    DomEvent.on(this.input, 'blur', this.onBlur, this)
+    this.input = DOMUtils.loadTemplate(`
+      <input type="text" placeholder="${this.options.placeholder}" autocomplete="off" class="${this.options.className}" name="${this.options.name || 'autocomplete'}">
+    `)
+    this.parent.appendChild(this.input)
+    this.input.addEventListener('keydown', (event) => this.onKeyDown(event))
+    this.input.addEventListener('keyup', (event) => this.onKeyUp(event))
+    this.input.addEventListener('blur', (event) => this.onBlur(event))
   }
 
   createContainer() {
-    this.container = DomUtil.element({
-      tagName: 'ul',
-      parent: document.body,
-      className: 'umap-autocomplete',
-    })
+    this.container = DOMUtils.loadTemplate('<ul class="umap-autocomplete"></ul>')
+    document.body.appendChild(this.container)
   }
 
   resizeContainer() {
@@ -167,20 +155,17 @@ export class BaseAutocomplete {
   }
 
   createResult(item) {
-    const el = DomUtil.element({
-      tagName: 'li',
-      parent: this.container,
-      textContent: item.label,
-    })
+    const li = DOMUtils.loadTemplate(`<li>${item.label}</li>`)
+    this.container.appendChild(li)
     const result = {
       item: item,
-      el: el,
+      el: li,
     }
-    DomEvent.on(el, 'mouseover', () => {
+    li.addEventListener('mouseover', () => {
       this.current = result
       this.highlight()
     })
-    DomEvent.on(el, 'mousedown', () => this.setChoice())
+    li.addEventListener('mousedown', () => this.setChoice())
     return result
   }
 
@@ -202,8 +187,7 @@ export class BaseAutocomplete {
 
   highlight() {
     this.results.forEach((result, index) => {
-      if (index === this.current) DomUtil.addClass(result.el, 'on')
-      else DomUtil.removeClass(result.el, 'on')
+      result.el.classList.toggle('on', index === this.current)
     })
   }
 
@@ -298,19 +282,15 @@ export const SingleMixin = (Base) =>
     }
 
     displaySelected(result) {
-      const result_el = DomUtil.element({
-        tagName: 'div',
-        parent: this.selectedContainer,
-      })
-      result_el.textContent = result.item.label
-      const close = DomUtil.element({
-        tagName: 'span',
-        parent: result_el,
-        className: 'close',
-        textContent: '×',
-      })
+      const [root, { close }] = DOMUtils.loadTemplateWithRefs(`
+        <div class="with-toolbox">
+          ${result.item.label}
+          <button type="button" class="icon icon-16 icon-close" title="${translate('Close')}" data-ref="close"></button>
+        </div>
+      `)
+      this.selectedContainer.appendChild(root)
       this.input.style.display = 'none'
-      DomEvent.on(close, 'click', () => {
+      close.addEventListener('click', () => {
         this.selectedContainer.innerHTML = ''
         this.input.style.display = 'block'
         this.options.on_unselect?.(result)
@@ -328,19 +308,12 @@ export const MultipleMixin = (Base) =>
     }
 
     displaySelected(result) {
-      const result_el = DomUtil.element({
-        tagName: 'li',
-        parent: this.selectedContainer,
-      })
-      result_el.textContent = result.item.label
-      const close = DomUtil.element({
-        tagName: 'span',
-        parent: result_el,
-        className: 'close',
-        textContent: '×',
-      })
-      DomEvent.on(close, 'click', () => {
-        this.selectedContainer.removeChild(result_el)
+      const [li, { close }] = DOMUtils.loadTemplateWithRefs(`
+        <li class="with-toolbox">${result.item.label} <button class="icon icon-16 icon-close" type="button" data-ref="close"></button></li>
+      `)
+      this.selectedContainer.appendChild(li)
+      close.addEventListener('click', () => {
+        this.selectedContainer.removeChild(li)
         this.options.on_unselect?.(result)
       })
       this.hide()

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

@@ -1,4 +1,4 @@
-import { DomEvent, DomUtil, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
+import { DomEvent, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { Form } from './form/builder.js'
 import { EXPORT_FORMATS } from './formatter.js'
 import { translate } from './i18n.js'
@@ -97,8 +97,8 @@ export default class Browser {
   }
 
   toggleBadge() {
-    Utils.toggleBadge(this.filtersTitle, this.hasFilters())
-    Utils.toggleBadge('.umap-control-browse', this.hasFilters())
+    Utils.toggleBadge(this.filtersTitle, this.hasActiveFilters())
+    Utils.toggleBadge('.umap-control-browse', this.hasActiveFilters())
   }
 
   onFormChange() {
@@ -118,8 +118,8 @@ export default class Browser {
     return !!document.querySelector('.on .umap-browser')
   }
 
-  hasFilters() {
-    return !!this.options.filter || this._umap.hasFilters()
+  hasActiveFilters() {
+    return !!this.options.filter || this._umap.hasActiveFilters()
   }
 
   onMoveEnd() {
@@ -133,9 +133,9 @@ export default class Browser {
   update() {
     if (!this.isOpen()) return
     this.dataContainer.innerHTML = ''
-    this._umap.datalayers.browsable().map((datalayer) => {
+    for (const datalayer of this._umap.datalayers.browsable()) {
       this.addDataLayer(datalayer, this.dataContainer)
-    })
+    }
   }
 
   open(mode) {
@@ -260,7 +260,7 @@ export default class Browser {
       if (datalayer.isVisible()) allHidden = false
     })
     this._umap.datalayers.browsable().map((datalayer) => {
-      datalayer.autoLoaded = false
+      datalayer.autoVisibility = false
       if (allHidden) {
         datalayer.show()
       } else {

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

@@ -1,12 +1,7 @@
-import {
-  DomEvent,
-  DomUtil,
-  GeoJSON,
-  LineUtil,
-} from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { GeoJSON, LineUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 import { MutatingForm } from '../form/builder.js'
-import { translate } from '../i18n.js'
+import { translate, getLocale } from '../i18n.js'
 import {
   PREFERENCES as ORS_PREFERENCES,
   PROFILES as ORS_PROFILES,
@@ -93,7 +88,7 @@ class Feature {
 
   get fields() {
     // Fields are user defined properties
-    return [...this.datalayer.fields.all(), ...this._umap.fields.all()]
+    return [...this._umap.fields.all(), ...this.datalayer.fields.all()]
   }
 
   setter(key, value) {
@@ -243,12 +238,11 @@ class Feature {
     if (this._umap.editedFeature === this && !event?.force) return
     // If this feature is active (popup open), let's close it.
     this.deactivate()
-    const container = DomUtil.create('div', 'umap-feature-container')
-    DomUtil.createTitle(
-      container,
-      translate('Feature properties'),
-      `icon-${this.getClassName()}`
-    )
+    const container = DOMUtils.loadTemplate(`
+      <div class="umap-feature-container">
+        <h3><i class="icon icon-16 icon-${this.getClassName()}"></i> ${translate('Feature properties')}</h3>
+      </div>
+    `)
 
     let builder = new MutatingForm(this, [
       ['datalayer', { handler: 'EditableDataLayerSwitcher' }],
@@ -260,17 +254,19 @@ class Feature {
     const properties = []
     for (const field of this.fields) {
       const options = { handler: 'Input', label: field.key }
-      if (field.key === 'description' || field.type === 'Text') {
+      if (field.key === 'description' || field.TYPE === 'Text') {
         options.handler = 'Textarea'
         options.helpEntries = ['textFormatting']
-      } else if (field.type === 'Number') {
+      } else if (field.TYPE === 'Number') {
         options.handler = 'FloatInput'
-      } else if (field.type === 'Date') {
+      } else if (field.TYPE === 'Date') {
         options.handler = 'DateInput'
-      } else if (field.type === 'Datetime') {
+      } else if (field.TYPE === 'Datetime') {
         options.handler = 'DateTimeInput'
-      } else if (field.type === 'Boolean') {
+      } else if (field.TYPE === 'Boolean') {
         options.handler = 'Switch'
+      } else if (field.TYPE === 'Enum') {
+        options.helpText = translate('Comma separated list of values')
       }
       properties.push([`properties.${field.key}`, options])
     }
@@ -331,7 +327,7 @@ class Feature {
     let builder = new MutatingForm(this, optionsFields, {
       id: 'umap-feature-shape-properties',
     })
-    const shapeProperties = DomUtil.createFieldset(
+    const shapeProperties = DOMUtils.createFieldset(
       container,
       translate('Shape properties')
     )
@@ -343,7 +339,7 @@ class Feature {
     builder = new MutatingForm(this, advancedOptions, {
       id: 'umap-feature-advanced-properties',
     })
-    const advancedProperties = DomUtil.createFieldset(
+    const advancedProperties = DOMUtils.createFieldset(
       container,
       translate('Advanced properties')
     )
@@ -351,7 +347,7 @@ class Feature {
 
     const interactionOptions = this.getInteractionOptions()
     builder = new MutatingForm(this, interactionOptions)
-    const popupFieldset = DomUtil.createFieldset(
+    const popupFieldset = DOMUtils.createFieldset(
       container,
       translate('Interaction options')
     )
@@ -442,7 +438,7 @@ class Feature {
     this.properties = Object.fromEntries(
       Object.entries(geojson.properties || {}).map(this.cleanProperty)
     )
-    this.properties._umap_options = L.extend(
+    this.properties._umap_options = Object.assign(
       {},
       this.properties._storage_options,
       this.properties._umap_options
@@ -514,8 +510,8 @@ class Feature {
   }
 
   cloneProperties() {
-    const properties = L.extend({}, this.properties)
-    properties._umap_options = L.extend({}, properties._umap_options)
+    const properties = Object.assign({}, this.properties)
+    properties._umap_options = Object.assign({}, properties._umap_options)
     if (Object.keys && Object.keys(properties._umap_options).length === 0) {
       delete properties._umap_options // It can make a difference on big data sets
     }
@@ -591,9 +587,10 @@ class Feature {
   }
 
   extendedProperties() {
+    console.trace()
     // Include context properties
     const properties = this._umap.getGeoContext()
-    const locale = L.getLocale()
+    const locale = getLocale()
     if (locale) properties.locale = locale
     if (U.lang) properties.lang = U.lang
     properties.rank = this.getRank() + 1
@@ -788,7 +785,7 @@ export class Point extends Feature {
     ]
     const builder = new MutatingForm(this, coordinatesOptions)
     builder.on('set', () => {
-      if (!this.ui._latlng.isValid()) {
+      if (!Utils.LatLngIsValid(this.ui._latlng)) {
         Alert.error(translate('Invalid latitude or longitude'))
         builder.restoreField('ui._latlng.lat')
         builder.restoreField('ui._latlng.lng')
@@ -796,7 +793,7 @@ export class Point extends Feature {
       this.pullGeometry()
       this.zoomTo({ easing: false })
     })
-    const fieldset = DomUtil.createFieldset(container, translate('Coordinates'))
+    const fieldset = DOMUtils.createFieldset(container, translate('Coordinates'))
     fieldset.appendChild(builder.build())
   }
 
@@ -964,7 +961,7 @@ class Path extends Feature {
     const builder = new MutatingForm(this, options, {
       id: 'umap-feature-line-decoration',
     })
-    const fieldset = DomUtil.createFieldset(container, translate('Line decoration'))
+    const fieldset = DOMUtils.createFieldset(container, translate('Line decoration'))
     fieldset.appendChild(builder.build())
   }
 }
@@ -1077,7 +1074,7 @@ export class LineString extends Path {
   getAdvancedEditActions(container) {
     super.getAdvancedEditActions(container)
     const button = Utils.loadTemplate(`
-      <button class="button" type="button"><i class="icon icon-24 icon-polygon"></i>${translate('Transform to polygon')}</button>
+      <button type="button"><i class="icon icon-24 icon-polygon"></i>${translate('Transform to polygon')}</button>
     `)
     container.appendChild(button)
     button.addEventListener('click', () => this.toPolygon())
@@ -1383,13 +1380,13 @@ export class Polygon extends Path {
 
   getAdvancedEditActions(container) {
     super.getAdvancedEditActions(container)
-    const toLineString = DomUtil.createButton(
-      'button umap-to-polyline',
-      container,
-      translate('Transform to lines'),
-      this.toLineString,
-      this
+    const toLineString = DOMUtils.loadTemplate(
+      `<button type="button" class="umap-to-polyline">
+        <i class="icon icon-24 icon-polyline"></i>${translate('Transform to lines')}
+      </button>`
     )
+    container.appendChild(toLineString)
+    toLineString.addEventListener('click', () => this.toLineString())
   }
 
   isMulti() {