umap-project 2.6.3__py3-none-any.whl → 2.7.0__py3-none-any.whl

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg width="252" height="252" viewBox="0 0 66.674992 66.674992" version="1.1" id="svg2876" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" sodipodi:docname="24-white.svg" inkscape:export-filename="../24-white.svg" inkscape:export-xdpi="7.52" inkscape:export-ydpi="7.52" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview id="namedview2878" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" showgrid="true" showguides="true" inkscape:zoom="2.6753614" inkscape:cx="107.64901" inkscape:cy="85.409023" inkscape:window-width="960" inkscape:window-height="1011" inkscape:window-x="20" inkscape:window-y="20" inkscape:window-maximized="0" inkscape:current-layer="layer1">
+<svg width="252" height="252" viewBox="0 0 66.674992 66.674992" version="1.1" id="svg2876" inkscape:version="1.4 (e7c3feb100, 2024-10-09)" sodipodi:docname="24-white.svg" inkscape:export-filename="../24-white.svg" inkscape:export-xdpi="7.52" inkscape:export-ydpi="7.52" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview id="namedview2878" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" showgrid="true" showguides="true" inkscape:zoom="5.3566812" inkscape:cx="50.030978" inkscape:cy="170.06799" inkscape:window-width="1920" inkscape:window-height="1011" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="layer1">
     <inkscape:grid type="xygrid" id="grid2997" empspacing="6" originx="0" originy="0" spacingy="0.2645833" spacingx="0.2645833" units="px" visible="true" />
     <inkscape:grid id="grid1" units="px" originx="0" originy="0" spacingx="9.5249989" spacingy="9.5249989" empcolor="#3f3fff" empopacity="0.25098039" color="#3f3fff" opacity="0.1254902" empspacing="1" dotted="false" gridanglex="30" gridanglez="30" visible="true" />
   </sodipodi:namedview>
@@ -74,5 +74,6 @@
     <g id="info" transform="matrix(0.33072916,0,0,0.33072916,-11.906249,-256.10415)" style="stroke-width:0.8">
       <path id="path3762" style="fill:#f2f2f2;fill-opacity:1;stroke:#999999;stroke-width:0.2;stroke-dasharray:none;stroke-opacity:1" d="m 107.99999,838.36217 a 8,8 0 0 0 -7.999998,8 8,8 0 0 0 7.999998,8 8,8 0 0 0 8,-8 8,8 0 0 0 -8,-8 z m 0,2.5 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 z m -1,4.5 h 2 v 6 h -2 z" />
     </g>
+    <path d="m 5.6444435,59.43432 v 1.034991 h 1.0541546 z m 1.1759257,1.612262 h -1.1759257 c -0.3247228,0 -0.5879626,-0.258453 -0.5879626,-0.577271 v -1.154545 h -2.3518514 v 5.195451 h 4.1157397 z m -4.1157397,-2.309089 h 3.0615854 l 1.6421175,1.612259 v 4.160465 c 0,0.318822 -0.2632403,0.577275 -0.5879632,0.577275 h -4.1157397 c -0.3247231,0 -0.5879631,-0.258453 -0.5879631,-0.577275 v -5.195451 c 0,-0.31882 0.26324,-0.577273 0.5879631,-0.577273 z m 1.7638882,3.92135 v -1.323625 h 0.5879632 v 1.323625 l 0.3800861,-0.373177 0.415753,0.408196 -1.0898206,1.070004 -1.0898208,-1.070004 0.4157526,-0.408196 z" fill-rule="evenodd" id="downloadfile" style="fill:#f2f2f2;fill-opacity:1;stroke-width:0.06614583;stroke:#999999;stroke-opacity:0.50980395;stroke-dasharray:none" />
   </g>
 </svg>

