umap-project 3.4.2__py3-none-any.whl → 3.6.0__py3-none-any.whl

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

@@ -215,14 +215,10 @@ export class BaseAutocomplete {
 export class BaseAjax extends BaseAutocomplete {
   constructor(el, options) {
     super(el, options)
-    this.setUrl()
+    this.url = this.options.url
     this.initRequest()
   }
 
-  setUrl() {
-    this.url = this.options?.url
-  }
-
   initRequest() {
     this.request = new Request()
   }
@@ -260,10 +256,6 @@ export class BaseAjax extends BaseAutocomplete {
 }
 
 class BaseServerAjax extends BaseAjax {
-  setUrl() {
-    this.url = '/agnocomplete/AutocompleteUser/?q={q}'
-  }
-
   initRequest() {
     this.server = new ServerRequest()
   }

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

@@ -57,18 +57,23 @@ export default class Browser {
 
   addDataLayer(datalayer, parent) {
     const open = this.mode !== 'layers' ? ' open' : ''
-    const [container, { headline, toolbox, label }] = Utils.loadTemplateWithRefs(`
-      <details class="datalayer ${datalayer.cssId}" id="${this.datalayerId(datalayer)}"${open}>
-        <summary data-ref=headline class="with-toolbox">
+    const [container, { details, toolbox, label, ul }] = Utils.loadTemplateWithRefs(`
+      <details data-ref=details class="datalayer ${datalayer.cssId}" id="${datalayer.cssId}"${open}>
+        <summary class="with-toolbox">
           <span>
             <span class="datalayer-name truncate" data-id="${datalayer.id}" data-ref=label></span>
             <span class="datalayer-counter"></span>
           </span>
           <span data-ref=toolbox></span>
         </summary>
-        <ul></ul>
+        <ul data-ref=ul></ul>
       </details>
     `)
+    details.addEventListener('toggle', () => {
+      if (details.open && !ul.innerHTML.trim()) {
+        this._appendFeaturesDOM(datalayer, ul)
+      }
+    })
     datalayer.renderToolbox(toolbox)
     parent.appendChild(container)
     this.updateFeaturesList(datalayer)
@@ -77,25 +82,31 @@ export default class Browser {
   updateFeaturesList(datalayer) {
     // Compute once, but use it for each feature later.
     this.bounds = this._leafletMap.getBounds()
-    const id = this.datalayerId(datalayer)
-    const parent = document.getElementById(id)
-    // Panel is not open
+    const parent = document.getElementById(datalayer.cssId)
+    // Browser is not open
     if (!parent) return
     parent.classList.toggle('off', !datalayer.isVisible())
     const label = parent.querySelector('.datalayer-name')
     const container = parent.querySelector('ul')
     container.innerHTML = ''
-    datalayer.features.forEach((feature) => this.addFeature(feature, container))
+    const isOpen = container.parentNode.open
+    if (isOpen || this.hasActiveFilters()) {
+      this._appendFeaturesDOM(datalayer, container)
+    }
     datalayer.propagate(['properties.name'])
     const total = datalayer.count()
     if (!total) return
     const current = container.querySelectorAll('li').length
-    const count = total === current ? total : `${current}/${total}`
+    const count = !this.hasActiveFilters() ? total : `${current}/${total}`
     const counter = parent.querySelector('.datalayer-counter')
     counter.textContent = `(${count})`
     counter.title = translate(`Features in this layer: ${count}`)
   }
 
+  _appendFeaturesDOM(datalayer, container) {
+    datalayer.features.forEach((feature) => this.addFeature(feature, container))
+  }
+
   toggleBadge() {
     Utils.toggleBadge(this.filtersTitle, this.hasActiveFilters())
     Utils.toggleBadge('.umap-control-browse', this.hasActiveFilters())
@@ -139,6 +150,7 @@ export default class Browser {
   }
 
   open(mode) {
+    // TODO add loader
     // Force only if mode is known, otherwise keep current mode.
     if (mode) this.mode = mode
     const template = `
@@ -200,11 +212,16 @@ export default class Browser {
       content: container,
       className: 'umap-browser',
     })
-
+    details.addEventListener('toggle', () => {
+      if (details.open && !formContainer.innerHTML.trim()) {
+        this.buildFilters()
+      }
+    })
     this.update()
   }
 
   buildFilters() {
+    if (!this.filtersTitle.parentNode.open) return
     this.formContainer.innerHTML = ''
     const fields = [
       [

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

@@ -244,8 +244,10 @@ class Feature {
       </div>
     `)
 
+    // No need to sync the datalayer key, given we already do a delete/upsert when
+    // it changes.
     let builder = new MutatingForm(this, [
-      ['datalayer', { handler: 'EditableDataLayerSwitcher' }],
+      ['datalayer', { handler: 'EditableDataLayerSwitcher', sync: false }],
     ])
     // removeLayer step will close the edit panel, let's reopen it
     builder.on('set', () => this.edit(event))
@@ -587,7 +589,6 @@ class Feature {
   }
 
   extendedProperties() {
-    console.trace()
     // Include context properties
     const properties = this._umap.getGeoContext()
     const locale = getLocale()

umap/static/umap/js/modules/data/fields.js

@@ -42,6 +42,10 @@ class BaseField {
     return Utils.escapeHTML(value).trim()
   }
 
+  cast(value) {
+    return this.parse(value)
+  }
+
   dumps() {
     return {
       key: this.key,
@@ -94,7 +98,9 @@ Registry.Number = class extends BaseField {
   }
 
   parse(value) {
-    return Number.parseFloat(value)
+    const parsed = Number.parseFloat(value)
+    if (Number.isNaN(parsed)) return null
+    return parsed
   }
 }
 
@@ -146,8 +152,12 @@ Registry.Enum = class extends BaseField {
     this.LABEL = translate('List of values')
   }
 
-  parse(value) {
+  cast(value) {
     return String(value || '')
+  }
+
+  parse(value) {
+    return this.cast(value)
       .split(',')
       .map((s) => s.trim())
   }

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

@@ -70,6 +70,7 @@ export class DataLayer {
     if (this.properties.rank === undefined) {
       this.properties.rank = this._umap.datalayers.count()
     }
+    this._umap.datalayers.add(this)
 
     if (!Utils.isObject(this.properties.remoteData)) {
       this.properties.remoteData = {}
@@ -83,13 +84,13 @@ export class DataLayer {
       this.properties.toZoom = this.properties.remoteData.to
       delete this.properties.remoteData.to
     }
-    this.connectToMap()
     this.permissions = new DataLayerPermissions(this._umap, this)
 
     this._needsFetch = this.createdOnServer || this.isRemoteLayer()
     this.fields = new Fields(this, this._umap.dialog)
     this.filters = new Filters(this, this._umap)
     this.rules = new Rules(umap, this)
+    this._umap.onDataLayersChanged()
 
     if (!this.createdOnServer) {
       if (this.showAtLoad()) this.show()
@@ -350,10 +351,15 @@ export class DataLayer {
 
   async getUrl(url, initialUrl) {
     const response = await this._umap.request.get(url)
-    return new Promise((resolve) => {
+    return new Promise(async (resolve) => {
       if (response?.ok) {
         this._umap.modifiedAt = response.headers.get('last-modified')
-        return resolve(response.text())
+        const id = Math.random()
+        this._umap.loader.start(id)
+        const raw = await response.text()
+        const promise = resolve(raw)
+        this._umap.loader.stop(id)
+        return promise
       }
       Alert.error(
         translate('Cannot load remote data for layer "{layer}" with url "{url}"', {
@@ -406,11 +412,6 @@ export class DataLayer {
     this.resetLayer()
   }
 
-  connectToMap() {
-    this._umap.datalayers.add(this)
-    this._umap.onDataLayersChanged()
-  }
-
   _dataUrl() {
     let url = this._umap.urls.get('datalayer_view', {
       pk: this.id,
@@ -532,6 +533,8 @@ export class DataLayer {
   }
 
   addData(geojson, sync) {
+    const id = Math.random()
+    this._umap.loader.start(id)
     let data = []
     this._batch = true
     try {
@@ -544,6 +547,7 @@ export class DataLayer {
     }
     this._batch = false
     this.dataChanged()
+    this._umap.loader.stop(id)
     return data
   }
 
@@ -1286,7 +1290,7 @@ export class DataLayer {
 
       this.setReferenceVersion({ response, sync: true })
 
-      this.connectToMap()
+      this._umap.onDataLayersChanged()
       this.redraw() // Needed for reordering features
       return true
     }

umap/static/umap/js/modules/domutils.js

@@ -82,6 +82,10 @@ export const hexToRGB = (hex) => {
     .match(/.{2}/g)
     .map((x) => Number.parseInt(x, 16))
 }
+export const colorToRGB = (color) => {
+  if (!color.startsWith('#')) color = colorNameToHex(color)
+  return hexToRGB(color)
+}
 
 const CACHE_CONTRAST = {}
 export const contrastedColor = (el, bgcolor) => {

umap/static/umap/js/modules/filters.js

@@ -192,6 +192,7 @@ export class Filters {
         {
           initialData: initialData[name] || {},
           handler: filter.getFormField(field),
+          dataField: field,
           label: Utils.escapeHTML(this.available.get(name).label || field.key),
           onClick: () => {
             this._parent
@@ -483,6 +484,10 @@ class FiltersForm extends Form {
 
 const FilterBase = class extends Fields.Base {
   buildLabel() {}
+
+  cast(value) {
+    return this.properties.dataField.cast(value) || EMPTY_VALUE
+  }
 }
 
 const FilterByChoices = class extends FilterBase {
@@ -518,8 +523,8 @@ const FilterByChoices = class extends FilterBase {
 
   toJS() {
     return {
-      selected: [...this.elements.ul.querySelectorAll('input:checked')].map(
-        (i) => i.dataset.value
+      selected: [...this.elements.ul.querySelectorAll('input:checked')].map((i) =>
+        this.cast(i.dataset.value)
       ),
     }
   }
@@ -546,6 +551,10 @@ Fields.MinMaxBase = class extends FilterBase {
     return value?.valueOf() ?? null
   }
 
+  prepareForJS(value) {
+    return this.cast(value)
+  }
+
   getTemplate() {
     const [minLabel, maxLabel] = this.getLabels()
     const { min, max } = this.properties.initialData
@@ -627,10 +636,6 @@ Fields.FilterByNumber = class extends Fields.MinMaxBase {
   getInputType(type) {
     return 'number'
   }
-
-  prepareForJS(value) {
-    return new Number(value)
-  }
 }
 
 Fields.FilterByDate = class extends Fields.MinMaxBase {
@@ -638,10 +643,6 @@ Fields.FilterByDate = class extends Fields.MinMaxBase {
     return 'date'
   }
 
-  prepareForJS(value) {
-    return new Date(value)
-  }
-
   toLocaleDateTime(dt) {
     return new Date(dt.valueOf() - dt.getTimezoneOffset() * 60000)
   }

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

@@ -56,30 +56,31 @@ export class Form extends Utils.WithEvents {
     return this.helpers[field]
   }
 
-  getter(field) {
-    const path = field.split('.')
+  getter(helper) {
+    const path = helper.field.split('.')
     let value = this.obj
     for (const sub of path) {
       try {
         value = value[sub]
       } catch {
-        console.debug(field)
+        console.debug(helper.field)
       }
     }
     return value
   }
 
-  setter(field, value) {
+  setter(helper, value) {
     if ('setter' in this.obj) {
-      this.obj.setter(field, value)
+      this.obj.setter(helper.field, value)
     } else {
-      Utils.setObjectValue(this.obj, field, value)
+      Utils.setObjectValue(this.obj, helper.field, value)
     }
   }
 
   restoreField(field) {
-    const initial = this.helpers[field].initial
-    this.setter(field, initial)
+    const helper = this.helpers[field]
+    const initial = helper.initial
+    this.setter(helper, initial)
   }
 
   getName(field) {
@@ -127,9 +128,9 @@ export class Form extends Utils.WithEvents {
 export class MutatingForm extends Form {
   constructor(obj, fields, properties) {
     super(obj, fields, properties)
+    this.debounce = true
     this._umap = obj._umap || properties.umap
     this.computeDefaultProperties()
-    // this.on('finish', this.finish)
   }
 
   computeDefaultProperties() {
@@ -180,21 +181,21 @@ export class MutatingForm extends Form {
     }
   }
 
-  setter(field, value) {
-    const oldValue = this.getter(field)
-    super.setter(field, value)
+  setter(helper, value) {
+    const oldValue = this.getter(helper)
+    super.setter(helper, value)
     if ('render' in this.obj) {
-      this.obj.render([field], this)
+      this.obj.render([helper.field], this)
     }
-    if ('sync' in this.obj) {
-      this.obj.sync.update(field, value, oldValue)
+    if ('sync' in this.obj && helper.properties.sync !== false) {
+      this.obj.sync.update(helper.field, value, oldValue)
     }
   }
 
   getTemplate(helper) {
     let template
     if (helper.properties.inheritable) {
-      const extraClassName = this.getter(helper.field) === undefined ? ' undefined' : ''
+      const extraClassName = this.getter(helper) === undefined ? ' undefined' : ''
       template = `
         <div class="umap-field-${helper.name} formbox inheritable${extraClassName}">
           <div class="header" data-ref=header>

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

@@ -87,7 +87,7 @@ Fields.Base = class {
     const path = this.field.split('.')
     const key = path[path.length - 1]
     if (!this.properties.inheritable) {
-      value = this.builder.getter(this.field)
+      value = this.builder.getter(this)
     } else {
       value = this.obj.getOption(key)
     }
@@ -108,8 +108,16 @@ Fields.Base = class {
     this.builder.fire('set', { helper: this })
   }
 
+  listenForSync(element) {
+    let callback = () => this.sync()
+    if (this.builder.form.debounce) {
+      callback = Utils.debounce(callback, 300)
+    }
+    element.addEventListener('input', callback)
+  }
+
   set() {
-    this.builder.setter(this.field, this.toJS())
+    this.builder.setter(this, this.toJS())
   }
 
   getLabelTemplate() {
@@ -139,10 +147,7 @@ Fields.Textarea = class extends Fields.Base {
     this.textarea = this.elements.textarea
     this.input = this.textarea
     this.fetch()
-    this.textarea.addEventListener(
-      'input',
-      Utils.debounce(() => this.sync(), 300)
-    )
+    this.listenForSync(this.textarea)
     this.textarea.addEventListener('keypress', (event) => this.onKeyPress(event))
   }
 
@@ -194,7 +199,7 @@ Fields.Input = class extends Fields.Base {
       this.input.disabled = true
     }
     this.fetch()
-    this.listenForSync()
+    this.listenForSync(this.input)
     this.input.addEventListener('keydown', (event) => this.onKeyDown(event))
   }
 
@@ -204,13 +209,6 @@ Fields.Input = class extends Fields.Base {
     this.input.value = value
   }
 
-  listenForSync() {
-    this.input.addEventListener(
-      'input',
-      Utils.debounce(() => this.sync(), 300)
-    )
-  }
-
   type() {
     return this.properties.type || 'text'
   }
@@ -644,7 +642,7 @@ const BaseDataLayerSwitcher = class extends Fields.Select {
 
   set() {
     this.builder._umap.lastUsedDataLayer = this.toJS()
-    this.builder.setter(this.field, this.toJS())
+    this.builder.setter(this, this.toJS())
   }
 }
 
@@ -762,7 +760,7 @@ Fields.IconUrl = class extends Fields.BlurInput {
     // in the super method, maybe it's useless for all fields.
     const path = this.field.split('.')
     const key = path[path.length - 1]
-    return this.builder.getter(this.field)
+    return this.builder.getter(this)
   }
 
   getTemplate() {
@@ -1219,6 +1217,7 @@ Fields.ManageOwner = class extends Fields.Base {
       className: 'edit-owner',
       on_select: (choice) => this.onSelect(choice),
       placeholder: translate("Type new owner's username"),
+      url: this.properties.url,
     }
     this.autocomplete = new AjaxAutocomplete(this.container, options)
     const owner = this.toHTML()
@@ -1251,6 +1250,7 @@ Fields.ManageEditors = class extends Fields.Base {
       on_select: (choice) => this.onSelect(choice),
       on_unselect: (choice) => this.onUnselect(choice),
       placeholder: translate("Type editor's username"),
+      url: this.properties.url,
     }
     this.autocomplete = new AjaxAutocompleteMultiple(this.container, options)
     this._values = this.toHTML() || []

umap/static/umap/js/modules/permissions.js

@@ -126,7 +126,11 @@ export class MapPermissions {
       ])
       collaboratorsFields.push([
         'properties.owner',
-        { handler: 'ManageOwner', label: translate("Map's owner") },
+        {
+          handler: 'ManageOwner',
+          label: translate("Map's owner"),
+          url: this._umap.properties.urls.agnocomplete,
+        },
       ])
       if (this._umap.properties.user?.teams?.length) {
         collaboratorsFields.push([
@@ -141,7 +145,11 @@ export class MapPermissions {
     }
     collaboratorsFields.push([
       'properties.editors',
-      { handler: 'ManageEditors', label: translate("Map's editors") },
+      {
+        handler: 'ManageEditors',
+        label: translate("Map's editors"),
+        url: this._umap.properties.urls.agnocomplete,
+      },
     ])
 
     const builder = new MutatingForm(this, topFields)