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

umap/static/umap/js/umap.js

@@ -1,5 +1,5 @@
 L.Map.mergeOptions({
-  overlay: null,
+  overlay: {},
   datalayers: [],
   hash: true,
   maxZoomLimit: 24,
@@ -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,
@@ -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) {
@@ -156,9 +149,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()
@@ -184,14 +175,17 @@ 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 url = new URL(window.location.href)
+      const dataUrls = new URLSearchParams(url.search).getAll('dataUrl')
       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)
+      if (dataUrls.length) {
+        for (let dataUrl of dataUrls) {
+          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()
@@ -205,49 +199,9 @@ U.Map = L.Map.extend({
       this.editTools = new U.Editable(this)
       this.renderEditToolbar()
     }
-    if (!U.Utils.isObject(this.options.overlay)) {
-      this.options.overlay = {}
-    }
-    if (!U.Utils.isObject(this.options.tilelayer)) {
-      this.options.tilelayer = {}
-    }
 
     this.initShortcuts()
-    this.onceDataLoaded(function () {
-      const slug = L.Util.queryString('feature')
-      if (slug && this.features_index[slug]) this.features_index[slug].view()
-      if (this.options.noControl) return
-      this.initCaptionBar()
-      if (L.Util.queryString('share')) {
-        this.share.open()
-      } else if (this.options.onLoadPanel === 'databrowser') {
-        this.panel.setDefaultMode('expanded')
-        this.openBrowser('data')
-      } else if (this.options.onLoadPanel === 'datalayers') {
-        this.panel.setDefaultMode('condensed')
-        this.openBrowser('layers')
-      } else if (this.options.onLoadPanel === 'datafilters') {
-        this.panel.setDefaultMode('expanded')
-        this.openBrowser('filters')
-      } else if (this.options.onLoadPanel === 'caption') {
-        this.panel.setDefaultMode('condensed')
-        this.openCaption()
-      }
-      if (L.Util.queryString('edit')) {
-        if (this.hasEditMode()) this.enableEdit()
-        // Sometimes users share the ?edit link by mistake, let's remove
-        // this search parameter from URL to prevent this
-        const url = new URL(window.location)
-        url.searchParams.delete('edit')
-        history.pushState({}, '', url)
-      }
-      if (L.Util.queryString('download')) {
-        const download_url = this.urls.get('map_download', {
-          map_id: this.options.umap_id,
-        })
-        window.location = download_url
-      }
-    })
+    this.onceDataLoaded(this.setViewFromQueryString)
 
     window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null
     this.backup()
@@ -256,8 +210,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', {
@@ -275,9 +229,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()
@@ -314,7 +268,7 @@ U.Map = L.Map.extend({
     })
   },
 
-  setOptionsFromQueryString: function (options) {
+  setOptionsFromQueryString: (options) => {
     // This is not an editable option
     L.Util.setFromQueryString(options, 'editMode')
     // FIXME retrocompat
@@ -341,9 +295,47 @@ U.Map = L.Map.extend({
     }
   },
 
+  setViewFromQueryString: function () {
+    if (this.options.noControl) return
+    this.initCaptionBar()
+    if (L.Util.queryString('share')) {
+      this.share.open()
+    } else if (this.options.onLoadPanel === 'databrowser') {
+      this.panel.setDefaultMode('expanded')
+      this.openBrowser('data')
+    } else if (this.options.onLoadPanel === 'datalayers') {
+      this.panel.setDefaultMode('condensed')
+      this.openBrowser('layers')
+    } else if (this.options.onLoadPanel === 'datafilters') {
+      this.panel.setDefaultMode('expanded')
+      this.openBrowser('filters')
+    } else if (this.options.onLoadPanel === 'caption') {
+      this.panel.setDefaultMode('condensed')
+      this.openCaption()
+    }
+    // Comes after default panels, so if it opens in a panel it will
+    // take precedence.
+    const slug = L.Util.queryString('feature')
+    if (slug && this.features_index[slug]) this.features_index[slug].view()
+    if (L.Util.queryString('edit')) {
+      if (this.hasEditMode()) this.enableEdit()
+      // Sometimes users share the ?edit link by mistake, let's remove
+      // this search parameter from URL to prevent this
+      const url = new URL(window.location)
+      url.searchParams.delete('edit')
+      history.pushState({}, '', url)
+    }
+    if (L.Util.queryString('download')) {
+      const download_url = this.urls.get('map_download', {
+        map_id: this.options.umap_id,
+      })
+      window.location = download_url
+    }
+  },
+
   // 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)
     }
@@ -421,9 +413,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)
@@ -451,7 +441,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`)
@@ -472,7 +464,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()
   },
@@ -626,7 +619,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 &&
@@ -636,11 +629,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 {
@@ -649,9 +638,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) {
@@ -665,13 +652,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)
@@ -758,7 +745,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
@@ -768,11 +755,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],
@@ -802,7 +794,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)
 
@@ -817,9 +809,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) {
@@ -843,11 +833,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,
@@ -895,7 +884,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())
     }
   },
@@ -913,14 +902,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)
     })
 
@@ -938,11 +926,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 }))
@@ -1148,7 +1135,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 &&
@@ -1174,7 +1162,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) {
@@ -1296,6 +1284,9 @@ U.Map = L.Map.extend({
   },
 
   _editTilelayer: function (container) {
+    if (!U.Utils.isObject(this.options.tilelayer)) {
+      this.options.tilelayer = {}
+    }
     const tilelayerFields = [
       [
         'options.tilelayer.name',
@@ -1343,6 +1334,9 @@ U.Map = L.Map.extend({
   },
 
   _editOverlay: function (container) {
+    if (!U.Utils.isObject(this.options.overlay)) {
+      this.options.overlay = {}
+    }
     const overlayFields = [
       [
         'options.overlay.url_template',
@@ -1350,7 +1344,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',
         },
       ],
@@ -1501,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
       )
     }
@@ -1513,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,
@@ -1535,8 +1529,7 @@ U.Map = L.Map.extend({
     const container = L.DomUtil.create('div', 'umap-edit-container')
     const metadataFields = ['options.name', 'options.description']
 
-    const title = L.DomUtil.create('h3', '', container)
-    title.textContent = L._('Edit map details')
+    L.DomUtil.createTitle(container, L._('Edit map details'), 'icon-caption')
     const builder = new U.FormBuilder(this, metadataFields, {
       className: 'map-metadata',
     })
@@ -1608,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')) {
@@ -1684,12 +1677,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)
@@ -1718,7 +1717,7 @@ U.Map = L.Map.extend({
         },
       })
     }
-    if (e && e.relatedTarget) {
+    if (e?.relatedTarget) {
       if (e.relatedTarget.getContextMenuItems) {
         items = items.concat(e.relatedTarget.getContextMenuItems(e))
       }
@@ -1873,10 +1872,6 @@ U.Map = L.Map.extend({
     if (this._controls.search) this._controls.search.open()
   },
 
-  getFilterKeys: function () {
-    return (this.options.filterKey || this.options.sortKey || 'name').split(',')
-  },
-
   getLayersBounds: function () {
     const bounds = new L.latLngBounds()
     this.eachBrowsableDataLayer((d) => {