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

umap/static/umap/js/modules/rendering/controls.js

@@ -1,4 +1,4 @@
-import { Control } from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { Control, LayerGroup } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import * as Utils from '../utils.js'
 import { translate } from '../i18n.js'
 
@@ -112,7 +112,9 @@ export const PermanentCreditsControl = Control.extend({
     const container = Utils.loadTemplate(
       `<div class="umap-permanent-credits-container text">${Utils.toHTML(map.options.permanentCredit)}</div>`
     )
-    const background = map.options.permanentCreditBackground ? '#FFFFFFB0' : ''
+    const background = map._umap.getProperty('permanentCreditBackground')
+      ? '#FFFFFFB0'
+      : ''
     container.style.backgroundColor = background
     return container
   },
@@ -164,7 +166,7 @@ export const DataLayersControl = BaseButton.extend({
   },
 
   afterAdd: function (container) {
-    Utils.toggleBadge(container, this._umap.browser?.hasFilters())
+    Utils.toggleBadge(container, this._umap.browser?.hasActiveFilters())
   },
 
   onClick: function () {
@@ -219,7 +221,7 @@ export const SearchControl = BaseButton.extend({
   },
 
   afterAdd(container, map) {
-    this.layer = L.layerGroup().addTo(map)
+    this.layer = new LayerGroup().addTo(map)
     this.photonOptions = {
       limit: 10,
       noResultLabel: translate('No results'),

umap/static/umap/js/modules/rendering/icon.js

@@ -237,14 +237,7 @@ const Ball = DefaultIcon.extend({
   _setIconStyles: function (img, name) {
     BaseIcon.prototype._setIconStyles.call(this, img, name)
     const color = this._getColor('color')
-    let background
-    if (L.Browser.ielt9) {
-      background = color
-    } else if (L.Browser.webkit) {
-      background = `-webkit-gradient( radial, 6 38%, 0, 6 38%, 8, from(white), to(${color}) )`
-    } else {
-      background = `radial-gradient(circle at 6px 38% , white -4px, ${color} 8px) repeat scroll 0 0 transparent`
-    }
+    const background = `radial-gradient(circle at 6px 38% , white -4px, ${color} 8px) repeat scroll 0 0 transparent`
     this.elements.ball.style.background = background
     this.elements.ball.style.opacity = this._getOpacity()
   },
@@ -309,5 +302,8 @@ export function setContrast(icon, parent, src, bgcolor) {
 }
 
 export function formatUrl(url, feature) {
-  return Utils.greedyTemplate(url || '', feature ? feature.extendedProperties() : {})
+  if (Utils.hasVar(url)) {
+    return Utils.greedyTemplate(url || '', feature ? feature.extendedProperties() : {})
+  }
+  return url
 }

umap/static/umap/js/modules/rendering/layers/base.js

@@ -53,7 +53,7 @@ export const LayerMixin = {
   },
 
   onZoomEnd() {
-    if (!this.datalayer.autoLoaded) return
+    if (!this.datalayer.autoVisibility) return
     if (!this.datalayer.showAtZoom() && this.datalayer.isVisible()) {
       this.datalayer.hide()
     }

umap/static/umap/js/modules/rendering/layers/classified.js

@@ -1,5 +1,5 @@
 import colorbrewer from '../../../../vendors/colorbrewer/colorbrewer.js'
-import { DomUtil, FeatureGroup } from '../../../../vendors/leaflet/leaflet-src.esm.js'
+import { FeatureGroup } from '../../../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from '../../i18n.js'
 import * as Utils from '../../utils.js'
 import * as DOMUtils from '../../domutils.js'
@@ -7,7 +7,7 @@ import { CircleMarker } from '../ui.js'
 import { LayerMixin } from './base.js'
 
 // Layer where each feature color is relative to the others,
-// so we need all features before behing able to set one
+// so we need all features before being able to set one
 // feature layer
 const ClassifiedMixin = {
   initialize: function (datalayer) {
@@ -346,7 +346,8 @@ export const Circles = FeatureGroup.extend({
   },
 
   renderLegend: function (container) {
-    const parent = DomUtil.create('ul', 'circles-layer-legend', container)
+    const parent = DOMUtils.loadTemplate('<ul class="circles-layer-legend"></ul>')
+    container.appendChild(parent)
     const color = this.datalayer.getProperty('color')
     const values = this.getValues()
     if (!values.length) return
@@ -360,14 +361,18 @@ export const Circles = FeatureGroup.extend({
       [this.options.maxPX, maxValue],
     ]
     for (const [size, label] of items) {
-      const li = DomUtil.create('li', '', parent)
-      const circleEl = DomUtil.create('span', 'circle', li)
-      circleEl.style.backgroundColor = color
-      circleEl.style.height = `${size * 2}px`
-      circleEl.style.width = `${size * 2}px`
-      circleEl.style.opacity = this.datalayer.getProperty('opacity')
-      const labelEl = DomUtil.create('span', 'label', li)
-      labelEl.textContent = label
+      parent.appendChild(
+        DOMUtils.loadTemplate(`
+        <li>
+          <span class="circle"
+                style="background-color: ${color};
+                       height: ${size * 2}px;
+                       width: ${size * 2}px;
+                       opacity: ${this.datalayer.getProperty('fillOpacity')};"></span>
+          <span class="label">${label}</span>
+        </li>
+      `)
+      )
     }
   },
 })

umap/static/umap/js/modules/rendering/layers/heat.js

@@ -68,27 +68,32 @@ export const Heat = L.HeatLayer.extend({
     return latLngBounds(this._latlngs)
   },
 
-  getEditableProperties: () => [
-    [
-      'properties.heat.radius',
-      {
-        handler: 'Range',
-        min: 10,
-        max: 100,
-        step: 5,
-        label: translate('Heatmap radius'),
-        helpText: translate('Override heatmap radius (default 25)'),
-      },
-    ],
-    [
-      'properties.heat.intensityProperty',
-      {
-        handler: 'BlurInput',
-        placeholder: translate('Heatmap intensity property'),
-        helpText: translate('Optional intensity property for heatmap'),
-      },
-    ],
-  ],
+  getEditableProperties: function () {
+    return [
+      [
+        'properties.heat.radius',
+        {
+          handler: 'Range',
+          min: 10,
+          max: 100,
+          step: 5,
+          label: translate('Heatmap radius'),
+          helpText: translate('Override heatmap radius (default 25)'),
+        },
+      ],
+      [
+        'properties.heat.intensityProperty',
+        {
+          handler: 'Select',
+          selectOptions: [
+            ['', translate('Select field to compute intensity')],
+            ...this.datalayer.fields.keys(),
+          ],
+          helpText: translate('Optional intensity field to compute heatmap'),
+        },
+      ],
+    ]
+  },
 
   onEdit: function (field, builder) {
     if (field === 'properties.heat.intensityProperty') {
@@ -97,6 +102,7 @@ export const Heat = L.HeatLayer.extend({
     }
     if (field === 'properties.heat.radius') {
       this.options.radius = this.datalayer.properties.heat.radius
+      this.redraw()
     }
     this._updateOptions()
   },

umap/static/umap/js/modules/rendering/map.js

@@ -1,12 +1,14 @@
 // Goes here all code related to Leaflet, DOM and user interactions.
 import {
   Map as BaseMap,
+  Browser,
   Control,
   DomEvent,
-  DomUtil,
   latLng,
-  latLngBounds,
+  LatLng,
+  LatLngBounds,
   setOptions,
+  TileLayer,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 import DropControl from '../drop.js'
@@ -46,7 +48,6 @@ const ControlsMixin = {
     'caption',
     'locate',
     'measure',
-    'editinosm',
     'print',
     'tilelayers',
   ],
@@ -91,17 +92,9 @@ const ControlsMixin = {
     this._controls.embed = new EmbedControl(this._umap)
     this._controls.print = new PrintControl(this._umap)
     this._controls.tilelayersChooser = new TileLayerChooser(this._umap)
-    this._controls.editinosm = new Control.EditInOSM({
-      position: 'topleft',
-      widgetOptions: {
-        helpText: translate(
-          'Open this map extent in a map editor to provide more accurate data to OpenStreetMap'
-        ),
-      },
-    })
     this._controls.measure = new L.MeasureControl().initHandler(this)
     this._controls.more = new MoreControl()
-    this._controls.scale = L.control.scale()
+    this._controls.scale = new Control.Scale()
     this._controls.permanentCredit = new PermanentCreditsControl(this)
     this._umap.drop = new DropControl(this._umap, this, this._container)
     this._controls.tilelayers = new U.TileLayerControl(this)
@@ -138,11 +131,10 @@ const ControlsMixin = {
       const control = this._controls[name]
       if (!control) continue
       control.addTo(this)
-      if (status === undefined || status === null) {
-        DomUtil.addClass(control._container, 'display-on-more')
-      } else {
-        DomUtil.removeClass(control._container, 'display-on-more')
-      }
+      control._container.classList.toggle(
+        'display-on-more',
+        status === undefined || status === null
+      )
     }
     if (this._umap.getProperty('permanentCredit'))
       this._controls.permanentCredit.addTo(this)
@@ -176,7 +168,7 @@ const ManageTilelayerMixin = {
     if (this._controls) this._controls.tilelayers.setLayers()
   },
 
-  createTileLayer: (tilelayer) => new L.TileLayer(tilelayer.url_template, tilelayer),
+  createTileLayer: (tilelayer) => new TileLayer(tilelayer.url_template, tilelayer),
 
   selectTileLayer: function (tilelayer) {
     if (tilelayer === this.selectedTilelayer) {
@@ -303,7 +295,7 @@ export const LeafletMap = BaseMap.extend({
       // when scrolling the main page and touching the
       // map in an iframe. May be a bit dumb, but let's
       // try like this for now.
-      if (L.Browser.mobile) this.dragging.disable()
+      if (Browser.mobile) this.dragging.disable()
     }
     // Needs tilelayer to exist for minimap
     this.renderControls()
@@ -312,7 +304,7 @@ export const LeafletMap = BaseMap.extend({
 
   latLng: (a, b, c) => {
     // manage geojson case and call original method
-    if (!(a instanceof L.LatLng) && a.coordinates) {
+    if (!(a instanceof LatLng) && a.coordinates) {
       // Guess it's a geojson
       a = [a.coordinates[1], a.coordinates[0]]
     }
@@ -361,7 +353,7 @@ export const LeafletMap = BaseMap.extend({
       !Number.isNaN(north) &&
       !Number.isNaN(east)
     ) {
-      const bounds = latLngBounds([
+      const bounds = new LatLngBounds([
         [south, west],
         [north, east],
       ])
@@ -381,7 +373,7 @@ export const LeafletMap = BaseMap.extend({
   setMaxBounds: function (bounds) {
     // Hack. Remove me when fix is released:
     // https://github.com/Leaflet/Leaflet/pull/4494
-    bounds = latLngBounds(bounds)
+    bounds = new LatLngBounds(bounds)
 
     if (!bounds.isValid()) {
       this.options.maxBounds = null
@@ -390,6 +382,14 @@ export const LeafletMap = BaseMap.extend({
     return BaseMap.prototype.setMaxBounds.call(this, bounds)
   },
 
+  getLayersBounds: (layers) => {
+    const bounds = new LatLngBounds()
+    for (const layer of layers) {
+      bounds.extend(layer.getBounds())
+    }
+    return bounds
+  },
+
   initEditTools: function () {
     this.editTools = new U.Editable(this._umap)
   },

umap/static/umap/js/modules/rendering/popup.js

@@ -1,11 +1,11 @@
 import {
   Popup as BasePopup,
   DomEvent,
-  DomUtil,
   Path,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import Browser from '../browser.js'
 import loadTemplate from './template.js'
+import * as DOMUtils from '../domutils.js'
 
 export default function loadPopup(name) {
   switch (name) {
@@ -25,7 +25,8 @@ const Popup = BasePopup.extend({
   },
 
   loadContent: async function () {
-    const container = DomUtil.create('div', 'umap-popup')
+    const container = document.createElement('div')
+    container.classList.add('umap-popup')
     const name = this.feature.getOption('popupTemplate')
     this.content = await loadTemplate(name, this.feature, container)
     const elements = container.querySelectorAll('img,iframe')
@@ -34,7 +35,9 @@ const Popup = BasePopup.extend({
     }
     if (!elements.length && container.textContent.replace('\n', '') === '') {
       container.innerHTML = ''
-      DomUtil.add('h3', '', container, this.feature.getDisplayName())
+      container.appendChild(
+        DOMUtils.loadTemplate(`<h3>${this.feature.getDisplayName()}</h3>`)
+      )
     }
     this.setContent(container)
   },

umap/static/umap/js/modules/rendering/template.js

@@ -1,8 +1,4 @@
-import {
-  DomEvent,
-  DomUtil,
-  CircleMarker,
-} from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { DomEvent, CircleMarker } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { getLocale, translate } from '../i18n.js'
 import { Request } from '../request.js'
 import * as Utils from '../utils.js'
@@ -92,7 +88,11 @@ class PopupTemplate {
     const title = this.renderTitle(feature)
     if (title) container.appendChild(title)
     const body = await this.renderBody(feature)
-    if (body) DomUtil.add('div', 'umap-popup-content', container, body)
+    if (body) {
+      const div = DOMUtils.loadTemplate('<div class="umap-popup-content"></div>')
+      div.appendChild(body)
+      container.appendChild(div)
+    }
     const footer = this.renderFooter(feature)
     if (footer) container.appendChild(footer)
   }
@@ -108,29 +108,20 @@ export const TitleMixin = (Base) =>
   }
 
 class Table extends TitleMixin(PopupTemplate) {
-  getValue(feature, key) {
-    // TODO, manage links (url, mailto, wikipedia...)
-    const value = Utils.escapeHTML(feature.properties[key]).trim()
-    if (value.indexOf('http') === 0) {
-      return `<a href="${value}" target="_blank">${value}</a>`
-    }
-    return value
-  }
-
-  makeRow(feature, key) {
+  makeRow(feature, field) {
     return Utils.loadTemplate(
-      `<tr><th>${key}</th><td>${this.getValue(feature, key)}</td></tr>`
+      `<tr><th>${field.key}</th><td>${field.render(feature.properties[field.key])}</td></tr>`
     )
   }
 
   async renderBody(feature) {
     const table = document.createElement('table')
 
-    for (const key in feature.properties) {
-      if (typeof feature.properties[key] === 'object' || U.LABEL_KEYS.includes(key)) {
+    for (const field of feature.fields) {
+      if (U.LABEL_KEYS.includes(field.key)) {
         continue
       }
-      table.appendChild(this.makeRow(feature, key))
+      table.appendChild(this.makeRow(feature, field))
     }
     return table
   }
@@ -138,16 +129,17 @@ class Table extends TitleMixin(PopupTemplate) {
 
 class GeoRSSImage extends TitleMixin(PopupTemplate) {
   async renderBody(feature) {
-    const body = DomUtil.create('a')
-    body.href = feature.properties.link
-    body.target = '_blank'
+    const body = DOMUtils.loadTemplate(
+      `<a href="${feature.properties.link}" target="_blank"></a>`
+    )
     if (feature.properties.img) {
-      const img = DomUtil.create('img', '', body)
-      img.src = feature.properties.img
       // Sadly, we are unable to override this from JS the clean way
       // See https://github.com/Leaflet/Leaflet/commit/61d746818b99d362108545c151a27f09d60960ee#commitcomment-6061847
-      img.style.maxWidth = '500px'
-      img.style.maxHeight = '500px'
+      body.appendChild(
+        DOMUtils.loadTemplate(
+          `<img src=${feature.properties.img} style="max-width: 500px; max-height: 500px;">`
+        )
+      )
     }
     return body
   }
@@ -165,15 +157,16 @@ class GeoRSSLink extends PopupTemplate {
 
 class OSM extends PopupTemplate {
   renderTitle(feature) {
-    const title = DomUtil.add('h3', 'popup-title')
     const color = feature.getPreviewColor()
-    title.style.backgroundColor = color
+    const [title, { iconContainer }] = DOMUtils.loadTemplateWithRefs(`
+    <h3 class="popup-title" style="background-color: ${color};">
+      <span data-ref="iconContainer"></span> ${this.getName(feature)}
+    </h3>`)
     const iconUrl = feature.getDynamicOption('iconUrl')
-    const icon = Icon.makeElement(iconUrl, title)
-    DomUtil.addClass(icon, 'icon')
+    const icon = Icon.makeElement(iconUrl, iconContainer)
+    icon.classList.add('icon')
     Icon.setContrast(icon, title, iconUrl, color)
     if (DOMUtils.contrastedColor(title, color)) title.style.color = 'white'
-    DomUtil.add('span', '', title, this.getName(feature))
     return title
   }
 
@@ -190,15 +183,16 @@ class OSM extends PopupTemplate {
     const locale = getLocale()
     const street = props['addr:street']
     if (street) {
-      const row = DomUtil.add('address', 'address', body)
       const number = props['addr:housenumber']
+      let content
       if (number) {
-        // Poor way to deal with international forms of writting addresses
-        DomUtil.add('span', '', row, `${translate('No.')}: ${number}`)
-        DomUtil.add('span', '', row, `${translate('Street')}: ${street}`)
+        // Poor way to deal with international forms of writing addresses
+        content = `<span>${translate('№')}: ${number}</span><span>${translate('Street')}: ${street}</span>`
       } else {
-        DomUtil.add('span', '', row, street)
+        content = street
       }
+      const row = DOMUtils.loadTemplate(`<address class="address">${content}</address>`)
+      body.appendChild(row)
     }
     if (props.website) {
       body.appendChild(

umap/static/umap/js/modules/rendering/ui.js

@@ -2,7 +2,6 @@
 import {
   CircleMarker as BaseCircleMarker,
   DomEvent,
-  DomUtil,
   GeoJSON,
   LatLng,
   LatLngBounds,
@@ -314,7 +313,7 @@ const PathMixin = {
       this.enableEdit()
     } else {
       this._map._umap.tooltip.open({
-        content: L._('Please zoom in to edit the geometry'),
+        content: translate('Please zoom in to edit the geometry'),
       })
       this.disableEdit()
     }

umap/static/umap/js/modules/rules.js

@@ -6,6 +6,7 @@ import Orderable from './orderable.js'
 import * as Utils from './utils.js'
 import * as Icon from './rendering/icon.js'
 import { SCHEMA } from './schema.js'
+import { Registry as Fields } from './data/fields.js'
 
 const EMPTY_VALUES = ['', undefined, null]
 
@@ -28,12 +29,12 @@ class Rule {
     // cf https://caniuse.com/?search=public%20class%20field
     this._condition = null
     this.OPERATORS = [
-      ['>', this.gt],
-      ['<', this.lt],
+      ['>', 'gt'],
+      ['<', 'lt'],
       // When sent by Django
-      ['&lt;', this.lt],
-      ['!=', this.not_equal],
-      ['=', this.equal],
+      ['&lt;', 'lt'],
+      ['!=', 'not_equal'],
+      ['=', 'equal'],
     ]
     this.parent = parent
     this._umap = umap
@@ -47,58 +48,47 @@ class Rule {
     this.parent.render(fields)
   }
 
-  equal(other) {
-    return this.expected === other
-  }
-
-  not_equal(other) {
-    return this.expected !== other
-  }
-
-  gt(other) {
-    return other > this.expected
-  }
-
-  lt(other) {
-    return other < this.expected
-  }
-
   parse() {
     let vars = []
     this.cast = (v) => v
     this.operator = undefined
-    for (const [sign, func] of this.OPERATORS) {
+    let operator = undefined
+    for (const [sign, funcName] of this.OPERATORS) {
       if (this.condition.includes(sign)) {
-        this.operator = func
+        operator = funcName
         vars = this.condition.split(sign)
         break
       }
     }
     if (vars.length !== 2) return
-    this.key = vars[0]
+    this.field = this.parent.fields.get(vars[0]) || new Fields.String(vars[0])
+    this.operator = this.field[operator]
     this.expected = vars[1]
     if (EMPTY_VALUES.includes(this.expected)) {
       this.cast = (v) => EMPTY_VALUES.includes(v)
     }
-    // Special cases where we want to be lousy when checking isNaN without
-    // coercing to a Number first because we handle multiple types.
-    // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/
-    // Reference/Global_Objects/Number/isNaN
-    // biome-ignore lint/suspicious/noGlobalIsNan: expected might not be a number.
-    else if (!isNaN(this.expected)) {
-      this.cast = Number.parseFloat
-    } else if (['true', 'false'].includes(this.expected)) {
-      this.cast = (v) => {
-        if (`${v}`.toLowerCase() === 'true') return true
-        if (`${v}`.toLowerCase() === 'false') return false
+    // TODO: deal with legacy rules on non typed fields
+    else {
+      this.cast = this.field.parse
+      if (
+        // Special cases where we want to be lousy when checking isNaN without
+        // coercing to a Number first because we handle multiple types.
+        // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/
+        // Reference/Global_Objects/Number/isNaN
+        // biome-ignore lint/suspicious/noGlobalIsNan: expected might not be a number.
+        !isNaN(this.expected) &&
+        ['gt', 'lt'].includes(operator) &&
+        this.field.TYPE !== 'Number'
+      ) {
+        this.cast = Number.parseFloat
       }
     }
     this.expected = this.cast(this.expected)
   }
 
   match(props) {
-    if (!this.operator || !this.active) return false
-    return this.operator(this.cast(props[this.key]))
+    if (!this.operator || !this.active || !this.field) return false
+    return this.operator(this.expected, this.cast(props[this.field.key]))
   }
 
   getOption(option) {
@@ -118,6 +108,7 @@ class Rule {
       'name',
       'properties.color',
       'properties.iconClass',
+      'properties.iconSize',
       'properties.iconUrl',
       'properties.iconOpacity',
       'properties.opacity',
@@ -132,7 +123,7 @@ class Rule {
     const container = document.createElement('div')
     container.appendChild(builder.build())
     const autocomplete = new AutocompleteDatalist(builder.helpers.condition.input)
-    const properties = this.parent.fieldKeys
+    const properties = Array.from(this.parent.fields.keys())
     autocomplete.suggestions = properties
     autocomplete.input.addEventListener('input', (event) => {
       const value = event.target.value
@@ -140,9 +131,11 @@ class Rule {
         autocomplete.suggestions = [`${value}=`, `${value}!=`, `${value}>`, `${value}<`]
       } else if (value.endsWith('=')) {
         const key = value.split('!')[0].split('=')[0]
-        autocomplete.suggestions = this.parent
-          .sortedValues(key)
-          .map((str) => `${value}${str ?? ''}`)
+        if (key) {
+          autocomplete.suggestions = this.parent
+            .sortedValues(key)
+            .map((str) => `${value}${str ?? ''}`)
+        }
       }
     })
     const backButton = Utils.loadTemplate(`

umap/static/umap/js/modules/schema.js

@@ -123,13 +123,6 @@ export const SCHEMA = {
   edit_status: {
     type: Number,
   },
-  editinosmControl: {
-    type: Boolean,
-    impacts: ['ui'],
-    nullable: true,
-    label: translate('Display the control to open OpenStreetMap editor'),
-    default: null,
-  },
   editors: {
     type: Array,
   },