umap-project 3.0.1__py3-none-any.whl → 3.0.3__py3-none-any.whl

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="288" height="288" viewBox="0 0 76.199999 76.199999" 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="5.1755289" inkscape:cx="321.22321" inkscape:cy="85.788333" inkscape:window-width="1920" inkscape:window-height="1011" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="layer1">
+<svg width="288" height="288" viewBox="0 0 76.199999 76.199999" version="1.1" id="svg6237" inkscape:version="1.4.1 (93de688d07, 2025-03-30)" 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="8.9060631" inkscape:cx="172.74748" inkscape:cy="256.79135" 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>
@@ -44,7 +44,7 @@
     <path d="m 60.085221,50.800004 c -0.890121,-0.0021 -1.610321,0.711677 -1.612305,1.5875 0.002,0.877761 0.722184,1.586074 1.612305,1.5875 0.593513,-8.73e-4 1.110529,-0.321123 1.389062,-0.79375 h 0.65319 l 0.520899,-0.504362 0.396875,0.380339 0.380338,-0.37207 0.388607,0.380338 0.396875,-0.380338 0.388607,0.380338 0.677994,-0.65319 c 0.09761,-0.09927 0.100016,-0.174188 0,-0.272852 l -0.553971,-0.545703 h -3.241146 c -0.277124,-0.47713 -0.799763,-0.794983 -1.39733,-0.79375 z m -0.7028,1.157552 c 0.233962,-0.0011 0.419905,0.187463 0.42168,0.42168 -0.0017,0.230958 -0.187613,0.419542 -0.42168,0.42168 -0.237929,-0.0024 -0.43214,-0.190722 -0.429948,-0.42168 -0.0022,-0.234217 0.192019,-0.422799 0.429948,-0.42168 z" id="permissions" style="fill:#4d4d4d;fill-opacity:1;stroke-width:0.264583" class="sprite" />
     <polygon points="12.5,50 12.5,87.5 43.75,87.5 43.75,62.5 56.25,62.5 56.25,87.5 87.5,87.5 87.5,50 100,50 50,0 0,50 " id="home" transform="matrix(0.0635,0,0,0.0635,30.162499,20.902083)" style="fill:#4d4d4d;fill-opacity:1" class="sprite" />
     <path inkscape:connector-curvature="0" d="m 7.937502,33.337505 c 0,-0.119238 -0.0078,-0.236713 -0.02082,-0.352777 h -0.356658 c -0.159103,-1.275998 -1.168753,-2.285648 -2.44475,-2.445102 v -0.356307 c -0.116064,-0.01304 -0.233539,-0.02082 -0.352778,-0.02082 -0.119239,0 -0.236714,0.0078 -0.352778,0.02082 v 0.356659 c -1.275997,0.159102 -2.285647,1.168752 -2.445103,2.44475 h -0.356305 c -0.01305,0.116064 -0.02081,0.233539 -0.02081,0.352777 0,0.119239 0.0078,0.236714 0.02081,0.352779 h 0.356658 c 0.159103,1.275996 1.168753,2.285659 2.44475,2.445123 v 0.356658 c 0.116064,0.0127 0.233539,0.02037 0.352778,0.02037 0.119239,0 0.236714,-0.0077 0.352778,-0.0209 v -0.356658 c 1.275644,-0.159438 2.285647,-1.168757 2.445102,-2.444753 h 0.356659 c 0.0127,-0.115712 0.02046,-0.233187 0.02046,-0.352779 z m -2.822223,2.084929 v -0.32104 c 0,-0.195085 -0.158044,-0.352777 -0.352777,-0.352777 -0.194734,0 -0.352778,0.157692 -0.352778,0.352777 v 0.32104 c -0.885472,-0.148883 -1.582914,-0.845973 -1.731786,-1.731798 l 0.320675,-2.65e-4 c 0.195086,0 0.352778,-0.158046 0.352778,-0.352779 0,-0.194733 -0.157692,-0.352777 -0.352778,-0.352777 h -0.321028 c 0.149225,-0.885473 0.846667,-1.582915 1.732139,-1.73214 v 0.32103 c 0,0.194733 0.158044,0.352777 0.352778,0.352777 0.194733,0 0.352777,-0.158044 0.352777,-0.352777 v -0.32103 c 0.885825,0.148873 1.583267,0.846315 1.732139,1.73214 h -0.321028 c -0.195086,0 -0.352777,0.158044 -0.352777,0.352777 0,0.194733 0.157691,0.352779 0.352777,0.352779 l 0.321028,2.65e-4 c -0.149225,0.885825 -0.846314,1.582915 -1.732139,1.731798 z" id="geolocation" style="fill:#4d4d4d;fill-opacity:1;stroke-width:0.264583" class="sprite" />
