umap-project 2.4.1__py3-none-any.whl → 2.5.0__py3-none-any.whl

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,

umap/static/umap/js/umap.js

@@ -13,7 +13,7 @@ L.Map.mergeOptions({
   // we cannot rely on this because of the y is overriden by Leaflet
   // See https://github.com/Leaflet/Leaflet/pull/9201
   // And let's remove this -y when this PR is merged and released.
-  demoTileInfos: { 's': 'a', 'z': 9, 'x': 265, 'y': 181, '-y': 181, 'r': '' },
+  demoTileInfos: { s: 'a', z: 9, x: 265, y: 181, '-y': 181, r: '' },
   licences: [],
   licence: '',
   enableMarkerDraw: true,
@@ -29,7 +29,7 @@ L.Map.mergeOptions({
 U.Map = L.Map.extend({
   includes: [ControlsMixin],
 
-  initialize: function (el, geojson) {
+  initialize: async function (el, geojson) {
     this.sync_engine = new U.SyncEngine(this)
     this.sync = this.sync_engine.proxy(this)
     // Locale name (pt_PT, en_US…)
@@ -56,8 +56,8 @@ U.Map = L.Map.extend({
     this.urls = new U.URLs(this.options.urls)
 
     this.panel = new U.Panel(this)
+    this.dialog = new U.Dialog({ className: 'dark' })
     this.tooltip = new U.Tooltip(this._controlContainer)
-    this.dialog = new U.Dialog(this._controlContainer)
     if (this.hasEditMode()) {
       this.editPanel = new U.EditPanel(this)
       this.fullPanel = new U.FullPanel(this)
@@ -83,18 +83,15 @@ U.Map = L.Map.extend({
     }
 
     let editedFeature = null
-    const self = this
     try {
       Object.defineProperty(this, 'editedFeature', {
-        get: function () {
-          return editedFeature
-        },
-        set: function (feature) {
+        get: () => editedFeature,
+        set: (feature) => {
           if (editedFeature && editedFeature !== feature) {
             editedFeature.endEdit()
           }
           editedFeature = feature
-          self.fire('seteditedfeature')
+          this.fire('seteditedfeature')
         },
       })
     } catch (e) {
@@ -102,11 +99,7 @@ U.Map = L.Map.extend({
     }
 
     // Retrocompat
-    if (
-      this.options.slideshow &&
-      this.options.slideshow.delay &&
-      this.options.slideshow.active === undefined
-    ) {
+    if (this.options.slideshow?.delay && this.options.slideshow.active === undefined) {
       this.options.slideshow.active = true
     }
     if (this.options.advancedFilterKey) {
@@ -123,6 +116,8 @@ U.Map = L.Map.extend({
     // Needed for actions labels
     this.help = new U.Help(this)
 
+    this.formatter = new U.Formatter(this)
+
     this.initControls()
     // Needs locate control and hash to exist
     this.initCenter()
@@ -156,9 +151,7 @@ U.Map = L.Map.extend({
     let isDirty = false // self status
     try {
       Object.defineProperty(this, 'isDirty', {
-        get: function () {
-          return isDirty
-        },
+        get: () => isDirty,
         set: function (status) {
           isDirty = status
           this.checkDirty()
@@ -183,20 +176,7 @@ U.Map = L.Map.extend({
       }
       this._default_extent = true
       this.options.name = L._('Untitled map')
-      let data = L.Util.queryString('data', null)
-      let dataUrl = L.Util.queryString('dataUrl', null)
-      const dataFormat = L.Util.queryString('dataFormat', 'geojson')
-      if (dataUrl) {
-        dataUrl = decodeURIComponent(dataUrl)
-        dataUrl = this.localizeUrl(dataUrl)
-        dataUrl = this.proxyUrl(dataUrl)
-        const datalayer = this.createDataLayer()
-        datalayer.importFromUrl(dataUrl, dataFormat)
-      } else if (data) {
-        data = decodeURIComponent(data)
-        const datalayer = this.createDataLayer()
-        datalayer.importRaw(data, dataFormat)
-      }
+      await this.loadDataFromQueryString()
     }
 
     this.slideshow = new U.Slideshow(this, this.options.slideshow)
@@ -207,6 +187,7 @@ U.Map = L.Map.extend({
     }
 
     this.initShortcuts()
+    if (!this.options.noControl) this.initCaptionBar()
     this.onceDataLoaded(this.setViewFromQueryString)
 
     window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null
@@ -216,8 +197,8 @@ U.Map = L.Map.extend({
   },
 
   initSyncEngine: async function () {
-    if (this.options.websocketEnabled == false) return
-    if (this.options.syncEnabled != true) {
+    if (this.options.websocketEnabled === false) return
+    if (this.options.syncEnabled !== true) {
       this.sync.stop()
     } else {
       const ws_token_uri = this.urls.get('map_websocket_auth_token', {
@@ -235,9 +216,9 @@ U.Map = L.Map.extend({
   },
 
   render: function (fields) {
-    let impacts = U.Utils.getImpactsFromSchema(fields)
+    const impacts = U.Utils.getImpactsFromSchema(fields)
 
-    for (let impact of impacts) {
+    for (const impact of impacts) {
       switch (impact) {
         case 'ui':
           this.initCaptionBar()
@@ -274,7 +255,7 @@ U.Map = L.Map.extend({
     })
   },
 
-  setOptionsFromQueryString: function (options) {
+  setOptionsFromQueryString: (options) => {
     // This is not an editable option
     L.Util.setFromQueryString(options, 'editMode')
     // FIXME retrocompat
@@ -301,9 +282,28 @@ U.Map = L.Map.extend({
     }
   },
 
-  setViewFromQueryString: function () {
+  loadDataFromQueryString: async function () {
+    let data = L.Util.queryString('data', null)
+    const url = new URL(window.location.href)
+    const dataUrls = new URLSearchParams(url.search).getAll('dataUrl')
+    const dataFormat = L.Util.queryString('dataFormat', 'geojson')
+    if (dataUrls.length) {
+      for (let dataUrl of dataUrls) {
+        dataUrl = decodeURIComponent(dataUrl)
+        dataUrl = this.localizeUrl(dataUrl)
+        dataUrl = this.proxyUrl(dataUrl)
+        const datalayer = this.createDataLayer()
+        await datalayer.importFromUrl(dataUrl, dataFormat)
+      }
+    } else if (data) {
+      data = decodeURIComponent(data)
+      const datalayer = this.createDataLayer()
+      await datalayer.importRaw(data, dataFormat)
+    }
+  },
+
+  setViewFromQueryString: async function () {
     if (this.options.noControl) return
-    this.initCaptionBar()
     if (L.Util.queryString('share')) {
       this.share.open()
     } else if (this.options.onLoadPanel === 'databrowser') {
@@ -341,7 +341,7 @@ U.Map = L.Map.extend({
 
   // Merge the given schema with the default one
   // Missing keys inside the schema are merged with the default ones.
-  overrideSchema: function (schema) {
+  overrideSchema: (schema) => {
     for (const [key, extra] of Object.entries(schema)) {
       U.SCHEMA[key] = L.extend({}, U.SCHEMA[key], extra)
     }
@@ -419,9 +419,7 @@ U.Map = L.Map.extend({
   },
 
   renderControls: function () {
-    const hasSlideshow = Boolean(
-      this.options.slideshow && this.options.slideshow.active
-    )
+    const hasSlideshow = Boolean(this.options.slideshow?.active)
     const barEnabled = this.options.captionBar || hasSlideshow
     document.body.classList.toggle('umap-caption-bar-enabled', barEnabled)
     document.body.classList.toggle('umap-slideshow-enabled', hasSlideshow)
@@ -449,7 +447,9 @@ U.Map = L.Map.extend({
         }
       })
     }
-    let name, status, control
+    let name
+    let status
+    let control
     for (let i = 0; i < this.HIDDABLE_CONTROLS.length; i++) {
       name = this.HIDDABLE_CONTROLS[i]
       status = this.getOption(`${name}Control`)
@@ -470,7 +470,8 @@ U.Map = L.Map.extend({
   initDataLayers: async function (datalayers) {
     datalayers = datalayers || this.options.datalayers
     for (const options of datalayers) {
-      this.createDataLayer(options)
+      // `false` to not propagate syncing elements served from uMap
+      this.createDataLayer(options, false)
     }
     await this.loadDataLayers()
   },
@@ -544,18 +545,16 @@ U.Map = L.Map.extend({
   initShortcuts: function () {
     const globalShortcuts = function (e) {
       if (e.key === 'Escape') {
-        if (this.dialog.visible) {
-          this.dialog.close()
-        } else if (this.importer.dialog.visible) {
+        if (this.importer.dialog.visible) {
           this.importer.dialog.close()
         } else if (this.editEnabled && this.editTools.drawing()) {
           this.editTools.stopDrawing()
         } else if (this.measureTools.enabled()) {
           this.measureTools.stopDrawing()
-        } else if (this.editPanel?.isOpen()) {
-          this.editPanel?.close()
         } else if (this.fullPanel?.isOpen()) {
           this.fullPanel?.close()
+        } else if (this.editPanel?.isOpen()) {
+          this.editPanel?.close()
         } else if (this.panel.isOpen()) {
           this.panel.close()
         }
@@ -624,7 +623,7 @@ U.Map = L.Map.extend({
   initTileLayers: function () {
     this.tilelayers = []
     for (const props of this.options.tilelayers) {
-      let layer = this.createTileLayer(props)
+      const layer = this.createTileLayer(props)
       this.tilelayers.push(layer)
       if (
         this.options.tilelayer &&
@@ -634,11 +633,7 @@ U.Map = L.Map.extend({
         this.options.tilelayer.attribution = props.attribution
       }
     }
-    if (
-      this.options.tilelayer &&
-      this.options.tilelayer.url_template &&
-      this.options.tilelayer.attribution
-    ) {
+    if (this.options.tilelayer?.url_template && this.options.tilelayer.attribution) {
       this.customTilelayer = this.createTileLayer(this.options.tilelayer)
       this.selectTileLayer(this.customTilelayer)
     } else {
@@ -647,9 +642,7 @@ U.Map = L.Map.extend({
     if (this._controls) this._controls.tilelayers.setLayers()
   },
 
-  createTileLayer: function (tilelayer) {
-    return new L.TileLayer(tilelayer.url_template, tilelayer)
-  },
+  createTileLayer: (tilelayer) => new L.TileLayer(tilelayer.url_template, tilelayer),
 
   selectTileLayer: function (tilelayer) {
     if (tilelayer === this.selected_tilelayer) {
@@ -663,13 +656,13 @@ U.Map = L.Map.extend({
       }
       this.selected_tilelayer = tilelayer
       if (
-        !isNaN(this.selected_tilelayer.options.minZoom) &&
+        !Number.isNaN(this.selected_tilelayer.options.minZoom) &&
         this.getZoom() < this.selected_tilelayer.options.minZoom
       ) {
         this.setZoom(this.selected_tilelayer.options.minZoom)
       }
       if (
-        !isNaN(this.selected_tilelayer.options.maxZoom) &&
+        !Number.isNaN(this.selected_tilelayer.options.maxZoom) &&
         this.getZoom() > this.selected_tilelayer.options.maxZoom
       ) {
         this.setZoom(this.selected_tilelayer.options.maxZoom)
@@ -756,7 +749,7 @@ U.Map = L.Map.extend({
     }
   },
 
-  latLng: function (a, b, c) {
+  latLng: (a, b, c) => {
     // manage geojson case and call original method
     if (!(a instanceof L.LatLng) && a.coordinates) {
       // Guess it's a geojson
@@ -766,11 +759,16 @@ U.Map = L.Map.extend({
   },
 
   handleLimitBounds: function () {
-    const south = parseFloat(this.options.limitBounds.south),
-      west = parseFloat(this.options.limitBounds.west),
-      north = parseFloat(this.options.limitBounds.north),
-      east = parseFloat(this.options.limitBounds.east)
-    if (!isNaN(south) && !isNaN(west) && !isNaN(north) && !isNaN(east)) {
+    const south = Number.parseFloat(this.options.limitBounds.south)
+    const west = Number.parseFloat(this.options.limitBounds.west)
+    const north = Number.parseFloat(this.options.limitBounds.north)
+    const east = Number.parseFloat(this.options.limitBounds.east)
+    if (
+      !Number.isNaN(south) &&
+      !Number.isNaN(west) &&
+      !Number.isNaN(north) &&
+      !Number.isNaN(east)
+    ) {
       const bounds = L.latLngBounds([
         [south, west],
         [north, east],
@@ -800,7 +798,7 @@ U.Map = L.Map.extend({
     return L.Map.prototype.setMaxBounds.call(this, bounds)
   },
 
-  createDataLayer: function (options = {}, sync) {
+  createDataLayer: function (options = {}, sync = true) {
     options.name = options.name || `${L._('Layer')} ${this.datalayers_index.length + 1}`
     const datalayer = new U.DataLayer(this, options, sync)
 
@@ -815,9 +813,7 @@ U.Map = L.Map.extend({
     datalayer.edit()
   },
 
-  getDefaultOption: function (option) {
-    return U.SCHEMA[option] && U.SCHEMA[option].default
-  },
+  getDefaultOption: (option) => U.SCHEMA[option]?.default,
 
   getOption: function (option, feature) {
     if (feature) {
@@ -841,11 +837,10 @@ U.Map = L.Map.extend({
   },
 
   updateTileLayers: function () {
-    const self = this,
-      callback = (tilelayer) => {
-        self.options.tilelayer = tilelayer.toJSON()
-        self.isDirty = true
-      }
+    const callback = (tilelayer) => {
+      this.options.tilelayer = tilelayer.toJSON()
+      this.isDirty = true
+    }
     if (this._controls.tilelayersChooser)
       this._controls.tilelayersChooser.openSwitcher({
         callback: callback,
@@ -893,7 +888,7 @@ U.Map = L.Map.extend({
 
   importFromUrl: async function (uri) {
     const response = await this.request.get(uri)
-    if (response && response.ok) {
+    if (response?.ok) {
       this.importRaw(await response.text())
     }
   },
@@ -911,14 +906,13 @@ U.Map = L.Map.extend({
     }
 
     if (importedData.geometry) this.options.center = this.latLng(importedData.geometry)
-    const self = this
     importedData.layers.forEach((geojson) => {
       if (!geojson._umap_options && geojson._storage) {
         geojson._umap_options = geojson._storage
         delete geojson._storage
       }
       delete geojson._umap_options?.id // Never trust an id at this stage
-      const dataLayer = self.createDataLayer(geojson._umap_options)
+      const dataLayer = this.createDataLayer(geojson._umap_options)
       dataLayer.fromUmapGeoJSON(geojson)
     })
 
@@ -936,11 +930,10 @@ U.Map = L.Map.extend({
   importFromFile: function (file) {
     const reader = new FileReader()
     reader.readAsText(file)
-    const self = this
     reader.onload = (e) => {
       const rawData = e.target.result
       try {
-        self.importRaw(rawData)
+        this.importRaw(rawData)
       } catch (e) {
         console.error('Error importing data', e)
         U.Alert.error(L._('Invalid umap data in {filename}', { filename: file.name }))
@@ -1146,7 +1139,8 @@ U.Map = L.Map.extend({
   // (edit and viewing)
   // cf https://github.com/umap-project/umap/issues/585
   defaultEditDataLayer: function () {
-    let datalayer, fallback
+    let datalayer
+    let fallback
     datalayer = this.lastUsedDataLayer
     if (
       datalayer &&
@@ -1172,7 +1166,7 @@ U.Map = L.Map.extend({
   },
 
   getDataLayerByUmapId: function (umap_id) {
-    return this.findDataLayer((d) => d.umap_id == umap_id)
+    return this.findDataLayer((d) => d.umap_id === umap_id)
   },
 
   _editControls: function (container) {
@@ -1354,7 +1348,7 @@ U.Map = L.Map.extend({
           handler: 'BlurInput',
           helpText: `${L._('Supported scheme')}: http://{s}.domain.com/{z}/{x}/{y}.png`,
           placeholder: 'url',
-          helpText: L._('Background overlay url'),
+          label: L._('Background overlay url'),
           type: 'url',
         },
       ],
@@ -1475,12 +1469,8 @@ U.Map = L.Map.extend({
         { handler: 'Switch', label: L._('Autostart when map is loaded') },
       ],
     ]
-    const slideshowHandler = function () {
-      this.slideshow.setOptions(this.options.slideshow)
-    }
     const slideshowBuilder = new U.FormBuilder(this, slideshowFields, {
-      callback: slideshowHandler,
-      callbackContext: this,
+      callback: () => this.slideshow.setOptions(this.options.slideshow),
     })
     slideshow.appendChild(slideshowBuilder.build())
   },
@@ -1505,8 +1495,15 @@ U.Map = L.Map.extend({
       L.DomUtil.createButton(
         'button umap-empty',
         advancedButtons,
-        L._('Empty'),
-        this.empty,
+        L._('Clear data'),
+        this.emptyDataLayers,
+        this
+      )
+      L.DomUtil.createButton(
+        'button umap-empty',
+        advancedButtons,
+        L._('Remove layers'),
+        this.removeDataLayers,
         this
       )
     }
@@ -1517,13 +1514,6 @@ U.Map = L.Map.extend({
       this.clone,
       this
     )
-    L.DomUtil.createButton(
-      'button umap-empty',
-      advancedButtons,
-      L._('Delete all layers'),
-      this.empty,
-      this
-    )
     L.DomUtil.createButton(
       'button umap-download',
       advancedButtons,
@@ -1611,11 +1601,11 @@ U.Map = L.Map.extend({
 
   initCaptionBar: function () {
     const container = L.DomUtil.create(
-        'div',
-        'umap-caption-bar',
-        this._controlContainer
-      ),
-      name = L.DomUtil.create('h3', '', container)
+      'div',
+      'umap-caption-bar',
+      this._controlContainer
+    )
+    const name = L.DomUtil.create('h3', '', container)
     L.DomEvent.disableClickPropagation(container)
     this.permissions.addOwnerLink('span', container)
     if (this.getOption('captionMenus')) {
@@ -1652,9 +1642,12 @@ U.Map = L.Map.extend({
   },
 
   askForReset: function (e) {
-    if (!confirm(L._('Are you sure you want to cancel your changes?'))) return
-    this.reset()
-    this.disableEdit()
+    this.dialog
+      .confirm(L._('Are you sure you want to cancel your changes?'))
+      .then(() => {
+        this.reset()
+        this.disableEdit()
+      })
   },
 
   startMarker: function () {
@@ -1687,12 +1680,18 @@ U.Map = L.Map.extend({
     }
   },
 
-  empty: function () {
+  removeDataLayers: function () {
     this.eachDataLayerReverse((datalayer) => {
       datalayer._delete()
     })
   },
 
+  emptyDataLayers: function () {
+    this.eachDataLayerReverse((datalayer) => {
+      datalayer.empty()
+    })
+  },
+
   initLoader: function () {
     this.loader = new L.Control.Loading()
     this.loader.onAdd(this)
@@ -1721,7 +1720,7 @@ U.Map = L.Map.extend({
         },
       })
     }
-    if (e && e.relatedTarget) {
+    if (e?.relatedTarget) {
       if (e.relatedTarget.getContextMenuItems) {
         items = items.concat(e.relatedTarget.getContextMenuItems(e))
       }
@@ -1892,4 +1891,15 @@ U.Map = L.Map.extend({
       })
     await this.server.post(sendLink, {}, formData)
   },
+
+  allProperties: function () {
+    return [].concat(...this.datalayers_index.map((dl) => dl._propertiesIndex))
+  },
+
+  sortedValues: function (property) {
+    return []
+      .concat(...this.datalayers_index.map((dl) => dl.sortedValues(property)))
+      .filter((val, idx, arr) => arr.indexOf(val) === idx)
+      .sort(U.Utils.naturalSort)
+  },
 })