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

umap/static/umap/img/source/16-white.svg

@@ -16,7 +16,7 @@
       <path d="M 16.0401,2.3158 H 2.005 v 14.0351 h 14.0351 z" fill="#ffffff" id="path1259" />
     </mask>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="10.391897" inkscape:cx="112.73207" inkscape:cy="34.401804" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1011" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:showpageshadow="2" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1">
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="12.134503" inkscape:cx="19.32506" inkscape:cy="29.296626" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" inkscape:window-height="1011" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:showpageshadow="2" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1">
     <inkscape:grid type="xygrid" id="grid3004" empspacing="4" visible="true" enabled="true" snapvisiblegridlinesonly="true" originx="0" originy="0" spacingy="1" spacingx="1" units="px" />
     <sodipodi:guide orientation="-1,0" position="24,168" id="guide3084" inkscape:locked="false" inkscape:label="" inkscape:color="rgb(0,134,229)" />
     <sodipodi:guide orientation="0,1" position="0,96" id="guide3086" inkscape:locked="false" inkscape:label="" inkscape:color="rgb(0,134,229)" />
@@ -210,5 +210,9 @@
     <path fill-rule="evenodd" clip-rule="evenodd" d="m 87.166638,966.62162 -3.166579,-2.99638 -3.166613,2.99638 -0.833375,-0.78858 3.4333,-3.24873 c 0.312979,-0.29613 0.82041,-0.29613 1.133389,0 l 3.43324,3.24873 z m -6.333275,3.48122 3.166626,2.99639 3.166649,-2.99639 0.833362,0.78859 -3.433322,3.24872 c -0.312968,0.29608 -0.820411,0.29608 -1.133378,0 l -3.4333,-3.24872 z" fill="#efefef" id="path1-675" style="stroke-width:0.999996" />
     <path style="fill:#efefef;fill-opacity:1;stroke-width:0.999996" d="m 63.166637,974.36218 -3.166626,-2.99639 -3.166649,2.99639 -0.833362,-0.78859 3.433322,-3.24872 c 0.312968,-0.29608 0.820411,-0.29608 1.133378,0 l 3.4333,3.24872 z" id="path5" />
     <path style="fill:#efefef;fill-opacity:1;stroke-width:0.999996" d="m 56.000071,963.15076 3.43324,3.24873 c 0.312979,0.29613 0.82041,0.29613 1.133389,0 l 3.4333,-3.24873 -0.833375,-0.78858 -3.166613,2.99638 -3.166579,-2.99638 z" id="path1-675-2" />
