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

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
       )

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

@@ -1,4 +1,4 @@
-/* Uses globals for: csv2geojson, osmtogeojson, GeoRSSToGeoJSON (not available as ESM) */
+/* Uses globals for: csv2geojson, osmtogeojson (not available as ESM) */
 import { translate } from './i18n.js'
 
 export const EXPORT_FORMATS = {
@@ -115,7 +115,8 @@ export class Formatter {
   }
 
   async fromGeoRSS(str) {
-    return GeoRSSToGeoJSON(this.toDom(str))
+    const GeoRSSToGeoJSON = await import('../../vendors/georsstogeojson/GeoRSSToGeoJSON.js')
+    return GeoRSSToGeoJSON.parse(this.toDom(str))
   }
 
   toDom(x) {

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

@@ -9,6 +9,7 @@ import {
 } from './autocomplete.js'
 import Browser from './browser.js'
 import Caption from './caption.js'
+import ContextMenu from './ui/contextmenu.js'
 import Facets from './facets.js'
 import { Formatter } from './formatter.js'
 import Help from './help.js'
@@ -43,6 +44,7 @@ window.U = {
   AutocompleteDatalist,
   Browser,
   Caption,
+  ContextMenu,
   DataLayer,
   DataLayerPermissions,
   Dialog,

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

@@ -69,6 +69,9 @@ export default class Importer {
         case 'communesfr':
           import('./importers/communesfr.js').then(register)
           break
+        case 'cadastrefr':
+          import('./importers/cadastrefr.js').then(register)
+          break
         case 'overpass':
           import('./importers/overpass.js').then(register)
           break

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

@@ -0,0 +1,62 @@
+import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { BaseAjax, SingleMixin } from '../autocomplete.js'
+import * as Util from '../utils.js'
+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>
+`
+
+export class Importer {
+  constructor(map, options) {
+    this.name = options.name || 'Cadastre'
+    this.id = 'cadastrefr'
+  }
+
+  async open(importer) {
+    let boundary = null
+    let boundaryName = null
+    const container = DomUtil.create('div')
+    container.innerHTML = TEMPLATE
+    const select = container.querySelector('select')
+    const options = {
+      placeholder: 'Nom ou code INSEE…',
+      url: 'https://geo.api.gouv.fr/communes?nom={q}&limit=5',
+      on_select: (choice) => {
+        boundary = choice.item.value
+        boundaryName = choice.item.label
+      },
+    }
+    this.autocomplete = new AutocompleteCommunes(container, options)
+
+    const confirm = (form) => {
+      if (!boundary || !form.theme) {
+        Alert.error(translate('Please choose a theme and a boundary first.'))
+        return
+      }
+      importer.url = `https://cadastre.data.gouv.fr/bundler/cadastre-etalab/communes/${boundary}/geojson/${form.theme}`
+      importer.format = 'geojson'
+      importer.layerName = `${boundaryName} — ${select.options[select.selectedIndex].textContent}`
+    }
+
+    importer.dialog
+      .open({
+        template: container,
+        className: `${this.id} importer dark`,
+      })
+      .then(confirm)
+  }
+}

umap/static/umap/js/modules/importers/communesfr.js

@@ -1,13 +1,25 @@
 import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { BaseAjax, SingleMixin } from '../autocomplete.js'
+import * as Util from '../utils.js'
 
-class Autocomplete extends SingleMixin(BaseAjax) {
+export class AutocompleteCommunes extends SingleMixin(BaseAjax) {
   createResult(item) {
     return super.createResult({
       value: item.code,
       label: `${item.nom} (${item.code})`,
     })
   }
+
+  buildUrl(value) {
+    let url = this.url
+    let options = { q: encodeURIComponent(value) }
+    const re = /^(0[1-9]|[1-9][ABab\d])\d{3}$/gm
+    if (re.test(value)) {
+      url = "https://geo.api.gouv.fr/communes?code={code}&limit=5"
+      options = { code: encodeURIComponent(value) }
+    }
+    return Util.template(url, options)
+  }
 }
 
 export class Importer {
@@ -25,7 +37,7 @@ export class Importer {
       textContent: "Importer les contours d'une commune française.",
     })
     const options = {
-      placeholder: 'Commune…',
+      placeholder: 'Nom ou code INSEE…',
       url: 'https://geo.api.gouv.fr/communes?nom={q}&limit=5',
       on_select: (choice) => {
         importer.url = `https://geo.api.gouv.fr/communes?code=${choice.item.value}&format=geojson&geometry=contour`
@@ -34,7 +46,7 @@ export class Importer {
         importer.dialog.close()
       },
     }
-    this.autocomplete = new Autocomplete(container, options)
+    this.autocomplete = new AutocompleteCommunes(container, options)
 
     importer.dialog.open({
       template: container,

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

@@ -42,101 +42,129 @@ export class MapPermissions {
     return !this.map.options.permissions.owner
   }
 
-  getMap() {
-    return this.map
-  }
-
-  edit() {
-    if (this.map.options.editMode !== 'advanced') return
-    if (!this.map.options.umap_id) {
-      return Alert.info(translate('Please save the map first'))
-    }
-    const container = DomUtil.create('div', 'permissions-panel')
+  _editAnonymous(container) {
     const fields = []
-    DomUtil.createTitle(container, translate('Update permissions'), 'icon-key')
-    if (this.isAnonymousMap()) {
+    if (this.isOwner()) {
+      fields.push([
+        'options.edit_status',
+        {
+          handler: 'IntSelect',
+          label: translate('Who can edit'),
+          selectOptions: this.map.options.edit_statuses,
+        },
+      ])
+      const builder = new U.FormBuilder(this, fields)
+      const form = builder.build()
+      container.appendChild(form)
+
       if (this.options.anonymous_edit_url) {
-        const helpText = `${translate('Secret edit link:')}<br>${
+        DomUtil.createCopiableInput(
+          container,
+          translate('Secret edit link:'),
           this.options.anonymous_edit_url
-        }`
-        DomUtil.element({
-          tagName: 'p',
-          className: 'help-text',
-          innerHTML: helpText,
-          parent: container,
-        })
-        fields.push([
-          'options.edit_status',
-          {
-            handler: 'IntSelect',
-            label: translate('Who can edit'),
-            selectOptions: this.map.options.edit_statuses,
-            helpText: helpText,
-          },
-        ])
+        )
       }
-    } else {
-      if (this.isOwner()) {
-        fields.push([
-          'options.edit_status',
-          {
-            handler: 'IntSelect',
-            label: translate('Who can edit'),
-            selectOptions: this.map.options.edit_statuses,
-          },
-        ])
-        fields.push([
-          'options.share_status',
+
+      if (this.map.options.user?.id) {
+        // We have a user, and this user has come through here, so they can edit the map, so let's allow to own the map.
+        // Note: real check is made on the back office anyway.
+        const advancedActions = DomUtil.createFieldset(
+          container,
+          translate('Advanced actions')
+        )
+        const advancedButtons = DomUtil.create('div', 'button-bar', advancedActions)
+        DomUtil.createButton(
+          'button',
+          advancedButtons,
+          translate('Attach the map to my account'),
+          this.attach,
+          this
+        )
+      }
+    }
+  }
+
+  _editWithOwner(container) {
+    const topFields = []
+    const collaboratorsFields = []
+    const fieldset = Utils.loadTemplate(
+      `<fieldset class="separator"><legend>${translate('Map')}</legend></fieldset>`
+    )
+    container.appendChild(fieldset)
+    if (this.isOwner()) {
+      topFields.push([
+        'options.edit_status',
+        {
+          handler: 'IntSelect',
+          label: translate('Who can edit'),
+          selectOptions: this.map.options.edit_statuses,
+        },
+      ])
+      topFields.push([
+        'options.share_status',
+        {
+          handler: 'IntSelect',
+          label: translate('Who can view'),
+          selectOptions: this.map.options.share_statuses,
+        },
+      ])
+      collaboratorsFields.push([
+        'options.owner',
+        { handler: 'ManageOwner', label: translate("Map's owner") },
+      ])
+      if (this.map.options.user?.teams?.length) {
+        collaboratorsFields.push([
+          'options.team',
           {
-            handler: 'IntSelect',
-            label: translate('Who can view'),
-            selectOptions: this.map.options.share_statuses,
+            handler: 'ManageTeam',
+            label: translate('Attach map to a team'),
+            teams: this.map.options.user.teams,
           },
         ])
-        fields.push([
-          'options.owner',
-          { handler: 'ManageOwner', label: translate("Map's owner") },
-        ])
-        if (this.map.options.user?.teams?.length) {
-          fields.push([
-            'options.team',
-            {
-              handler: 'ManageTeam',
-              label: translate('Attach map to a team'),
-              teams: this.map.options.user.teams,
-            },
-          ])
-        }
       }
-      fields.push([
-        'options.editors',
-        { handler: 'ManageEditors', label: translate("Map's editors") },
-      ])
     }
+    collaboratorsFields.push([
+      'options.editors',
+      { handler: 'ManageEditors', label: translate("Map's editors") },
+    ])
 
-    const builder = new U.FormBuilder(this, fields)
+    const builder = new U.FormBuilder(this, topFields)
     const form = builder.build()
     container.appendChild(form)
-    if (this.isAnonymousMap() && this.map.options.user) {
-      // We have a user, and this user has come through here, so they can edit the map, so let's allow to own the map.
-      // Note: real check is made on the back office anyway.
-      const advancedActions = DomUtil.createFieldset(
-        container,
-        translate('Advanced actions')
+    if (collaboratorsFields.length) {
+      const fieldset = Utils.loadTemplate(
+        `<fieldset class="separator"><legend>${translate('Manage collaborators')}</legend></fieldset>`
       )
-      const advancedButtons = DomUtil.create('div', 'button-bar', advancedActions)
-      DomUtil.createButton(
-        'button',
-        advancedButtons,
-        translate('Attach the map to my account'),
-        this.attach,
-        this
+      container.appendChild(fieldset)
+      const builder = new U.FormBuilder(this, collaboratorsFields)
+      const form = builder.build()
+      container.appendChild(form)
+    }
+  }
+
+  _editDatalayers(container) {
+    if (this.map.hasLayers()) {
+      const fieldset = Utils.loadTemplate(
+        `<fieldset class="separator"><legend>${translate('Datalayers')}</legend></fieldset>`
       )
+      container.appendChild(fieldset)
+      this.map.eachDataLayer((datalayer) => {
+        datalayer.permissions.edit(fieldset)
+      })
     }
-    DomUtil.add('h4', '', container, translate('Datalayers'))
-    this.map.eachDataLayer((datalayer) => {
-      datalayer.permissions.edit(container)
-    })
+  }
+
+  edit() {
+    if (this.map.options.editMode !== 'advanced') return
+    if (!this.map.options.umap_id) {
+      Alert.info(translate('Please save the map first'))
+      return
+    }
+    const container = DomUtil.create('div', 'permissions-panel')
+    DomUtil.createTitle(container, translate('Update permissions'), 'icon-key')
+    if (this.isAnonymousMap()) this._editAnonymous(container)
+    else this._editWithOwner(container)
+    this._editDatalayers(container)
     this.map.editPanel.open({ content: container, className: 'dark' })
   }
 
@@ -150,15 +178,16 @@ export class MapPermissions {
   }
 
   async save() {
-    if (!this.isDirty) return this.map.continueSaving()
+    if (!this.isDirty) return
     const formData = new FormData()
     if (!this.isAnonymousMap() && this.options.editors) {
       const editors = this.options.editors.map((u) => u.id)
       for (let i = 0; i < this.options.editors.length; i++)
         formData.append('editors', this.options.editors[i].id)
     }
-    if (this.isOwner() || this.isAnonymousMap())
+    if (this.isOwner() || this.isAnonymousMap()) {
       formData.append('edit_status', this.options.edit_status)
+    }
     if (this.isOwner()) {
       formData.append('owner', this.options.owner?.id)
       formData.append('team', this.options.team?.id || '')
@@ -172,7 +201,6 @@ export class MapPermissions {
     if (!error) {
       this.commit()
       this.isDirty = false
-      this.map.continueSaving()
       this.map.fire('postsync')
     }
   }
@@ -197,9 +225,11 @@ export class MapPermissions {
   }
 
   getShareStatusDisplay() {
-    return Object.fromEntries(this.map.options.share_statuses)[
-      this.options.share_status
-    ]
+    if (this.map.options.share_statuses) {
+      return Object.fromEntries(this.map.options.share_statuses)[
+        this.options.share_status
+      ]
+    }
   }
 }
 
@@ -225,7 +255,7 @@ export class DataLayerPermissions {
     return this._isDirty
   }
 
-  getMap() {
+  get map() {
     return this.datalayer.map
   }
 
@@ -238,7 +268,7 @@ export class DataLayerPermissions {
           label: translate('Who can edit "{layer}"', {
             layer: this.datalayer.getName(),
           }),
-          selectOptions: this.datalayer.map.options.datalayer_edit_statuses,
+          selectOptions: this.map.options.datalayer_edit_statuses,
         },
       ],
     ]
@@ -250,16 +280,17 @@ export class DataLayerPermissions {
   }
 
   getUrl() {
-    return Utils.template(this.datalayer.map.options.urls.datalayer_permissions, {
-      map_id: this.datalayer.map.options.umap_id,
+    return this.map.urls.get('datalayer_permissions', {
+      map_id: this.map.options.umap_id,
       pk: this.datalayer.umap_id,
     })
   }
+
   async save() {
-    if (!this.isDirty) return this.datalayer.map.continueSaving()
+    if (!this.isDirty) return
     const formData = new FormData()
     formData.append('edit_status', this.options.edit_status)
-    const [data, response, error] = await this.datalayer.map.server.post(
+    const [data, response, error] = await this.map.server.post(
       this.getUrl(),
       {},
       formData
@@ -267,7 +298,6 @@ export class DataLayerPermissions {
     if (!error) {
       this.commit()
       this.isDirty = false
-      this.datalayer.map.continueSaving()
     }
   }
 

umap/static/umap/js/modules/rendering/layers/classified.js

@@ -3,6 +3,7 @@ import { translate } from '../../i18n.js'
 import { LayerMixin } from './base.js'
 import * as Utils from '../../utils.js'
 import { CircleMarker } from '../ui.js'
+import colorbrewer from '../../../../vendors/colorbrewer/colorbrewer.js'
 
 // Layer where each feature color is relative to the others,
 // so we need all features before behing able to set one
@@ -74,6 +75,7 @@ const ClassifiedMixin = {
   },
 
   renderLegend: function (container) {
+    if (!this.datalayer.hasDataLoaded()) return
     const parent = DomUtil.create('ul', '', container)
     const items = this.getLegendItems()
     for (const [color, label] of items) {