umap-project 2.4.0b2__py3-none-any.whl → 2.4.2__py3-none-any.whl

umap/static/umap/js/umap.forms.js

@@ -61,8 +61,8 @@ L.FormBuilder.Element.include({
 
   get: function (own) {
     if (!this.options.inheritable || own) return this.builder.getter(this.field)
-    const path = this.field.split('.'),
-      key = path[path.length - 1]
+    const path = this.field.split('.')
+    const key = path[path.length - 1]
     return this.obj.getOption(key)
   },
 
@@ -296,10 +296,9 @@ L.FormBuilder.ColorPicker = L.FormBuilder.Input.extend({
   },
 
   onBlur: function () {
-    const self = this,
-      closePicker = () => {
-        self.container.style.display = 'none'
-      }
+    const closePicker = () => {
+      this.container.style.display = 'none'
+    }
     // We must leave time for the click to be listened.
     window.setTimeout(closePicker, 100)
   },
@@ -341,7 +340,7 @@ L.FormBuilder.TextColorPicker = L.FormBuilder.ColorPicker.extend({
 })
 
 L.FormBuilder.LayerTypeChooser = L.FormBuilder.Select.extend({
-  getOptions: function () {
+  getOptions: () => {
     const layer_classes = [
       U.Layer.Default,
       U.Layer.Cluster,
@@ -353,7 +352,7 @@ L.FormBuilder.LayerTypeChooser = L.FormBuilder.Select.extend({
 })
 
 L.FormBuilder.SlideshowDelay = L.FormBuilder.IntSelect.extend({
-  getOptions: function () {
+  getOptions: () => {
     const options = []
     for (let i = 1; i < 30; i++) {
       options.push([i * 1000, L._('{delay} seconds', { delay: i })])
@@ -459,9 +458,7 @@ L.FormBuilder.BlurInput.include({
 })
 
 L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
-  type: function () {
-    return 'hidden'
-  },
+  type: () => 'hidden',
 
   build: function () {
     L.FormBuilder.BlurInput.prototype.build.call(this)
@@ -517,18 +514,13 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
         this
       )
     }
-    const symbol = L.DomUtil.add(
-        'button',
-        'flat tab-symbols',
-        this.tabs,
-        L._('Symbol')
-      ),
-      char = L.DomUtil.add(
-        'button',
-        'flat tab-chars',
-        this.tabs,
-        L._('Emoji & Character')
-      )
+    const symbol = L.DomUtil.add('button', 'flat tab-symbols', this.tabs, L._('Symbol'))
+    const char = L.DomUtil.add(
+      'button',
+      'flat tab-chars',
+      this.tabs,
+      L._('Emoji & Character')
+    )
     url = L.DomUtil.add('button', 'flat tab-url', this.tabs, L._('URL'))
     L.DomEvent.on(symbol, 'click', L.DomEvent.stop).on(
       symbol,
@@ -547,10 +539,10 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
 
   openTab: function (name) {
     const els = this.tabs.querySelectorAll('button')
-    for (let el of els) {
+    for (const el of els) {
       L.DomUtil.removeClass(el, 'on')
     }
-    let el = this.tabs.querySelector(`.tab-${name}`)
+    const el = this.tabs.querySelector(`.tab-${name}`)
     L.DomUtil.addClass(el, 'on')
     this.body.innerHTML = ''
   },
@@ -574,15 +566,15 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
   },
 
   addIconPreview: function (pictogram, parent) {
-    const baseClass = 'umap-pictogram-choice',
-      value = pictogram.src,
-      search = U.Utils.normalize(this.searchInput.value),
-      title = pictogram.attribution
-        ? `${pictogram.name} — © ${pictogram.attribution}`
-        : pictogram.name || pictogram.src
+    const baseClass = 'umap-pictogram-choice'
+    const value = pictogram.src
+    const search = U.Utils.normalize(this.searchInput.value)
+    const title = pictogram.attribution
+      ? `${pictogram.name} — © ${pictogram.attribution}`
+      : pictogram.name || pictogram.src
     if (search && U.Utils.normalize(title).indexOf(search) === -1) return
-    const className = value === this.value() ? `${baseClass} selected` : baseClass,
-      container = L.DomUtil.create('div', className, parent)
+    const className = value === this.value() ? `${baseClass} selected` : baseClass
+    const container = L.DomUtil.create('div', className, parent)
     U.Icon.makeIconElement(value, container)
     container.title = title
     L.DomEvent.on(
@@ -612,7 +604,7 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
     if (name) L.DomUtil.add('h6', '', parent, name)
     const grid = L.DomUtil.create('div', 'umap-pictogram-grid', parent)
     let status = false
-    for (let item of items) {
+    for (const item of items) {
       status = this.addIconPreview(item, grid) || status
     }
     if (status) this.grid.appendChild(parent)
@@ -630,7 +622,7 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
     const sorted = Object.entries(categories).toSorted(([a], [b]) =>
       U.Utils.naturalSort(a, b, L.lang)
     )
-    for (let [name, items] of sorted) {
+    for (const [name, items] of sorted) {
       this.addCategory(items, name)
     }
   },
@@ -701,7 +693,7 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
     return input
   },
 
-  unselectAll: function (container) {
+  unselectAll: (container) => {
     const els = container.querySelectorAll('div.selected')
     for (const el in els) {
       if (els.hasOwnProperty(el)) L.DomUtil.removeClass(els[el], 'selected')
@@ -710,9 +702,7 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
 })
 
 L.FormBuilder.Url = L.FormBuilder.Input.extend({
-  type: function () {
-    return 'url'
-  },
+  type: () => 'url',
 })
 
 L.FormBuilder.Switch = L.FormBuilder.CheckBox.extend({
@@ -748,9 +738,9 @@ L.FormBuilder.FacetSearchChoices = L.FormBuilder.FacetSearchBase.extend({
     this.container = L.DomUtil.create('fieldset', 'umap-facet', this.parentNode)
     this.container.appendChild(this.label)
     this.ul = L.DomUtil.create('ul', '', this.container)
-    this.type = this.options.criteria['type']
+    this.type = this.options.criteria.type
 
-    const choices = this.options.criteria['choices']
+    const choices = this.options.criteria.choices
     choices.sort()
     choices.forEach((value) => this.buildLi(value))
   },
@@ -763,7 +753,7 @@ L.FormBuilder.FacetSearchChoices = L.FormBuilder.FacetSearchBase.extend({
 
     input.type = this.type
     input.name = `${this.type}_${this.name}`
-    input.checked = this.get()['choices'].includes(value)
+    input.checked = this.get().choices.includes(value)
     input.dataset.value = value
 
     L.DomEvent.on(input, 'change', (e) => this.sync())
@@ -780,17 +770,11 @@ L.FormBuilder.FacetSearchChoices = L.FormBuilder.FacetSearchBase.extend({
 })
 
 L.FormBuilder.MinMaxBase = L.FormBuilder.FacetSearchBase.extend({
-  getInputType: function (type) {
-    return type
-  },
+  getInputType: (type) => type,
 
-  getLabels: function () {
-    return [L._('Min'), L._('Max')]
-  },
+  getLabels: () => [L._('Min'), L._('Max')],
 
-  prepareForHTML: function (value) {
-    return value.valueOf()
-  },
+  prepareForHTML: (value) => value.valueOf(),
 
   build: function () {
     this.container = L.DomUtil.create('fieldset', 'umap-facet', this.parentNode)
@@ -856,13 +840,13 @@ L.FormBuilder.MinMaxBase = L.FormBuilder.FacetSearchBase.extend({
   isMinModified: function () {
     const default_ = this.minInput.getAttribute('value')
     const current = this.minInput.value
-    return current != default_
+    return current !== default_
   },
 
   isMaxModified: function () {
     const default_ = this.maxInput.getAttribute('value')
     const current = this.maxInput.value
-    return current != default_
+    return current !== default_
   },
 
   toJS: function () {
@@ -880,39 +864,29 @@ L.FormBuilder.MinMaxBase = L.FormBuilder.FacetSearchBase.extend({
 })
 
 L.FormBuilder.FacetSearchNumber = L.FormBuilder.MinMaxBase.extend({
-  prepareForJS: function (value) {
-    return new Number(value)
-  },
+  prepareForJS: (value) => new Number(value),
 })
 
 L.FormBuilder.FacetSearchDate = L.FormBuilder.MinMaxBase.extend({
-  prepareForJS: function (value) {
-    return new Date(value)
-  },
+  prepareForJS: (value) => new Date(value),
 
-  toLocaleDateTime: function (dt) {
-    return new Date(dt.valueOf() - dt.getTimezoneOffset() * 60000)
-  },
+  toLocaleDateTime: (dt) => new Date(dt.valueOf() - dt.getTimezoneOffset() * 60000),
 
   prepareForHTML: function (value) {
     // Value must be in local time
-    if (isNaN(value)) return
+    if (Number.isNaN(value)) return
     return this.toLocaleDateTime(value).toISOString().substr(0, 10)
   },
 
-  getLabels: function () {
-    return [L._('From'), L._('Until')]
-  },
+  getLabels: () => [L._('From'), L._('Until')],
 })
 
 L.FormBuilder.FacetSearchDateTime = L.FormBuilder.FacetSearchDate.extend({
-  getInputType: function (type) {
-    return 'datetime-local'
-  },
+  getInputType: (type) => 'datetime-local',
 
   prepareForHTML: function (value) {
     // Value must be in local time
-    if (isNaN(value)) return
+    if (Number.isNaN(value)) return
     return this.toLocaleDateTime(value).toISOString().slice(0, -1)
   },
 })
@@ -1020,9 +994,7 @@ L.FormBuilder.DataLayersControl = L.FormBuilder.TernaryChoices.extend({
 })
 
 L.FormBuilder.Range = L.FormBuilder.FloatInput.extend({
-  type: function () {
-    return 'range'
-  },
+  type: () => 'range',
 
   value: function () {
     return L.DomUtil.hasClass(this.wrapper, 'undefined')
@@ -1124,7 +1096,7 @@ U.FormBuilder = L.FormBuilder.extend({
   },
 
   computeDefaultOptions: function () {
-    for (let [key, schema] of Object.entries(U.SCHEMA)) {
+    for (const [key, schema] of Object.entries(U.SCHEMA)) {
       if (schema.type === Boolean) {
         if (schema.nullable) schema.handler = 'NullableChoices'
         else schema.handler = 'Switch'

umap/static/umap/js/umap.icon.js

@@ -12,12 +12,12 @@ U.Icon = L.DivIcon.extend({
     options = L.Util.extend({}, default_options, options)
     L.Icon.prototype.initialize.call(this, options)
     this.feature = this.options.feature
-    if (this.feature && this.feature.isReadOnly()) {
+    if (this.feature?.isReadOnly()) {
       this.options.className += ' readonly'
     }
   },
 
-  _setRecent: function (url) {
+  _setRecent: (url) => {
     if (U.Utils.hasVar(url)) return
     if (url === U.SCHEMA.iconUrl.default) return
     if (U.Icon.RECENT.indexOf(url) === -1) {
@@ -27,7 +27,7 @@ U.Icon = L.DivIcon.extend({
 
   _getIconUrl: function (name) {
     let url
-    if (this.feature && this.feature._getIconUrl(name)) {
+    if (this.feature?._getIconUrl(name)) {
       url = this.feature._getIconUrl(name)
       this._setRecent(url)
     } else {
@@ -49,14 +49,10 @@ U.Icon = L.DivIcon.extend({
     return this.map.getDefaultOption('iconOpacity')
   },
 
-  formatUrl: function (url, feature) {
-    return U.Utils.greedyTemplate(
-      url || '',
-      feature ? feature.extendedProperties() : {}
-    )
-  },
+  formatUrl: (url, feature) =>
+    U.Utils.greedyTemplate(url || '', feature ? feature.extendedProperties() : {}),
 
-  onAdd: function () {},
+  onAdd: () => {},
 })
 
 U.Icon.Default = U.Icon.extend({
@@ -74,8 +70,8 @@ U.Icon.Default = U.Icon.extend({
 
   _setIconStyles: function (img, name) {
     U.Icon.prototype._setIconStyles.call(this, img, name)
-    const color = this._getColor(),
-      opacity = this._getOpacity()
+    const color = this._getColor()
+    const opacity = this._getOpacity()
     this.elements.container.style.backgroundColor = color
     this.elements.arrow.style.borderTopColor = color
     this.elements.container.style.opacity = opacity
@@ -189,10 +185,10 @@ U.Icon.Cluster = L.DivIcon.extend({
   },
 
   createIcon: function () {
-    const container = L.DomUtil.create('div', 'leaflet-marker-icon marker-cluster'),
-      div = L.DomUtil.create('div', '', container),
-      span = L.DomUtil.create('span', '', div),
-      backgroundColor = this.datalayer.getColor()
+    const container = L.DomUtil.create('div', 'leaflet-marker-icon marker-cluster')
+    const div = L.DomUtil.create('div', '', container)
+    const span = L.DomUtil.create('span', '', div)
+    const backgroundColor = this.datalayer.getColor()
     span.textContent = this.cluster.getChildCount()
     div.style.backgroundColor = backgroundColor
     return container
@@ -201,18 +197,17 @@ U.Icon.Cluster = L.DivIcon.extend({
   computeTextColor: function (el) {
     let color
     const backgroundColor = this.datalayer.getColor()
-    if (this.datalayer.options.cluster && this.datalayer.options.cluster.textColor) {
+    if (this.datalayer.options.cluster?.textColor) {
       color = this.datalayer.options.cluster.textColor
     }
     return color || L.DomUtil.TextColorFromBackgroundColor(el, backgroundColor)
   },
 })
 
-U.Icon.isImg = function (src) {
-  return U.Utils.isPath(src) || U.Utils.isRemoteUrl(src) || U.Utils.isDataImage(src)
-}
+U.Icon.isImg = (src) =>
+  U.Utils.isPath(src) || U.Utils.isRemoteUrl(src) || U.Utils.isDataImage(src)
 
-U.Icon.makeIconElement = function (src, parent) {
+U.Icon.makeIconElement = (src, parent) => {
   let icon
   if (U.Icon.isImg(src)) {
     icon = L.DomUtil.create('img')
@@ -225,7 +220,7 @@ U.Icon.makeIconElement = function (src, parent) {
   return icon
 }
 
-U.Icon.setIconContrast = function (icon, parent, src, bgcolor) {
+U.Icon.setIconContrast = (icon, parent, src, bgcolor) => {
   /*
    * icon: the element we'll adapt the style, it can be an image or text
    * parent: the element we'll consider to decide whether to adapt the style,