+    <path d="m 16.583784,844.26236 c 0.129729,-0.17297 0.259459,-0.38919 0.302702,-0.64865 h 2.681081 c 0.25946,0 0.432433,-0.17297 0.432433,-0.43243 0,-0.25946 -0.172973,-0.43243 -0.432433,-0.43243 h -2.681081 c -0.08649,-0.38919 -0.345946,-0.77838 -0.691891,-1.03784 -0.821622,-0.60541 -1.945946,-0.38919 -2.508109,0.38919 -0.129729,0.17297 -0.216216,0.38919 -0.302702,0.64865 h -8.9513515 c -0.2594595,0 -0.4324325,0.17297 -0.4324325,0.43243 0,0.25946 0.172973,0.43243 0.4324325,0.43243 h 8.9513515 c 0.08649,0.38919 0.345946,0.77838 0.691892,1.03784 0.778378,0.6054 1.945946,0.43243 2.508108,-0.38919 z m -1.989189,-0.3027 c -0.216217,-0.12973 -0.345946,-0.34595 -0.38919,-0.60541 -0.04324,-0.25946 0,-0.47567 0.172973,-0.69189 0.302703,-0.43243 0.908109,-0.51892 1.297298,-0.21622 0.216216,0.12973 0.345946,0.34595 0.389189,0.60541 0,0.0432 0,0.0865 0,0.12973 0,0.21621 -0.04324,0.38919 -0.172973,0.56216 -0.302703,0.43243 -0.908108,0.51892 -1.297297,0.21622 z m -4.410811,5.23243 c 0.129729,-0.17297 0.259459,-0.38919 0.302702,-0.64865 h 9.081081 c 0.25946,0 0.432433,-0.17297 0.432433,-0.43243 0,-0.25946 -0.172973,-0.43243 -0.432433,-0.43243 h -9.081081 c -0.08649,-0.38919 -0.345945,-0.77838 -0.6918914,-1.03784 -0.8216216,-0.60541 -1.9459459,-0.38919 -2.5081081,0.38919 -0.1297297,0.17297 -0.2162162,0.38919 -0.3027027,0.64865 h -2.5513513 c -0.2594595,0 -0.4324325,0.17297 -0.4324325,0.43243 0,0.25946 0.172973,0.43243 0.4324325,0.43243 h 2.5513513 c 0.086486,0.38919 0.3459459,0.77838 0.6918919,1.03784 0.7783784,0.56216 1.9027027,0.38919 2.5081083,-0.38919 z m -1.9891894,-0.34595 c -0.2162162,-0.12973 -0.3459459,-0.34594 -0.3891892,-0.6054 -0.043243,-0.25946 0,-0.47568 0.172973,-0.69189 0.3027027,-0.43244 0.9081081,-0.51892 1.2972973,-0.21622 0.2162162,0.12973 0.3459459,0.34595 0.3891892,0.60541 0,0.0432 0,0.0865 0,0.12973 0,0 0,0 0,0 0,0 0,0 0,0 0,0.21621 -0.043243,0.38918 -0.172973,0.56216 -0.3027027,0.43243 -0.9081081,0.51892 -1.2972973,0.21621 z m 6.7027024,5.23244 c 0.12973,-0.17298 0.25946,-0.38919 0.302703,-0.64865 h 4.367567 c 0.25946,0 0.432433,-0.17298 0.432433,-0.43244 0,-0.25945 -0.172973,-0.43243 -0.432433,-0.43243 h -4.367567 c -0.08649,-0.38919 -0.345946,-0.77838 -0.691892,-1.03784 -0.389189,-0.3027 -0.864865,-0.38918 -1.34054,-0.34594 -0.475676,0.0865 -0.908109,0.34594 -1.167568,0.73513 -0.12973,0.21622 -0.216216,0.38919 -0.302703,0.64865 h -7.2648645 c -0.2594595,0 -0.4324325,0.17298 -0.4324325,0.43243 0,0.25946 0.172973,0.43244 0.4324325,0.43244 h 7.3081085 c 0.08649,0.38919 0.345945,0.77838 0.691891,1.03784 0.778379,0.56216 1.902703,0.38918 2.464865,-0.38919 z m -1.989189,-0.30271 c -0.216216,-0.17297 -0.345946,-0.38919 -0.389189,-0.64865 0,-0.0432 0,-0.0865 0,-0.0865 0,-0.0433 0,-0.0865 0,-0.0865 0,-0.17297 0.08649,-0.3027 0.172973,-0.43243 0.12973,-0.21622 0.345946,-0.34595 0.605405,-0.38919 0.25946,-0.0432 0.475676,0.0432 0.691892,0.17297 0.216216,0.12973 0.345946,0.34595 0.389189,0.60541 0,0.0432 0,0.0865 0,0.12973 0,0 0,0 0,0 0,0 0,0 0,0 0,0.21621 -0.04324,0.38919 -0.172973,0.56216 -0.302702,0.38919 -0.864864,0.47568 -1.297297,0.17297 z" id="path1-3" style="fill:#4d4d4d;fill-opacity:1;stroke-width:1" />
+    <path style="fill:#f2f2f2;stroke:#999999;stroke-width:0.25;paint-order:fill markers stroke" d="m 14.421687,32.436774 c -0.404754,-0.187394 -0.732475,-0.526889 -0.903241,-0.93569 l -0.129092,-0.309036 -4.5520263,-0.0013 c -2.5036146,-6.92e-4 -4.601133,-0.0324 -4.661152,-0.07045 -0.065629,-0.04161 -0.098477,-0.18071 -0.08241,-0.348979 l 0.026716,-0.279792 4.6347227,-0.02129 4.6347226,-0.02129 0.128805,-0.308351 c 0.377978,-0.904848 1.434044,-1.334376 2.303918,-0.937059 0.417306,0.190606 0.835088,0.617095 0.952249,0.972096 l 0.09065,0.274685 h 1.474083 c 1.418969,0 1.477589,0.0066 1.567871,0.175244 0.06808,0.127208 0.06936,0.228859 0.0047,0.370843 -0.08898,0.195282 -0.09153,0.1956 -1.567871,0.1956 h -1.478749 l -0.09216,0.279253 c -0.114748,0.347688 -0.600864,0.857219 -0.961643,1.007963 -0.378064,0.157965 -0.998032,0.139015 -1.390062,-0.04249 z m 1.259483,-0.796476 c 0.579671,-0.406017 0.557382,-1.24308 -0.04298,-1.614124 -0.691117,-0.427134 -1.613162,0.192303 -1.464646,0.983962 0.08466,0.451286 0.465191,0.758779 0.939003,0.758779 0.215497,0 0.46584,-0.05663 0.568623,-0.128617 z" id="path7" transform="translate(0,812.36218)" />
+    <path style="fill:#f2f2f2;stroke:#999999;stroke-width:0.25;paint-order:fill markers stroke" d="m 8.1902877,37.423896 c -0.4872187,-0.174113 -0.7923051,-0.442073 -0.9946703,-0.873627 l -0.1907982,-0.406887 -1.3702708,-0.0034 c -1.4982701,-0.0037 -1.5910875,-0.03214 -1.5406237,-0.47225 l 0.026557,-0.23161 1.4211632,-0.02255 1.4211632,-0.02255 0.1982698,-0.389502 c 0.347892,-0.683434 0.8634941,-1.009111 1.592299,-1.005764 0.7177082,0.0033 1.3415151,0.432422 1.6290831,1.120669 l 0.116359,0.278485 h 4.65745 c 4.520341,0 4.659962,0.0047 4.742759,0.159402 0.1159,0.216562 0.107667,0.300926 -0.04419,0.452784 -0.114657,0.114657 -0.660626,0.129501 -4.763204,0.129501 h -4.633703 l -0.104975,0.290304 c -0.152574,0.421935 -0.6274874,0.844474 -1.1103021,0.987854 -0.4962156,0.147361 -0.6614998,0.148792 -1.0523644,0.0091 z m 0.9689602,-0.845129 c 0.6980003,-0.331223 0.6980003,-1.377155 0,-1.708378 -0.3515556,-0.166824 -0.4925823,-0.168492 -0.8270409,-0.0098 -0.3376099,0.160207 -0.5444962,0.513326 -0.5444962,0.929363 0,0.368008 0.1600657,0.606145 0.5356626,0.796928 0.3157622,0.16039 0.4841923,0.158752 0.8358745,-0.0081 z" id="path8" transform="translate(0,812.36218)" />
+    <path style="fill:#f2f2f2;stroke:#999999;stroke-width:0.25;paint-order:fill markers stroke" d="m 12.773494,42.243521 c -0.4045,-0.187277 -0.732456,-0.526846 -0.902897,-0.934868 l -0.128748,-0.308213 -3.8106837,-0.02143 -3.8106834,-0.02142 -0.026557,-0.23161 c -0.055311,-0.482381 -0.1677415,-0.468805 3.8892984,-0.469606 l 3.7189457,-7.33e-4 0.21287,-0.431917 c 0.651632,-1.322166 2.472575,-1.284611 3.125651,0.06446 l 0.178591,0.36892 h 2.297219 c 2.258426,0 2.298803,0.003 2.391007,0.175244 0.06808,0.127207 0.06936,0.228859 0.0047,0.370843 l -0.08912,0.1956 h -2.305381 -2.30538 l -0.15493,0.350241 c -0.387132,0.875164 -1.437261,1.286451 -2.283867,0.894485 z m 1.063202,-0.700358 c 0.378023,-0.157949 0.544298,-0.425794 0.541165,-0.871741 -0.004,-0.573585 -0.363385,-0.908772 -0.974299,-0.908772 -0.312041,0 -0.40386,0.04292 -0.649922,0.303826 -0.257768,0.273313 -0.282484,0.339859 -0.246104,0.662621 0.04524,0.401361 0.228194,0.651219 0.595596,0.813394 0.317179,0.140006 0.399909,0.140082 0.733564,6.68e-4 z" id="path9" transform="translate(0,812.36218)" />
   </g>
 </svg>