umap/static/umap/img/source/24.svg

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg width="252" height="252" viewBox="0 0 66.674999 66.674999" version="1.1" id="svg6237" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" sodipodi:docname="24.svg" inkscape:export-filename="../24.svg" inkscape:export-xdpi="7.52" inkscape:export-ydpi="7.52" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview id="namedview6239" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" showgrid="true" showguides="true" inkscape:zoom="3.1596124" inkscape:cx="117.10297" inkscape:cy="106.50041" inkscape:window-width="960" inkscape:window-height="1011" inkscape:window-x="20" inkscape:window-y="20" inkscape:window-maximized="0" inkscape:current-layer="layer1">
+<svg width="252" height="252" viewBox="0 0 66.674999 66.674999" version="1.1" id="svg6237" inkscape:version="1.4 (e7c3feb100, 2024-10-09)" sodipodi:docname="24.svg" inkscape:export-filename="../24.svg" inkscape:export-xdpi="7.52" inkscape:export-ydpi="7.52" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview id="namedview6239" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" showgrid="true" showguides="true" inkscape:zoom="3.1596124" inkscape:cx="118.68544" inkscape:cy="166.47612" inkscape:window-width="1920" inkscape:window-height="1011" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="layer1">
     <inkscape:grid type="xygrid" id="grid6358" empspacing="6" originx="0" originy="0" spacingy="0.26458333" spacingx="0.26458333" units="px" visible="true" />
     <inkscape:grid id="grid1" units="px" originx="0" originy="0" spacingx="9.5249999" spacingy="9.5249999" empcolor="#3f3fff" empopacity="0.25098039" color="#ff0000" opacity="0.83529412" empspacing="0" dotted="false" gridanglex="30" gridanglez="30" visible="true" />
   </sodipodi:namedview>
@@ -98,5 +98,6 @@
     <g id="info" transform="matrix(0.33072916,0,0,0.33072916,-11.90625,-256.10415)" style="fill:#4d4d4d;fill-opacity:1;stroke-width:0.8">
       <path id="path3762" style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.8" d="m 108,838.36217 a 8,8 0 0 0 -8,8 8,8 0 0 0 8,8 8,8 0 0 0 8,-8 8,8 0 0 0 -8,-8 z m 0,2.5 a 1.5,1.5 0 0 1 1.5,1.5 1.5,1.5 0 0 1 -1.5,1.5 1.5,1.5 0 0 1 -1.5,-1.5 1.5,1.5 0 0 1 1.5,-1.5 z m -1,4.5 h 2 v 6 h -2 z" />
     </g>
+    <path d="m 5.6444435,59.43432 v 1.034991 h 1.0541546 z m 1.1759257,1.612262 h -1.1759257 c -0.3247228,0 -0.5879626,-0.258453 -0.5879626,-0.577271 v -1.154545 h -2.3518514 v 5.195451 h 4.1157397 z m -4.1157397,-2.309089 h 3.0615854 l 1.6421175,1.612259 v 4.160465 c 0,0.318822 -0.2632403,0.577275 -0.5879632,0.577275 h -4.1157397 c -0.3247231,0 -0.5879631,-0.258453 -0.5879631,-0.577275 v -5.195451 c 0,-0.31882 0.26324,-0.577273 0.5879631,-0.577273 z m 1.7638882,3.92135 v -1.323625 h 0.5879632 v 1.323625 l 0.3800861,-0.373177 0.415753,0.408196 -1.0898206,1.070004 -1.0898208,-1.070004 0.4157526,-0.408196 z" fill-rule="evenodd" id="downloadfile" style="fill:#464646;fill-opacity:1;stroke-width:0.192424" />
   </g>
 </svg>

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

@@ -249,6 +249,10 @@ export class BaseAjax extends BaseAutocomplete {
     }
   }
 
+  buildUrl(value) {
+    return Util.template(this.url, { q: encodeURIComponent(value) })
+  }
+
   async search() {
     let val = this.input.value
     if (val.length < this.options.minChar) {
@@ -258,7 +262,7 @@ export class BaseAjax extends BaseAutocomplete {
     if (val === this.cache) return
     this.cache = val
     val = val.toLowerCase()
-    const url = Util.template(this.url, { q: encodeURIComponent(val) })
+    const url = this.buildUrl(val)
     this.handleResults(await this._search(url))
   }
 
@@ -309,7 +313,7 @@ export const SingleMixin = (Base) =>
       DomEvent.on(close, 'click', () => {
         this.selectedContainer.innerHTML = ''
         this.input.style.display = 'block'
-        this.options.on_unselect(result)
+        this.options.on_unselect?.(result)
       })
       this.hide()
     }
@@ -338,7 +342,7 @@ export const MultipleMixin = (Base) =>
       })
       DomEvent.on(close, 'click', () => {
         this.selectedContainer.removeChild(result_el)
-        this.options.on_unselect(result)
+        this.options.on_unselect?.(result)
       })
       this.hide()
     }

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