-    <g id="share" class="sprite" transform="matrix(0.26458333,0,0,0.26458333,-2.6458336,-229.22505)">
+    <g id="share" class="sprite" transform="matrix(0.26458333,0,0,0.26458333,-21.695832,-210.17502)">
       <circle id="path4309" style="fill:none;stroke:#464646;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" cx="100" cy="992.3623" r="11" />
       <circle transform="rotate(-111.82202)" id="path4819" style="fill:#464646;fill-opacity:1;stroke:none;stroke-width:4.28879" cx="-963.88702" cy="-276.03735" r="2.5" />
       <circle transform="rotate(-111.82202)" id="path4819-2" style="fill:#464646;fill-opacity:1;stroke:none;stroke-width:4.28879" cx="-956.38037" cy="-281.15619" r="2.5" />
@@ -77,7 +77,7 @@
     </g>
     <path style="fill:#464646;fill-opacity:1;stroke:none;stroke-width:1.84551;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" inkscape:transform-center-x="-0.0017170804" inkscape:transform-center-y="-1.1593678" d="m 31.537126,45.771563 0.577355,-2.184903 -1.687401,-1.349931 h 2.154994 l 0.756436,-2.28465 0.754501,2.284227 h 2.154902 l -1.688682,1.351121 0.575368,2.185485 -1.798166,-1.252432 z" id="star" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccc" class="sprite" />
     <path style="fill:none;fill-opacity:1;stroke:#464646;stroke-width:0.264583;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" inkscape:transform-center-x="-0.0017170804" inkscape:transform-center-y="-1.1593678" d="m 40.742193,45.771563 0.577355,-2.184903 -1.687401,-1.349931 h 2.154994 l 0.756436,-2.28465 0.754502,2.284227 h 2.154901 l -1.688682,1.351121 0.575368,2.185485 -1.798169,-1.252432 z" id="starred" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccc" class="sprite" />