umap/static/umap/js/components/alerts/alert.css

@@ -1,4 +1,4 @@
-[role="dialog"] {
+.umap-alert[role="dialog"] {
     box-sizing: border-box;
     min-height: 46px;
     line-height: 46px;
@@ -9,7 +9,6 @@
     font-weight: bold;
     color: #fff;
     font-size: 0.8em;
-    z-index: 1012;
     border-radius: 2px;
     margin-top: calc(var(--header-height) + var(--panel-gutter));
     display: flex;
@@ -19,37 +18,38 @@
     transform: translate(-50%, 0);
     max-width: calc(100% - var(--panel-gutter) * 2);
     width: max-content;
+    z-index: var(--zindex-alert);
 }
-[role="dialog"] > div {
+.umap-alert[role="dialog"] > div {
     margin: 0 auto;
     min-width: 60%;
     background-size: 20px;
     background-position: 0 15px;
     padding-left: 28px;
 }
-[role="dialog"][data-level="info"] > div {
+.umap-alert[role="dialog"][data-level="info"] > div {
     background-image: url('../../../img/alert-icon-info.svg');
     background-repeat: no-repeat;
 }
-[role="dialog"][data-level="success"] > div {
+.umap-alert[role="dialog"][data-level="success"] > div {
     background-image: url('../../../img/alert-icon-success.svg');
     background-repeat: no-repeat;
 }
-[role="dialog"][data-level="error"] > div {
+.umap-alert[role="dialog"][data-level="error"] > div {
     background-image: url('../../../img/alert-icon-error.svg');
     background-repeat: no-repeat;
 }
-[role="dialog"][data-level="error"] {
+.umap-alert[role="dialog"][data-level="error"] {
     background-color: var(--color-darkRed);
 }
-[role="dialog"] a {
+.umap-alert[role="dialog"] a {
     text-decoration: underline;
 }
-[role="dialog"] label {
+.umap-alert[role="dialog"] label {
     font-size: .8rem;
     font-weight: normal;
 }
-[role="dialog"] a[target="_blank"] {
+.umap-alert[role="dialog"] a[target="_blank"] {
     background: url('../../../img/icon-external-link.svg') no-repeat right center;
     padding-right: 14px;
     background-size: 12px;
@@ -127,7 +127,7 @@ h3[role="alert"] + p {
 #link-wrapper {
     margin-bottom: 1rem;
 }
-[role="dialog"] #conflict-wrapper a[target="_blank"] {
+.umap-alert[role="dialog"] #conflict-wrapper a[target="_blank"] {
     background-position-y: 16px;
 }
 

umap/static/umap/js/components/alerts/alert.js

@@ -140,7 +140,7 @@ class uMapAlertConflict extends uMapAlert {
     // biome-ignore lint/style/useNumberNamespace: Number.Infinity returns undefined by default
     const {
       level = 'info',
-      duration = Infinity,
+      duration = Number.POSITIVE_INFINITY,
       message = '',
       forceCallback = undefined,
     } = event.detail

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

@@ -1,11 +1,12 @@
 import {
-  DomUtil,
   DomEvent,
-  setOptions,
+  DomUtil,
   Util,
+  setOptions,
 } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from './i18n.js'
 import { Request, ServerRequest } from './request.js'
+import { escapeHTML, generateId } from './utils.js'
 
 export class BaseAutocomplete {
   constructor(el, options) {
@@ -16,6 +17,7 @@ export class BaseAutocomplete {
       allowFree: true,
       minChar: 2,
       maxResults: 5,
+      throttling: 300,
     }
     this.cache = ''
     this.results = []
@@ -45,6 +47,7 @@ export class BaseAutocomplete {
       placeholder: this.options.placeholder,
       autocomplete: 'off',
       className: this.options.className,
+      name: this.options.name || 'autocomplete',
     })
     DomEvent.on(this.input, 'keydown', this.onKeyDown, this)
     DomEvent.on(this.input, 'keyup', this.onKeyUp, this)
@@ -125,7 +128,10 @@ export class BaseAutocomplete {
       'Control',
     ]
     if (!special.includes(e.key)) {
-      this.search()
+      if (this._typing) window.clearTimeout(this._typing)
+      this._typing = window.setTimeout(() => {
+        this.search()
+      }, this.options.throttling)
     }
   }
 
@@ -250,7 +256,7 @@ export class BaseAjax extends BaseAutocomplete {
       return
     }
     if (val === this.cache) return
-    else this.cache = val
+    this.cache = val
     val = val.toLowerCase()
     const url = Util.template(this.url, { q: encodeURIComponent(val) })
     this.handleResults(await this._search(url))
@@ -258,7 +264,7 @@ export class BaseAjax extends BaseAutocomplete {
 
   async _search(url) {
     const response = await this.request.get(url)
-    if (response && response.ok) {
+    if (response?.ok) {
       return await response.json()
     }
   }
@@ -345,3 +351,19 @@ export const MultipleMixin = (Base) =>
 export class AjaxAutocompleteMultiple extends MultipleMixin(BaseServerAjax) {}
 
 export class AjaxAutocomplete extends SingleMixin(BaseServerAjax) {}
+
+export class AutocompleteDatalist {
+  constructor(input) {
+    this.input = input
+    this.datalist = document.createElement('datalist')
+    this.datalist.id = generateId()
+    this.input.setAttribute('list', this.datalist.id)
+    this.input.parentElement.appendChild(this.datalist)
+  }
+
+  set suggestions(values) {
+    this.datalist.innerHTML = values
+      .map((value) => `<option>${escapeHTML(value)}</option>`)
+      .join('')
+  }
+}

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

@@ -1,4 +1,4 @@
-import { DomUtil, DomEvent, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
+import { DomEvent, DomUtil, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from './i18n.js'
 
 export default class Browser {
@@ -37,7 +37,7 @@ export default class Browser {
       ? U.Icon.prototype.formatUrl(feature._getIconUrl(), feature)
       : null
     title.textContent = feature.getDisplayName() || '—'
-    const bgcolor = feature.getDynamicOption('color')
+    const bgcolor = feature.getPreviewColor()
     colorBox.style.backgroundColor = bgcolor
     if (symbol && symbol !== U.SCHEMA.iconUrl.default) {
       const icon = U.Icon.makeIconElement(symbol, colorBox)
@@ -63,8 +63,8 @@ export default class Browser {
   addDataLayer(datalayer, parent) {
     let className = `datalayer ${datalayer.getHidableClass()}`
     if (this.mode !== 'layers') className += ' show-list'
-    const container = DomUtil.create('div', className, parent),
-      headline = DomUtil.create('h5', '', container)
+    const container = DomUtil.create('div', className, parent)
+    const headline = DomUtil.create('h5', '', container)
     container.id = this.datalayerId(datalayer)
     const ul = DomUtil.create('ul', '', container)
     this.updateDatalayer(datalayer)
@@ -90,9 +90,9 @@ export default class Browser {
     container.innerHTML = ''
     datalayer.eachFeature((feature) => this.addFeature(feature, container))
 
-    let total = datalayer.count(),
-      current = container.querySelectorAll('li').length,
-      count = total == current ? total : `${current}/${total}`
+    const total = datalayer.count()
+    const current = container.querySelectorAll('li').length
+    const count = total === current ? total : `${current}/${total}`
     const counter = DomUtil.create('span', 'datalayer-counter', headline)
     counter.textContent = `(${count})`
     counter.title = translate(`Features in this layer: ${count}`)
@@ -107,6 +107,7 @@ export default class Browser {
     this.map.eachBrowsableDataLayer((datalayer) => {
       datalayer.resetLayer(true)
       this.updateDatalayer(datalayer)
+      if (this.map.fullPanel?.isOpen()) datalayer.tableEdit()
     })
     this.toggleBadge()
   }
@@ -149,7 +150,7 @@ export default class Browser {
     DomEvent.disableClickPropagation(container)
 
     DomUtil.createTitle(container, translate('Data browser'), 'icon-layers')
-    const formContainer = DomUtil.createFieldset(container, L._('Filters'), {
+    this.formContainer = DomUtil.createFieldset(container, L._('Filters'), {
       on: this.mode === 'filters',
       className: 'filters',
       icon: 'icon-filters',
@@ -169,7 +170,7 @@ export default class Browser {
       callback: () => this.onFormChange(),
     })
     let filtersBuilder
-    formContainer.appendChild(builder.build())
+    this.formContainer.appendChild(builder.build())
     DomEvent.on(builder.form, 'reset', () => {
       window.setTimeout(builder.syncAll.bind(builder))
     })
@@ -181,12 +182,11 @@ export default class Browser {
       DomEvent.on(filtersBuilder.form, 'reset', () => {
         window.setTimeout(filtersBuilder.syncAll.bind(filtersBuilder))
       })
-      formContainer.appendChild(filtersBuilder.build())
+      this.formContainer.appendChild(filtersBuilder.build())
     }
-    const reset = DomUtil.createButton('flat', formContainer, '', () => {
-      builder.form.reset()
-      if (filtersBuilder) filtersBuilder.form.reset()
-    })
+    const reset = DomUtil.createButton('flat', this.formContainer, '', () =>
+      this.resetFilters()
+    )
     DomUtil.createIcon(reset, 'icon-restore')
     DomUtil.element({
       tagName: 'span',
@@ -202,6 +202,12 @@ export default class Browser {
     this.update()
   }
 
+  resetFilters() {
+    for (const form of this.formContainer?.querySelectorAll('form') || []) {
+      form.reset()
+    }
+  }
+
   static backButton(map) {
     const button = DomUtil.createButtonIcon(
       DomUtil.create('li', '', undefined),

umap/static/umap/js/modules/caption.js

@@ -18,7 +18,7 @@ export default class Caption {
 
   open() {
     const container = DomUtil.create('div', 'umap-caption')
-    const hgroup = DomUtil.element({tagName: 'hgroup', parent: container})
+    const hgroup = DomUtil.element({ tagName: 'hgroup', parent: container })
     DomUtil.createTitle(hgroup, this.map.options.name, 'icon-caption icon-block')
     this.map.permissions.addOwnerLink('h4', hgroup)
     if (this.map.options.description) {
@@ -40,9 +40,9 @@ export default class Caption {
 
   addDataLayer(datalayer, container) {
     if (!datalayer.options.inCaption) return
-    const p = DomUtil.create('p', 'datalayer-legend', container),
-      legend = DomUtil.create('span', '', p),
-      headline = DomUtil.create('strong', '', p)
+    const p = DomUtil.create('p', 'datalayer-legend', container)
+    const legend = DomUtil.create('span', '', p)
+    const headline = DomUtil.create('strong', '', p)
     datalayer.onceLoaded(() => {
       datalayer.renderLegend(legend)
       if (datalayer.options.description) {

umap/static/umap/js/modules/dompurify.js

@@ -1,12 +1,11 @@
-import { default as DOMPurifyInitializer } from '../../vendors/dompurify/purify.es.js'
 import { JSDOM } from 'jsdom'
+import { default as DOMPurifyInitializer } from '../../vendors/dompurify/purify.es.js'
 
 console.log(DOMPurifyInitializer)
 
 export default function getPurify() {
   if (typeof window === 'undefined') {
     return DOMPurifyInitializer(new JSDOM('').window)
-  } else {
-    return DOMPurifyInitializer(window)
   }
+  return DOMPurifyInitializer(window)
 }

umap/static/umap/js/modules/facets.js

@@ -1,4 +1,4 @@
-import { DomUtil, DomEvent, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
+import { DomEvent, DomUtil, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from './i18n.js'
 import * as Utils from './utils.js'
 
@@ -12,8 +12,8 @@ export default class Facets {
     const properties = {}
     let selected
 
-    names.forEach((name) => {
-      const type = defined[name]['type']
+    for (const name of names) {
+      const type = defined.get(name).type
       properties[name] = { type: type }
       selected = this.selected[name] || {}
       selected.type = type
@@ -22,23 +22,29 @@ export default class Facets {
         selected.choices = selected.choices || []
       }
       this.selected[name] = selected
-    })
+    }
 
     this.map.eachBrowsableDataLayer((datalayer) => {
       datalayer.eachFeature((feature) => {
-        names.forEach((name) => {
+        for (const name of names) {
           let value = feature.properties[name]
-          const type = defined[name]['type']
+          const type = defined.get(name).type
           const parser = this.getParser(type)
           value = parser(value)
           switch (type) {
             case 'date':
             case 'datetime':
             case 'number':
-              if (!isNaN(value)) {
+              if (!Number.isNaN(value)) {
+                // 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: see above.
                 if (isNaN(properties[name].min) || properties[name].min > value) {
                   properties[name].min = value
                 }
+                // biome-ignore lint/suspicious/noGlobalIsNan: see above.
                 if (isNaN(properties[name].max) || properties[name].max < value) {
                   properties[name].max = value
                 }
@@ -50,15 +56,15 @@ export default class Facets {
                 properties[name].choices.push(value)
               }
           }
-        })
+        }
       })
     })
     return properties
   }
 
   isActive() {
-    for (let { type, min, max, choices } of Object.values(this.selected)) {
-      if (min !== undefined || max != undefined || choices?.length) {
+    for (const { type, min, max, choices } of Object.values(this.selected)) {
+      if (min !== undefined || max !== undefined || choices?.length) {
         return true
       }
     }
@@ -67,13 +73,13 @@ export default class Facets {
 
   build() {
     const defined = this.getDefined()
-    const names = Object.keys(defined)
+    const names = [...defined.keys()]
     const facetProperties = this.compute(names, defined)
 
     const fields = names.map((name) => {
-      let criteria = facetProperties[name]
+      const criteria = facetProperties[name]
       let handler = 'FacetSearchChoices'
-      switch (criteria['type']) {
+      switch (criteria.type) {
         case 'number':
           handler = 'FacetSearchNumber'
           break
@@ -84,7 +90,7 @@ export default class Facets {
           handler = 'FacetSearchDateTime'
           break
       }
-      let label = defined[name]['label']
+      const label = defined.get(name).label
       return [
         `selected.${name}`,
         {
@@ -101,18 +107,20 @@ export default class Facets {
   getDefined() {
     const defaultType = 'checkbox'
     const allowedTypes = [defaultType, 'radio', 'number', 'date', 'datetime']
+    const defined = new Map()
+    if (!this.map.options.facetKey) return defined
     return (this.map.options.facetKey || '').split(',').reduce((acc, curr) => {
       let [name, label, type] = curr.split('|')
       type = allowedTypes.includes(type) ? type : defaultType
-      acc[name] = { label: label || name, type: type }
+      acc.set(name, { label: label || name, type: type })
       return acc
-    }, {})
+    }, defined)
   }
 
   getParser(type) {
     switch (type) {
       case 'number':
-        return parseFloat
+        return Number.parseFloat
       case 'datetime':
         return (v) => new Date(v)
       case 'date':
@@ -121,4 +129,32 @@ export default class Facets {
         return (v) => String(v || '')
     }
   }
+
+  dumps(parsed) {
+    const dumped = []
+    for (const [property, { label, type }] of parsed) {
+      dumped.push([property, label, type].filter(Boolean).join('|'))
+    }
+    return dumped.join(',')
+  }
+
+  has(property) {
+    return this.getDefined().has(property)
+  }
+
+  add(property, label, type) {
+    const defined = this.getDefined()
+    if (!defined.has(property)) {
+      defined.set(property, { label, type })
+      this.map.options.facetKey = this.dumps(defined)
+      this.map.isDirty = true
+    }
+  }
+
+  remove(property) {
+    const defined = this.getDefined()
+    defined.delete(property)
+    this.map.options.facetKey = this.dumps(defined)
+    this.map.isDirty = true
+  }
 }

umap/static/umap/js/modules/formatter.js

@@ -0,0 +1,153 @@
+/* Uses globals for: csv2geojson, osmtogeojson, GeoRSSToGeoJSON (not available as ESM) */
+import { translate } from './i18n.js'
+
+export const EXPORT_FORMATS = {
+  geojson: {
+    formatter: async (map) => JSON.stringify(map.toGeoJSON(), null, 2),
+    ext: '.geojson',
+    filetype: 'application/json',
+  },
+  gpx: {
+    formatter: async (map) => await map.formatter.toGPX(map.toGeoJSON()),
+    ext: '.gpx',
+    filetype: 'application/gpx+xml',
+  },
+  kml: {
+    formatter: async (map) => await map.formatter.toKML(map.toGeoJSON()),
+    ext: '.kml',
+    filetype: 'application/vnd.google-earth.kml+xml',
+  },
+  csv: {
+    formatter: async (map) => {
+      const table = []
+      map.eachFeature((feature) => {
+        const row = feature.toGeoJSON().properties
+        const center = feature.getCenter()
+        delete row._umap_options
+        row.Latitude = center.lat
+        row.Longitude = center.lng
+        table.push(row)
+      })
+      return csv2geojson.dsv.csvFormat(table)
+    },
+    ext: '.csv',
+    filetype: 'text/csv',
+  },
+}
+
+export class Formatter {
+  async fromGPX(str) {
+    const togeojson = await import('../../vendors/togeojson/togeojson.es.js')
+    return togeojson.gpx(this.toDom(str))
+  }
+
+  async fromKML(str) {
+    const togeojson = await import('../../vendors/togeojson/togeojson.es.js')
+    return togeojson.kml(this.toDom(str), {
+      skipNullGeometry: true,
+    })
+  }
+
+  async fromGeoJSON(str) {
+    try {
+      return JSON.parse(str)
+    } catch (err) {
+      U.Alert.error(`Invalid JSON file: ${err}`)
+    }
+  }
+
+  async fromOSM(str) {
+    let src
+    try {
+      src = JSON.parse(str)
+    } catch (e) {
+      src = this.toDom(str)
+    }
+    return osmtogeojson(src, { flatProperties: true })
+  }
+
+  fromCSV(str, callback) {
+    csv2geojson.csv2geojson(
+      str,
+      {
+        delimiter: 'auto',
+        includeLatLon: false,
+      },
+      (err, result) => {
+        // csv2geojson fallback to null geometries when it cannot determine
+        // lat or lon columns. This is valid geojson, but unwanted from a user
+        // point of view.
+        if (result?.features.length) {
+          if (result.features[0].geometry === null) {
+            err = {
+              type: 'Error',
+              message: translate('Cannot determine latitude and longitude columns.'),
+            }
+          }
+        }
+        if (err) {
+          let message
+          if (err.type === 'Error') {
+            message = err.message
+          } else {
+            message = translate('{count} errors during import: {message}', {
+              count: err.length,
+              message: err[0].message,
+            })
+          }
+          U.Alert.error(message, 10000)
+          console.error(err)
+        }
+        if (result?.features.length) {
+          callback(result)
+        }
+      }
+    )
+  }
+
+  async fromGeoRSS(str) {
+    return GeoRSSToGeoJSON(this.toDom(c))
+  }
+
+  toDom(x) {
+    const doc = new DOMParser().parseFromString(x, 'text/xml')
+    const errorNode = doc.querySelector('parsererror')
+    if (errorNode) {
+      U.Alert.error(translate('Cannot parse data'))
+    }
+    return doc
+  }
+
+  async parse(str, format) {
+    switch (format) {
+      case 'csv':
+        return new Promise((resolve, reject) => {
+          return this.fromCSV(str, (data) => resolve(data))
+        })
+      case 'gpx':
+        return await this.fromGPX(str)
+      case 'kml':
+        return await this.fromKML(str)
+      case 'osm':
+        return await this.fromOSM(str)
+      case 'georss':
+        return await this.fromGeoRSS(str)
+      case 'geojson':
+        return await this.fromGeoJSON(str)
+    }
+  }
+
+  async toGPX(geojson) {
+    const togpx = await import('../../vendors/geojson-to-gpx/index.js')
+    for (const feature of geojson.features) {
+      feature.properties.desc = feature.properties.description
+    }
+    const gpx = togpx.default(geojson)
+    return new XMLSerializer().serializeToString(gpx)
+  }
+
+  async toKML(geojson) {
+    const tokml = await import('../../vendors/tokml/tokml.es.js')
+    return tokml.toKML(geojson)
+  }
+}