@@ -1,6 +1,9 @@
 import { DomEvent, DomUtil, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from './i18n.js'
 import * as Icon from './rendering/icon.js'
+import * as Utils from './utils.js'
+import { EXPORT_FORMATS } from './formatter.js'
+import ContextMenu from './ui/contextmenu.js'
 
 export default class Browser {
   constructor(map) {
@@ -32,7 +35,11 @@ export default class Browser {
       'show-on-edit icon-delete',
       translate('Delete this feature')
     )
-    const colorBox = DomUtil.create('i', 'icon icon-16 feature-color', row)
+    const colorBox = DomUtil.create(
+      'i',
+      `icon icon-16 icon-${feature.getClassName()} feature-color`,
+      row
+    )
     const title = DomUtil.create('span', 'feature-title', row)
     const symbol = feature._getIconUrl
       ? Icon.formatUrl(feature._getIconUrl(), feature)
@@ -43,6 +50,8 @@ export default class Browser {
     if (symbol && symbol !== U.SCHEMA.iconUrl.default) {
       const icon = Icon.makeElement(symbol, colorBox)
       Icon.setContrast(icon, colorBox, symbol, bgcolor)
+    } else if (DomUtil.contrastedColor(colorBox, bgcolor)) {
+      colorBox.classList.add('icon-white')
     }
     const viewFeature = (e) => {
       feature.zoomTo({ ...e, callback: () => feature.view() })
@@ -92,6 +101,7 @@ export default class Browser {
     datalayer.eachFeature((feature) => this.addFeature(feature, container))
 
     const total = datalayer.count()
+    if (!total) return
     const current = container.querySelectorAll('li').length
     const count = total === current ? total : `${current}/${total}`
     const counter = DomUtil.create('span', 'datalayer-counter', headline)
@@ -158,6 +168,7 @@ export default class Browser {
     })
     this.filtersTitle = container.querySelector('summary')
     this.toggleBadge()
+    this.addMainToolbox(container)
     this.dataContainer = DomUtil.create('div', '', container)
 
     let fields = [
@@ -209,6 +220,48 @@ export default class Browser {
     }
   }
 
+  addMainToolbox(container) {
+    const [toolbox, { toggle, fitBounds, download }] = Utils.loadTemplateWithRefs(`
+      <div class="main-toolbox">
+        <i class="icon icon-16 icon-eye" title="${translate('show/hide all layers')}" data-ref="toggle"></i>
+        <i class="icon icon-16 icon-zoom" title="${translate('zoom to data extent')}" data-ref="fitBounds"></i>
+        <i class="icon icon-16 icon-download" title="${translate('download visible data')}" data-ref="download"></i>
+      </div>
+    `)
+    container.appendChild(toolbox)
+    toggle.addEventListener('click', () => this.toggleLayers())
+    fitBounds.addEventListener('click', () => this.map.fitDataBounds())
+    download.addEventListener('click', () => this.downloadVisible(download))
+  }
+
+  downloadVisible(element) {
+    const menu = new ContextMenu({ fixed: true })
+    const items = []
+    for (const format of Object.keys(EXPORT_FORMATS)) {
+      items.push({
+        label: format,
+        action: () => this.map.share.download(format),
+      })
+    }
+    menu.openBelow(element, items)
+  }
+
+  toggleLayers() {
+    // If at least one layer is shown, hide it
+    // otherwise show all
+    let allHidden = true
+    this.map.eachBrowsableDataLayer((datalayer) => {
+      if (datalayer.isVisible()) allHidden = false
+    })
+    this.map.eachBrowsableDataLayer((datalayer) => {
+      if (allHidden) {
+        datalayer.show()
+      } else {
+        if (datalayer.isVisible()) datalayer.hide()
+      }
+    })
+  }
+
   static backButton(map) {
     const button = DomUtil.createButtonIcon(
       DomUtil.create('li', '', undefined),

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

@@ -19,7 +19,12 @@ export default class Caption {
   open() {
     const container = DomUtil.create('div', 'umap-caption')
     const hgroup = DomUtil.element({ tagName: 'hgroup', parent: container })
-    DomUtil.createTitle(hgroup, this.map.options.name, 'icon-caption icon-block')
+    DomUtil.createTitle(
+      hgroup,
+      this.map.getDisplayName(),
+      'icon-caption icon-block',
+      'map-name'
+    )
     this.map.addAuthorLink('h4', hgroup)
     if (this.map.options.description) {
       const description = DomUtil.element({
@@ -35,15 +40,21 @@ export default class Caption {
     )
     const creditsContainer = DomUtil.create('div', 'credits-container', container)
     this.addCredits(creditsContainer)
-    this.map.panel.open({ content: container })
+    this.map.panel.open({ content: container }).then(() => {
+      // Create the legend when the panel is actually on the DOM
+      this.map.eachDataLayerReverse((datalayer) => datalayer.renderLegend())
+    })
   }
 
   addDataLayer(datalayer, container) {
     if (!datalayer.options.inCaption) return
-    const p = DomUtil.create('p', 'datalayer-legend', container)
-    const legend = DomUtil.create('span', '', p)
+    const p = DomUtil.create(
+      'p',
+      `caption-item ${datalayer.cssId}`,
+      container
+    )
+    const legend = DomUtil.create('span', 'datalayer-legend', p)
     const headline = DomUtil.create('strong', '', p)
-    datalayer.renderLegend(legend)
     if (datalayer.options.description) {
       DomUtil.element({
         tagName: 'span',

umap/static/umap/js/modules/data/features.js

@@ -103,11 +103,11 @@ class Feature {
   }
 
   pushGeometry() {
-    this.ui.setLatLngs(this.toLatLngs())
+    this._setLatLngs(this.toLatLngs())
   }
 
   pullGeometry(sync = true) {
-    this.fromLatLngs(this.ui.getLatLngs())
+    this.fromLatLngs(this._getLatLngs())
     if (sync) {
       this.sync.update('geometry', this.geometry)
     }
@@ -596,6 +596,55 @@ class Feature {
       }
     }
   }
+
+  getContextMenuItems(event) {
+    const permalink = this.getPermalink()
+    let items = []
+    if (permalink) {
+      items.push({
+        label: translate('Permalink'),
+        action: () => {
+          window.open(permalink)
+        },
+      })
+    }
+    items.push({
+      label: translate('Copy as GeoJSON'),
+      action: () => {
+        L.Util.copyToClipboard(JSON.stringify(this.toGeoJSON()))
+        this.map.tooltip.open({ content: L._('✅ Copied!') })
+      },
+    })
+    if (this.map.editEnabled && !this.isReadOnly()) {
+      items = items.concat(this.getContextMenuEditItems(event))
+    }
+    return items
+  }
+
+  getContextMenuEditItems() {
+    let items = ['-']
+    if (this.map.editedFeature !== this) {
+      items.push({
+        label: `${translate('Edit this feature')} (⇧+Click)`,
+        action: () => this.edit(),
+      })
+    }
+    items = items.concat(
+      {
+        label: this.map.help.displayLabel('EDIT_FEATURE_LAYER'),
+        action: () => this.datalayer.edit(),
+      },
+      {
+        label: translate('Delete this feature'),
+        action: () => this.confirmDelete(),
+      },
+      {
+        label: translate('Clone this feature'),
+        action: () => this.clone(),
+      }
+    )
+    return items
+  }
 }
 
 export class Point extends Feature {
@@ -607,6 +656,14 @@ export class Point extends Feature {
     }
   }
 
+  _getLatLngs() {
+    return this.ui.getLatLng()
+  }
+
+  _setLatLngs(latlng) {
+    this.ui.setLatLng(latlng)
+  }
+
   toLatLngs() {
     return GeoJSON.coordsToLatLng(this.coordinates)
   }
@@ -655,6 +712,7 @@ export class Point extends Feature {
           builder.restoreField('ui._latlng.lat')
           builder.restoreField('ui._latlng.lng')
         }
+        this.pullGeometry()
         this.zoomTo({ easing: false })
       },
     })
@@ -677,6 +735,14 @@ class Path extends Feature {
     return !this.isEmpty()
   }
 
+  _getLatLngs() {
+    return this.ui.getLatLngs()
+  }
+
+  _setLatLngs(latlngs) {
+    this.ui.setLatLngs(latlngs)
+  }
+
   connectToDataLayer(datalayer) {
     super.connectToDataLayer(datalayer)
     // We keep markers on their own layer on top of the paths.
@@ -767,6 +833,62 @@ class Path extends Feature {
     }
     if (callback) callback.call(this)
   }
+
+  getContextMenuItems(event) {
+    const items = super.getContextMenuItems(event)
+    items.push({
+      label: translate('Display measure'),
+      action: () => Alert.info(this.ui.getMeasure()),
+    })
+    if (this.map.editEnabled && !this.isReadOnly() && this.isMulti()) {
+      items.push(...this.getContextMenuMultiItems(event))
+    }
+    return items
+  }
+
+  getContextMenuMultiItems(event) {
+    const items = [
+      '-',
+      {
+        label: translate('Remove shape from the multi'),
+        action: () => {
+          this.ui.enableEdit().deleteShapeAt(event.latlng)
+        },
+      },
+    ]
+    const shape = this.ui.shapeAt(event.latlng)
+    if (this.ui._latlngs.indexOf(shape) > 0) {
+      items.push({
+        label: translate('Make main shape'),
+        action: () => {
+          this.ui.enableEdit().deleteShape(shape)
+          this.ui.editor.prependShape(shape)
+        },
+      })
+    }
+    return items
+  }
+
+  getContextMenuEditItems(event) {
+    const items = super.getContextMenuEditItems(event)
+    if (this.map?.editedFeature !== this && this.isSameClass(this.map.editedFeature)) {
+      items.push({
+        label: translate('Transfer shape to edited feature'),
+        action: () => {
+          this.transferShape(event.latlng, this.map.editedFeature)
+        },
+      })
+    }
+    if (this.isMulti()) {
+      items.push({
+        label: translate('Extract shape to separate feature'),
+        action: () => {
+          this.ui.isolateShape(event.latlng)
+        },
+      })
+    }
+    return items
+  }
 }
 
 export class LineString extends Path {
@@ -881,6 +1003,41 @@ export class LineString extends Path {
   isMulti() {
     return !LineUtil.isFlat(this.coordinates) && this.coordinates.length > 1
   }
+
+  getContextMenuEditItems(event) {
+    const items = super.getContextMenuEditItems(event)
+    const vertexClicked = event.vertex
+    if (!this.isMulti()) {
+      items.push({
+        label: translate('Transform to polygon'),
+        action: () => this.toPolygon(),
+      })
+    }
+    if (vertexClicked) {
+      const index = event.vertex.getIndex()
+      if (index !== 0 && index !== event.vertex.getLastIndex()) {
+        items.push({
+          label: translate('Split line'),
+          action: () => event.vertex.split(),
+        })
+      } else if (index === 0 || index === event.vertex.getLastIndex()) {
+        items.push({
+          label: this.map.help.displayLabel('CONTINUE_LINE'),
+          action: () => event.vertex.continue(),
+        })
+      }
+    }
+    return items
+  }
+
+  getContextMenuMultiItems(event) {
+    const items = super.getContextMenuMultiItems(event)
+    items.push({
+      label: translate('Merge lines'),
+      action: () => this.mergeShapes(),
+    })
+    return items
+  }
 }
 
 export class Polygon extends Path {
@@ -991,4 +1148,21 @@ export class Polygon extends Path {
     items.push(U.CreateHoleAction)
     return items
   }
+
+  getContextMenuEditItems(event) {
+    const items = super.getContextMenuEditItems(event)
+    const shape = this.ui.shapeAt(event.latlng)
+    // No multi and no holes.
+    if (shape && !this.isMulti() && (LineUtil.isFlat(shape) || shape.length === 1)) {
+      items.push({
+        label: translate('Transform to lines'),
+        action: () => this.toLineString(),
+      })
+    }
+    items.push({
+      label: translate('Start a hole here'),
+      action: () => this.ui.startHole(event),
+    })
+    return items
+  }
 }

umap/static/umap/js/modules/data/layer.js

@@ -92,12 +92,12 @@ export class DataLayer {
   set isDirty(status) {
     this._isDirty = status
     if (status) {
-      this.map.addDirtyDatalayer(this)
+      this.map.isDirty = true
       // A layer can be made dirty by indirect action (like dragging layers)
       // we need to have it loaded before saving it.
       if (!this.isLoaded()) this.fetchData()
     } else {
-      this.map.removeDirtyDatalayer(this)
+      this.map.checkDirty()
       this.isDeleted = false
     }
   }
@@ -115,6 +115,10 @@ export class DataLayer {
     return this._isDeleted
   }
 
+  get cssId() {
+    return `datalayer-${stamp(this)}`
+  }
+
   getSyncMetadata() {
     return {
       subject: 'datalayer',
@@ -235,6 +239,7 @@ export class DataLayer {
   }
 
   dataChanged() {
+    if (!this.hasDataLoaded()) return
     this.map.onDataLayersChanged()
     this.layer.dataChanged()
   }
@@ -242,10 +247,15 @@ export class DataLayer {
   fromGeoJSON(geojson, sync = true) {
     this.addData(geojson, sync)
     this._geojson = geojson
-    this._dataloaded = true
+    this.onDataLoaded()
     this.dataChanged()
   }
 
+  onDataLoaded() {
+    this._dataloaded = true
+    this.renderLegend()
+  }
+
   async fromUmapGeoJSON(geojson) {
     if (geojson._storage) geojson._umap_options = geojson._storage // Retrocompat
     if (geojson._umap_options) this.setOptions(geojson._umap_options)
@@ -339,11 +349,11 @@ export class DataLayer {
     const id = stamp(this)
     if (!this.map.datalayers[id]) {
       this.map.datalayers[id] = this
-      if (!this.map.datalayers_index.includes(this)) {
-        this.map.datalayers_index.push(this)
-      }
-      this.map.onDataLayersChanged()
     }
+    if (!this.map.datalayers_index.includes(this)) {
+      this.map.datalayers_index.push(this)
+    }
+    this.map.onDataLayersChanged()
   }
 
   _dataUrl() {
@@ -384,7 +394,7 @@ export class DataLayer {
     this.indexProperties(feature)
     this.map.features_index[feature.getSlug()] = feature
     this.showFeature(feature)
-    if (this.hasDataLoaded()) this.dataChanged()
+    this.dataChanged()
   }
 
   removeFeature(feature, sync) {
@@ -395,7 +405,7 @@ export class DataLayer {
     feature.disconnectFromDataLayer(this)
     this._index.splice(this._index.indexOf(id), 1)
     delete this._features[id]
-    if (this.hasDataLoaded() && this.isVisible()) this.dataChanged()
+    if (this.isVisible()) this.dataChanged()
   }
 
   indexProperties(feature) {
@@ -559,7 +569,6 @@ export class DataLayer {
 
   erase() {
     this.hide()
-    delete this.map.datalayers[stamp(this)]
     this.map.datalayers_index.splice(this.getRank(), 1)
     this.parentPane.removeChild(this.pane)
     this.map.onDataLayersChanged()
@@ -716,7 +725,7 @@ export class DataLayer {
     const remoteDataFields = [
       [
         'options.remoteData.url',
-        { handler: 'Url', label: translate('Url'), helpEntries: 'formatURL' },
+        { handler: 'Url', label: translate('Url'), helpEntries: ['formatURL'] },
       ],
       [
         'options.remoteData.format',
@@ -729,7 +738,7 @@ export class DataLayer {
         {
           handler: 'Switch',
           label: translate('Dynamic'),
-          helpEntries: 'dynamicRemoteData',
+          helpEntries: ['dynamicRemoteData'],
         },
       ],
       [
@@ -746,7 +755,7 @@ export class DataLayer {
         {
           handler: 'Switch',
           label: translate('Proxy request'),
-          helpEntries: 'proxyRemoteData',
+          helpEntries: ['proxyRemoteData'],
         },
       ])
       remoteDataFields.push('options.remoteData.ttl')
@@ -803,13 +812,12 @@ export class DataLayer {
       this
     )
     if (this.umap_id) {
-      const download = DomUtil.createLink(
-        'button umap-download',
-        advancedButtons,
-        translate('Download'),
-        this._dataUrl(),
-        '_blank'
-      )
+      const filename = `${Utils.slugify(this.options.name)}.geojson`
+      const download = Utils.loadTemplate(`
+        <a class="button" href="${this._dataUrl()}" download="${filename}">
+          <i class="icon icon-24 icon-download"></i>${translate('Download')}
+        </a>`)
+      advancedButtons.appendChild(download)
     }
     const backButton = DomUtil.createButtonIcon(
       undefined,
@@ -874,18 +882,21 @@ export class DataLayer {
 
   async restore(version) {
     if (!this.map.editEnabled) return
-    if (!confirm(translate('Are you sure you want to restore this version?'))) return
-    const [geojson, response, error] = await this.map.server.get(
-      this.getVersionUrl(version)
-    )
-    if (!error) {
-      if (geojson._storage) geojson._umap_options = geojson._storage // Retrocompat.
-      if (geojson._umap_options) this.setOptions(geojson._umap_options)
-      this.empty()
-      if (this.isRemoteLayer()) this.fetchRemoteData()
-      else this.addData(geojson)
-      this.isDirty = true
-    }
+    this.map.dialog
+      .confirm(translate('Are you sure you want to restore this version?'))
+      .then(async () => {
+        const [geojson, response, error] = await this.map.server.get(
+          this.getVersionUrl(version)
+        )
+        if (!error) {
+          if (geojson._storage) geojson._umap_options = geojson._storage // Retrocompat.
+          if (geojson._umap_options) this.setOptions(geojson._umap_options)
+          this.empty()
+          if (this.isRemoteLayer()) this.fetchRemoteData()
+          else this.addData(geojson)
+          this.isDirty = true
+        }
+      })
   }
 
   featuresToGeoJSON() {
@@ -1026,7 +1037,7 @@ export class DataLayer {
   }
 
   async save() {
-    if (this.isDeleted) return this.saveDelete()
+    if (this.isDeleted) return await this.saveDelete()
     if (!this.isLoaded()) {
       return
     }
@@ -1090,8 +1101,8 @@ export class DataLayer {
     if (this.umap_id) {
       await this.map.server.post(this.getDeleteUrl())
     }
+    delete this.map.datalayers[stamp(this)]
     this.isDirty = false
-    this.map.continueSaving()
   }
 
   getMap() {
@@ -1118,10 +1129,13 @@ export class DataLayer {
     return 'displayName'
   }
 
-  renderLegend(container) {
-    if (this.layer.renderLegend) return this.layer.renderLegend(container)
-    const color = DomUtil.create('span', 'datalayer-color', container)
-    color.style.backgroundColor = this.getColor()
+  renderLegend() {
+    for (const container of document.querySelectorAll(`.${this.cssId} .datalayer-legend`)) {
+      container.innerHTML = ''
+      if (this.layer.renderLegend) return this.layer.renderLegend(container)
+      const color = DomUtil.create('span', 'datalayer-color', container)
+      color.style.backgroundColor = this.getColor()
+    }
   }
 
   renderToolbox(container) {
@@ -1160,8 +1174,11 @@ export class DataLayer {
         'click',
         function () {
           if (!this.isVisible()) return
-          if (!confirm(translate('Are you sure you want to delete this layer?'))) return
-          this._delete()
+          this.map.dialog
+            .confirm(translate('Are you sure you want to delete this layer?'))
+            .then(() => {
+              this._delete()
+            })
         },
         this
       )