-    <path d="m 45.33157,52.032511 0.367177,0.21791 c 0.07232,0.04294 0.09577,0.135732 0.0524,0.207275 -0.01292,0.02122 -0.03092,0.03903 -0.0524,0.0518 l -2.836254,1.6832 -2.836235,-1.6832 c -0.07233,-0.04294 -0.09579,-0.135704 -0.05238,-0.207274 0.0129,-0.02125 0.03089,-0.03905 0.05238,-0.05181 l 0.367179,-0.21791 2.469056,1.465315 z m 0,1.419992 0.367177,0.217911 c 0.07232,0.04294 0.09577,0.135731 0.0524,0.207274 -0.01292,0.02125 -0.03092,0.03903 -0.0524,0.05181 l -2.679097,1.58996 c -0.09674,0.05739 -0.217576,0.05739 -0.314315,0 l -2.679077,-1.58996 c -0.07233,-0.04292 -0.09579,-0.135705 -0.05238,-0.207249 0.0129,-0.02127 0.03089,-0.03908 0.05238,-0.05183 l 0.367179,-0.217911 2.469056,1.465315 z m -2.31192,-4.196946 2.679097,1.589967 c 0.07232,0.04292 0.09577,0.135715 0.0524,0.207256 -0.01292,0.02126 -0.03092,0.03906 -0.0524,0.05182 l -2.836254,1.683221 -2.836235,-1.683221 c -0.07233,-0.04292 -0.09579,-0.135716 -0.05238,-0.207256 0.0129,-0.02126 0.03089,-0.03906 0.05238,-0.05182 l 2.679077,-1.589967 c 0.09674,-0.05741 0.217576,-0.05741 0.314315,0 z" fill="#4d4d4d" id="datalayers" style="stroke-width:0.264583" />
+    <path d="m 45.33157,52.032514 0.367177,0.21791 c 0.07232,0.04294 0.09577,0.135732 0.0524,0.207275 -0.01292,0.02122 -0.03092,0.03903 -0.0524,0.0518 l -2.836254,1.6832 -2.836235,-1.6832 c -0.07233,-0.04294 -0.09579,-0.135704 -0.05238,-0.207274 0.0129,-0.02125 0.03089,-0.03905 0.05238,-0.05181 l 0.367179,-0.21791 2.469056,1.465315 z m 0,1.419992 0.367177,0.217911 c 0.07232,0.04294 0.09577,0.135731 0.0524,0.207274 -0.01292,0.02125 -0.03092,0.03903 -0.0524,0.05181 l -2.679097,1.58996 c -0.09674,0.05739 -0.217576,0.05739 -0.314315,0 l -2.679077,-1.58996 c -0.07233,-0.04292 -0.09579,-0.135705 -0.05238,-0.207249 0.0129,-0.02127 0.03089,-0.03908 0.05238,-0.05183 l 0.367179,-0.217911 2.469056,1.465315 z m -2.31192,-4.196946 2.679097,1.589967 c 0.07232,0.04292 0.09577,0.135715 0.0524,0.207256 -0.01292,0.02126 -0.03092,0.03906 -0.0524,0.05182 l -2.836254,1.683221 -2.836235,-1.683221 c -0.07233,-0.04292 -0.09579,-0.135716 -0.05238,-0.207256 0.0129,-0.02126 0.03089,-0.03906 0.05238,-0.05182 l 2.679077,-1.589967 c 0.09674,-0.05741 0.217576,-0.05741 0.314315,0 z" fill="#4d4d4d" id="datalayers" style="stroke-width:0.264583" />
     <g id="tilelayers" transform="translate(19.049999,56.885416)">
       <path d="m 26.772659,3.4276506 h -4.243945 c -0.07035,0 -0.137814,0.027945 -0.187558,0.077687 -0.04974,0.049744 -0.07769,0.1172104 -0.07769,0.1875578 v 4.2439431 c 0,0.070353 0.02794,0.1378215 0.07769,0.1875631 0.04974,0.049742 0.11721,0.077682 0.187558,0.077682 h 4.243945 c 0.07035,0 0.137822,-0.02794 0.187563,-0.077682 0.04974,-0.049742 0.07768,-0.1172104 0.07768,-0.1875631 v -4.2439431 c 0,-0.070347 -0.02794,-0.1378135 -0.07768,-0.1875578 -0.04974,-0.049742 -0.11721,-0.077687 -0.187563,-0.077687 z m -0.265245,4.1590648 h -3.713453 v -3.546348 h 3.713453 z" fill="#464646" id="path2349" style="stroke-width:0.264583" />
       <g mask="url(#mask0_181_11898)" id="g2376" transform="matrix(0.26458333,0,0,0.26458333,20.637501,1.8520833)">
@@ -110,5 +110,6 @@
         <path inkscape:connector-curvature="0" id="path3789" style="font-weight:bold;font-size:12px;-inkscape-font-specification:'Sans Bold';fill:#4d4d4d;stroke-width:0.75" d="m 9,1046.0464 h -2.3698034 v -0.3223 c 0,-0.3596 0.072207,-0.6775 0.2166302,-0.9539 0.1444174,-0.2807 0.4485749,-0.636 0.9124728,-1.0658 l 0.4201314,-0.3816 c 0.249449,-0.228 0.4310681,-0.4429 0.5448577,-0.6446 0.1181576,-0.2019 0.1772384,-0.4036 0.177243,-0.6053 -4.6e-6,-0.3071 -0.1050376,-0.5462 -0.3150985,-0.7171 -0.2100697,-0.1756 -0.5032861,-0.2632 -0.87965,-0.2632 -0.3544889,0 -0.7374207,0.075 -1.1487968,0.2237 -0.4113804,0.1446 -0.840264,0.3618 -1.2866522,0.6513 v -2.0659 c 0.5295391,-0.184 1.0131273,-0.32 1.4507661,-0.4077 0.437634,-0.088 0.8599531,-0.1317 1.2669587,-0.1317 1.0678292,0 1.8818328,0.2194 2.442012,0.6579 0.560169,0.4341 0.840256,1.0702 0.840263,1.9078 -7e-6,0.4298 -0.08535,0.8159 -0.256017,1.158 -0.170685,0.3377 -0.461713,0.7017 -0.873085,1.092 l -0.4201313,0.375 c -0.297598,0.272 -0.4923463,0.4913 -0.5842451,0.658 -0.091909,0.1622 -0.1378603,0.342 -0.1378556,0.5394 v 0.296 m -2.3698034,0.9739 h 2.3698034 v 2.342 h -2.3698034 v -2.342" sodipodi:nodetypes="ccsccccccsccccsccccccccccccc" />
       </g>
     </g>
+    <path id="copy" style="fill:#4d4d4d;stroke-width:0.264582;paint-order:fill markers stroke" d="m 42.218298,69.320832 v 1.288405 h 1.472463 v 1.472465 h 1.288405 v -2.76087 z m -1.472465,1.472463 v 2.760871 h 2.760869 v -2.760871 z" />
   </g>
 </svg>

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

@@ -232,6 +232,7 @@ export default class Browser {
     toggle.addEventListener('click', () => this.toggleLayers())
     fitBounds.addEventListener('click', () => this._umap.fitDataBounds())
     download.addEventListener('click', () => this.downloadVisible(download))
+    download.hidden = this._umap.getProperty('embedControl') === false
   }
 
   downloadVisible(element) {

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

@@ -74,10 +74,10 @@ export default class Caption extends Utils.WithTemplate {
     this.addCredits()
     if (this._umap.properties.created_at) {
       const created_at = translate('created at {date}', {
-        date: new Date(this._umap.properties.created_at).toLocaleDateString(),
+        date: this._umap.createdAt.toLocaleDateString(),
       })
       const modified_at = translate('modified at {date}', {
-        date: new Date(this._umap.properties.modified_at).toLocaleDateString(),
+        date: this._umap.modifiedAt.toLocaleDateString(),
       })
       this.elements.dates.innerHTML = `${created_at} - ${modified_at}`
     } else {

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

@@ -146,14 +146,13 @@ class Feature {
   }
 
   onCommit() {
+    this.pullGeometry(false)
     // When the layer is a remote layer, we don't want to sync the creation of the
     // points via the websocket, as the other peers will get them themselves.
-    const oldGeoJSON = this._just_married ? null : Utils.CopyJSON(this.toGeoJSON())
-    this.pullGeometry(false)
     if (this.datalayer?.isRemoteLayer()) return
-    if (this._just_married) {
+    if (this._needs_upsert) {
       this.sync.upsert(this.toGeoJSON(), null)
-      this._just_married = false
+      this._needs_upsert = false
     } else {
       this.sync.update('geometry', this.geometry, this._geometry_bk)
     }
@@ -218,6 +217,7 @@ class Feature {
 
   edit(event) {
     if (!this._umap.editEnabled || this.isReadOnly()) return
+    if (this._umap.editedFeature === this) return
     const container = DomUtil.create('div', 'umap-feature-container')
     DomUtil.createTitle(
       container,
@@ -326,7 +326,9 @@ class Feature {
     ]
   }
 
-  endEdit() {}
+  endEdit() {
+    this.ui.disableEdit()
+  }
 
   getDisplayName() {
     const keys = U.LABEL_KEYS.slice() // Copy.
@@ -828,11 +830,6 @@ class Path extends Feature {
     )
   }
 
-  endEdit() {
-    this.ui.disableEdit()
-    super.endEdit()
-  }
-
   transferShape(at, to) {
     const shape = this.ui.enableEdit().deleteShapeAt(at)
     // FIXME: make Leaflet.Editable send an event instead

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

@@ -220,6 +220,7 @@ export class DataLayer {
     this._loading = true
     const [geojson, response, error] = await this._umap.server.get(this._dataUrl())
     if (!error) {
+      this._umap.modifiedAt = response.headers.get('last-modified')
       this.setReferenceVersion({ response, sync: false })
       // FIXME: for now the _umap_options property is set dynamically from backend
       // And thus it's not in the geojson file in the server
@@ -303,7 +304,10 @@ export class DataLayer {
   async getUrl(url, initialUrl) {
     const response = await this._umap.request.get(url)
     return new Promise((resolve) => {
-      if (response?.ok) return resolve(response.text())
+      if (response?.ok) {
+        this._umap.modifiedAt = response.headers.get('last-modified')
+        return resolve(response.text())
+      }
       Alert.error(
         translate('Cannot load remote data for layer "{layer}" with url "{url}"', {
           layer: this.getName(),
@@ -414,6 +418,10 @@ export class DataLayer {
 
   removeFeature(feature, sync) {
     const id = stamp(feature)
+    // This feature was not yet added, may be after
+    // hitting Escape while drawing a new line or
+    // polygon, not yet valid (not enough points)
+    if (!this._index.includes(id)) return
     if (sync !== false) {
       const oldValue = feature.toGeoJSON()
       feature.sync.delete(oldValue)

umap/static/umap/js/modules/form/fields.js

@@ -808,9 +808,10 @@ Fields.IconUrl = class extends Fields.BlurInput {
   }
 
   addCategory(items, name) {
+    const hidden = name ? '' : ' hidden'
     const [parent, { grid }] = Utils.loadTemplateWithRefs(`
       <div class="umap-pictogram-category">
-        <h6 hidden=${!name}>${name}</h6>
+        <h6${hidden}>${name}</h6>
         <div class="umap-pictogram-grid" data-ref=grid></div>
       </div>
     `)
@@ -924,7 +925,8 @@ Fields.Url = class extends Fields.Input {
 Fields.Switch = class extends Fields.CheckBox {
   getTemplate() {
     const label = this.properties.label
-    return `${super.getTemplate()}<label title="${label}" for="${this.id}" data-ref=customLabel>${label}</label>`
+    const help = this.properties.helpEntries?.join() || ''
+    return `${super.getTemplate()}<label title="${label}" for="${this.id}" data-ref=customLabel data-help="${help}">${label}</label>`
   }
 
   build() {

umap/static/umap/js/modules/importers/cadastrefr.js

@@ -8,18 +8,20 @@ import { AutocompleteCommunes } from './communesfr.js'
 const TEMPLATE = `
   <h3>Cadastre</h3>
   <p>Importer les données cadastrales d’une commune française.</p>
-  <select name="theme">
-    <option value="batiments">Bâtiments</option>
-    <option value="communes">Communes</option>
-    <option value="feuilles">Feuilles</option>
-    <option value="lieux_dits">Lieux dits</option>
-    <option value="parcelles" selected>Parcelles</option>
-    <option value="prefixes_sections">Préfixes sections</option>
-    <option value="sections">Sections</option>
-    <option value="subdivisions_fiscales">Subdivisions fiscales</option>
-  </select>
-  <label id="boundary">
-  </label>
+  <div class="formbox">
+    <select name="theme">
+      <option value="batiments">Bâtiments</option>
+      <option value="communes">Communes</option>
+      <option value="feuilles">Feuilles</option>
+      <option value="lieux_dits">Lieux dits</option>
+      <option value="parcelles" selected>Parcelles</option>
+      <option value="prefixes_sections">Préfixes sections</option>
+      <option value="sections">Sections</option>
+      <option value="subdivisions_fiscales">Subdivisions fiscales</option>
+    </select>
+    <label id="boundary">
+    </label>
+  </div>
 `
 
 export class Importer {

umap/static/umap/js/modules/importers/geodatamine.js

@@ -16,15 +16,17 @@ const BOUNDARY_TYPES = {
 const TEMPLATE = `
   <h3>GeoDataMine</h3>
   <p>${translate('GeoDataMine: thematic data from OpenStreetMap')}.</p>
-  <select name="theme">
-    <option value="">${translate('Choose a theme')}</option>
-  </select>
-  <label>
-    <input type="checkbox" name="aspoint" />
-    ${translate('Symplify all geometries to points')}
-  </label>
-  <label id="boundary">
-  </label>
+  <div class="formbox">
+    <select name="theme">
+      <option value="">${translate('Choose a theme')}</option>
+    </select>
+    <label>
+      <input type="checkbox" name="aspoint" />
+      ${translate('Simplify all geometries to points')}
+    </label>
+    <label id="boundary">
+    </label>
+  </div>
 `
 
 class Autocomplete extends SingleMixin(BaseAjax) {

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

@@ -23,6 +23,7 @@ BaseMap.mergeOptions({
 
 const ControlsMixin = {
   HIDDABLE_CONTROLS: [
+    'home',
     'zoom',
     'search',
     'fullscreen',
@@ -41,6 +42,7 @@ const ControlsMixin = {
     if (this._umap.hasEditMode() && !this.options.noControl) {
       new U.EditControl(this).addTo(this)
     }
+    this._controls.home = new U.HomeControl(this._umap)
     this._controls.zoom = new Control.Zoom({
       zoomInTitle: translate('Zoom in'),
       zoomOutTitle: translate('Zoom out'),
@@ -91,10 +93,6 @@ const ControlsMixin = {
     }
     if (this.options.noControl) return
 
-    // Do not display in an iframe.
-    if (window.self === window.top) {
-      this._controls.home = new U.HomeControl().addTo(this)
-    }
     this._controls.attribution = new U.AttributionControl().addTo(this)
     if (this.options.miniMap) {
       this.whenReady(function () {

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

@@ -111,7 +111,6 @@ const PointMixin = {
     this.on('dragend', (event) => {
       this.isDirty = true
       this.feature.edit(event)
-      // this.feature.pullGeometry(false)
     })
     if (!this.feature.isReadOnly()) this.on('mouseover', this._enableDragging)
     this.on('mouseout', this._onMouseOut)

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

@@ -204,6 +204,12 @@ export const SCHEMA = {
     type: Object,
     impacts: ['data'],
   },
+  homeControl: {
+    type: Boolean,
+    impacts: ['ui'],
+    label: translate('Display the back to home icon'),
+    default: true,
+  },
   iconClass: {
     type: String,
     impacts: ['data'],
@@ -275,6 +281,12 @@ export const SCHEMA = {
     label: translate('Label key'),
     inheritable: true,
   },
+  layerSwitcher: {
+    type: Boolean,
+    impacts: ['ui'],
+    label: translate('Do you want to display layer switcher in caption bar?'),
+    default: true,
+  },
   licence: {
     type: String,
     impacts: ['ui'],

umap/static/umap/js/modules/ui/bar.js

@@ -180,7 +180,7 @@ const BOTTOM_BAR_TEMPLATE = `
     <button class="umap-about-link flat" type="button" title="${translate('Open caption')}" data-ref="caption">${translate('Open caption')}</button>
     <button class="umap-open-browser-link flat" type="button" title="${translate('Browse data')}" data-ref="browse">${translate('Browse data')}</button>
     <button class="umap-open-browser-link flat" type="button" title="${translate('Filter data')}" data-ref="filter">${translate('Filter data')}</button>
-    <select data-ref=layers></select>
+    <select data-ref="layers"></select>
   </div>
 `
 
@@ -233,7 +233,7 @@ export class BottomBar extends WithTemplate {
       this.elements.layers.hidden = true
     } else {
       this.elements.layers.appendChild(Utils.loadTemplate(`<option value=""></option>`))
-      this.elements.layers.hidden = false
+      this.elements.layers.hidden = !this._umap.getProperty('layerSwitcher')
       const visible = datalayers.filter((datalayer) => datalayer.isVisible())
       for (const datalayer of datalayers) {
         const selected = visible.length === 1 && datalayer.isVisible() ? 'selected' : ''

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

@@ -57,6 +57,8 @@ export default class Umap {
       },
       geojson.properties
     )
+    this.createdAt = new Date(this.properties.created_at)
+    this.modifiedAt = this.properties.modified_at
     this.searchParams = new URLSearchParams(window.location.search)
 
     // Locale name (pt_PT, en_US…)
@@ -104,6 +106,11 @@ export default class Umap {
 
     if (geojson.properties.schema) this.overrideSchema(geojson.properties.schema)
 
+    // Do not display in an iframe.
+    if (window.self !== window.top) {
+      geojson.properties.homeControl = false
+    }
+
     this._leafletMap.setup()
 
     this.panel = new Panel(this, this._leafletMap)
@@ -237,6 +244,20 @@ export default class Umap {
     this._activeFeature = feature
   }
 
+  get modifiedAt() {
+    return this._modifiedAt
+  }
+
+  set modifiedAt(at) {
+    if (!at) return
+    if (typeof at === 'string') {
+      at = new Date(at)
+    }
+    if (!this._modifiedAt || at > this._modifiedAt) {
+      this._modifiedAt = at
+    }
+  }
+
   setPropertiesFromQueryString() {
     const asBoolean = (key) => {
       const value = this.searchParams.get(key)
@@ -525,7 +546,6 @@ export default class Umap {
       'Ctrl+e': {
         if: () => this.hasEditMode(),
         do: () => {
-          console.log('doing')
           if (!this.editEnabled) this.enableEdit()
           else if (!this.isDirty) this.disableEdit()
         },
@@ -813,6 +833,7 @@ export default class Umap {
       UIFields.push(`properties.${name}Control`)
     }
     UIFields = UIFields.concat([
+      'properties.homeControl',
       'properties.moreControl',
       'properties.scrollWheelZoom',
       'properties.miniMap',
@@ -821,6 +842,7 @@ export default class Umap {
       'properties.displayPopupFooter',
       'properties.captionBar',
       'properties.captionMenus',
+      'properties.layerSwitcher',
     ])
     const builder = new MutatingForm(this, UIFields, { umap: this })
     const controlsOptions = DomUtil.createFieldset(

umap/static/umap/js/modules/utils.js

@@ -283,6 +283,8 @@ export function greedyTemplate(str, data, ignore) {
 }
 
 export function naturalSort(a, b, lang) {
+  a ??= ''
+  b ??= ''
   return a
     .toString()
     .toLowerCase()

umap/static/umap/js/umap.controls.js

@@ -629,7 +629,7 @@ U.Editable = L.Editable.extend({
     const line = new U.LineString(this._umap, datalayer, {
       geometry: { type: 'LineString', coordinates: [] },
     })
-    line._just_married = true
+    line._needs_upsert = true
     return line.ui
   },
 
@@ -638,7 +638,7 @@ U.Editable = L.Editable.extend({
     const poly = new U.Polygon(this._umap, datalayer, {
       geometry: { type: 'Polygon', coordinates: [] },
     })
-    poly._just_married = true
+    poly._needs_upsert = true
     return poly.ui
   },
 
@@ -647,7 +647,7 @@ U.Editable = L.Editable.extend({
     const point = new U.Point(this._umap, datalayer, {
       geometry: { type: 'Point', coordinates: [latlng.lng, latlng.lat] },
     })
-    point._just_married = true
+    point._needs_upsert = true
     return point.ui
   },
 

umap/static/umap/js/umap.core.js

@@ -113,8 +113,12 @@ L.DomUtil.createCopiableInput = (parent, label, value) => {
   input.type = 'text'
   input.readOnly = true
   input.value = value
-  const button = L.DomUtil.createButtonIcon(wrapper, 'icon-copy', L._('copy'), () =>
-    L.Util.copyToClipboard(input.value)
+  const button = L.DomUtil.createButtonIcon(
+    wrapper,
+    'icon-copy',
+    L._('copy'),
+    () => L.Util.copyToClipboard(input.value),
+    24
   )
   button.type = 'button'
   return input

umap/static/umap/locale/cs_CZ.js

@@ -457,7 +457,6 @@ const locale = {
     "Choose this dataset": "Vyberte tuto datovou sadu",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: tematická data z OpenStreetMap",
     "Choose a theme": "Vyberte si téma",
-    "Symplify all geometries to points": "Zjednodušte všechny geometrie na body",
     "Choose this data": "Zvolte tato data",
     "Search admin boundary": "Hledat hranici správce",
     "Please choose a theme and a boundary first.": "Nejprve si vyberte téma a hranice.",
@@ -538,7 +537,10 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode"
+    "Geocode": "Geocode",
+    "Display the back to home icon": "Display the back to home icon",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
+    "Simplify all geometries to points": "Simplify all geometries to points"
 }
 L.registerLocale("cs_CZ", locale)
 L.setLocale("cs_CZ")

umap/static/umap/locale/cs_CZ.json

@@ -457,7 +457,6 @@
     "Choose this dataset": "Vyberte tuto datovou sadu",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: tematická data z OpenStreetMap",
     "Choose a theme": "Vyberte si téma",
-    "Symplify all geometries to points": "Zjednodušte všechny geometrie na body",
     "Choose this data": "Zvolte tato data",
     "Search admin boundary": "Hledat hranici správce",
     "Please choose a theme and a boundary first.": "Nejprve si vyberte téma a hranice.",
@@ -538,5 +537,8 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode"
+    "Geocode": "Geocode",
+    "Display the back to home icon": "Display the back to home icon",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
+    "Simplify all geometries to points": "Simplify all geometries to points"
 }

umap/static/umap/locale/de.js

@@ -457,7 +457,6 @@ const locale = {
     "Choose this dataset": "Diesen Datensatz auswählen",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematische Daten von OpenStreetMap",
     "Choose a theme": "Thema auswählen",
-    "Symplify all geometries to points": "Alle Geometrien zu Punkten vereinfachen",
     "Choose this data": "Diese Daten auswählen",
     "Search admin boundary": "Administrative Grenze suchen",
     "Please choose a theme and a boundary first.": "Bitte wähle zuerst ein Thema und eine administrative Grenze.",
@@ -538,7 +537,10 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode"
+    "Geocode": "Geocode",
+    "Display the back to home icon": "Display the back to home icon",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
+    "Simplify all geometries to points": "Simplify all geometries to points"
 }
 L.registerLocale("de", locale)
 L.setLocale("de")

umap/static/umap/locale/de.json

@@ -457,7 +457,6 @@
     "Choose this dataset": "Diesen Datensatz auswählen",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematische Daten von OpenStreetMap",
     "Choose a theme": "Thema auswählen",
-    "Symplify all geometries to points": "Alle Geometrien zu Punkten vereinfachen",
     "Choose this data": "Diese Daten auswählen",
     "Search admin boundary": "Administrative Grenze suchen",
     "Please choose a theme and a boundary first.": "Bitte wähle zuerst ein Thema und eine administrative Grenze.",
@@ -538,5 +537,8 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode"
+    "Geocode": "Geocode",
+    "Display the back to home icon": "Display the back to home icon",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
+    "Simplify all geometries to points": "Simplify all geometries to points"
 }

umap/static/umap/locale/en.js

@@ -457,7 +457,6 @@ const locale = {
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
-    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -538,7 +537,10 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode"
+    "Geocode": "Geocode",
+    "Display the back to home icon": "Display the back to home icon",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
+    "Simplify all geometries to points": "Simplify all geometries to points"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -457,7 +457,6 @@
     "Choose this dataset": "Choose this dataset",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: thematic data from OpenStreetMap",
     "Choose a theme": "Choose a theme",
-    "Symplify all geometries to points": "Symplify all geometries to points",
     "Choose this data": "Choose this data",
     "Search admin boundary": "Search admin boundary",
     "Please choose a theme and a boundary first.": "Please choose a theme and a boundary first.",
@@ -538,5 +537,8 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode"
+    "Geocode": "Geocode",
+    "Display the back to home icon": "Display the back to home icon",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
+    "Simplify all geometries to points": "Simplify all geometries to points"
 }

umap/static/umap/locale/es.js

@@ -457,7 +457,6 @@ const locale = {
     "Choose this dataset": "Elegir este conjunto de datos",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: datos temáticos de OpenStreetMap",
     "Choose a theme": "Elegir un tema",
-    "Symplify all geometries to points": "Simplificar todas las geometrías a puntos",
     "Choose this data": "Elegir estos datos",
     "Search admin boundary": "Buscar límite administrativo",
     "Please choose a theme and a boundary first.": "Primero elige un tema y un límite.",
@@ -538,7 +537,10 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode"
+    "Geocode": "Geocode",
+    "Display the back to home icon": "Display the back to home icon",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
+    "Simplify all geometries to points": "Simplify all geometries to points"
 }
 L.registerLocale("es", locale)
 L.setLocale("es")

umap/static/umap/locale/es.json

@@ -457,7 +457,6 @@
     "Choose this dataset": "Elegir este conjunto de datos",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: datos temáticos de OpenStreetMap",
     "Choose a theme": "Elegir un tema",
-    "Symplify all geometries to points": "Simplificar todas las geometrías a puntos",
     "Choose this data": "Elegir estos datos",
     "Search admin boundary": "Buscar límite administrativo",
     "Please choose a theme and a boundary first.": "Primero elige un tema y un límite.",
@@ -538,5 +537,8 @@
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode"
+    "Geocode": "Geocode",
+    "Display the back to home icon": "Display the back to home icon",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
+    "Simplify all geometries to points": "Simplify all geometries to points"
 }

umap/static/umap/locale/eu.js

@@ -457,7 +457,6 @@ const locale = {
     "Choose this dataset": "Aukeratu datu-multzo hau",
     "GeoDataMine: thematic data from OpenStreetMap": "GeoDataMine: OpenStreetMap-eko datu tematikoak",
     "Choose a theme": "Aukeratu gai bat",
-    "Symplify all geometries to points": "Sinplifikatu geometria guztiak puntutan",
     "Choose this data": "Aukeratu datu hauek",
     "Search admin boundary": "Bilatu muga administratiboa",
     "Please choose a theme and a boundary first.": "Aukeratu gai bat eta muga bat.",
@@ -538,7 +537,10 @@ const locale = {
     "Images": "Images",
     "Iframes": "Iframes",
     "Tags": "Tags",
-    "Geocode": "Geocode"
+    "Geocode": "Geocode",
+    "Display the back to home icon": "Display the back to home icon",
+    "Do you want to display layer switcher in caption bar?": "Do you want to display layer switcher in caption bar?",
+    "Simplify all geometries to points": "Simplify all geometries to points"
 }
 L.registerLocale("eu", locale)
 L.setLocale("eu")