umap-project 2.9.2__py3-none-any.whl → 3.0.0__py3-none-any.whl

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

@@ -1,7 +1,7 @@
 import { DomEvent, DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from './i18n.js'
-import * as Utils from './utils.js'
 import Dialog from './ui/dialog.js'
+import * as Utils from './utils.js'
 
 const SHORTCUTS = {
   DRAW_MARKER: {
@@ -36,9 +36,13 @@ const SHORTCUTS = {
     shortcut: 'Modifier+F',
     label: translate('Search location'),
   },
-  CANCEL: {
+  UNDO: {
     shortcut: 'Modifier+Z',
-    label: translate('Cancel edits'),
+    label: translate('Cancel last edit'),
+  },
+  REDO: {
+    shortcut: 'Modifier+Shift+Z',
+    label: translate('Redo last edit'),
   },
   PREVIEW: {
     shortcut: 'Modifier+E',
@@ -135,14 +139,23 @@ const ENTRIES = {
       <li>${translate('# one hash for main heading')}</li>
       <li>${translate('## two hashes for second heading')}</li>
       <li>${translate('### three hashes for third heading')}</li>
+      <li>${translate('--- for a horizontal rule')}</li>
+    </ul>
+    <h4>${translate('Links')}</h4>
+    <ul>
       <li>${translate('Simple link: [[https://example.com]]')}</li>
       <li>${translate('Link with text: [[https://example.com|text of the link]]')}</li>
+    </ul>
+    <h4>${translate('Images')}</h4>
+    <ul>
       <li>${translate('Image: {{https://image.url.com}}')}</li>
       <li>${translate('Image with custom width (in px): {{https://image.url.com|width}}')}</li>
+    </ul>
+    <h4>${translate('Iframes')}</h4>
+    <ul>
       <li>${translate('Iframe: {{{https://iframe.url.com}}}')}</li>
       <li>${translate('Iframe with custom height (in px): {{{https://iframe.url.com|height}}}')}</li>
       <li>${translate('Iframe with custom height and width (in px): {{{https://iframe.url.com|height*width}}}')}</li>
-      <li>${translate('--- for a horizontal rule')}</li>
     </ul>
   </div>
   `,
@@ -183,7 +196,7 @@ export default class Help {
         .split('+')
         .map((el) => `<kbd>${el}</kbd>`)
         .join('+')
-      label += ` ${shortcut}`
+      label += ` <span class="nobr">${shortcut}</span>`
     } else {
       label += ` (${shortcut})`
     }

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

@@ -94,6 +94,9 @@ export default class Importer extends Utils.WithTemplate {
         case 'datasets':
           import('./importers/datasets.js').then(register)
           break
+        case 'banfr':
+          import('./importers/banfr.js').then(register)
+          break
       }
     }
   }
@@ -173,7 +176,7 @@ export default class Importer extends Utils.WithTemplate {
   showImporters() {
     if (!this.IMPORTERS.length) return
     const [element, { grid }] = Utils.loadTemplateWithRefs(GRID_TEMPLATE)
-    for (const plugin of this.IMPORTERS.sort((a, b) => (a.id > b.id ? 1 : -1))) {
+    for (const plugin of this.IMPORTERS.sort((a, b) => (a.name > b.name ? 1 : -1))) {
       const button = Utils.loadTemplate(
         `<li><button type="button" class="${plugin.id}">${plugin.name}</button></li>`
       )
@@ -246,7 +249,7 @@ export default class Importer extends Utils.WithTemplate {
           tagName: 'option',
           parent: layerSelect,
           textContent: datalayer.options.name,
-          value: L.stamp(datalayer),
+          value: datalayer.id,
         })
       }
     })

umap/static/umap/js/modules/importers/banfr.js

@@ -0,0 +1,93 @@
+import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { uMapAlert as Alert } from '../../components/alerts/alert.js'
+import { BaseAjax, SingleMixin } from '../autocomplete.js'
+import { translate } from '../i18n.js'
+import * as Utils from '../utils.js'
+import { AutocompleteCommunes } from './communesfr.js'
+
+const TEMPLATE = `
+  <div>
+  <h3>Géocodage d’adresses en France</h3>
+  <p>Géocoder un fichier CSV avec la base adresse nationale.</p>
+  <fieldset class="formbox">
+    <legend>Choisir un fichier CSV (encodé en UTF-8)</legend>
+    <input type=file name=file data-ref=csvFile accept=".csv" />
+  </fieldset>
+  <fieldset class="formbox">
+    <legend>Aperçu des données</legend>
+    <table class="table-scrollable" data-ref=table></table>
+  </fieldset>
+  <fieldset class="formbox">
+    <legend>Sélectionner les colonnes à utiliser</legend>
+    <span data-ref="columns"></span>
+  </fieldset>
+  </div>
+`
+
+export class Importer {
+  constructor(umap, options) {
+    this._umap = umap
+    this.name = options.name || 'Géocodage FR'
+    this.id = 'banfr'
+  }
+
+  async open(importer) {
+    let data
+    const [container, { table, columns, csvFile }] =
+      Utils.loadTemplateWithRefs(TEMPLATE)
+    csvFile.addEventListener('change', () => {
+      const reader = new FileReader()
+      reader.onload = (evt) => {
+        data = evt.target.result
+        const rows = csv2geojson.auto(data).slice(0, 5)
+        const cols = Object.keys(rows[0])
+        table.innerHTML = ''
+        columns.innerHTML = ''
+        const tr = document.createElement('tr')
+        for (const column of cols) {
+          tr.appendChild(Utils.loadTemplate(`<th>${column}</th>`))
+          columns.appendChild(
+            Utils.loadTemplate(
+              `<label><input type="checkbox" value="${column}" /> ${column}</label>`
+            )
+          )
+        }
+        table.appendChild(tr)
+        for (const row of rows) {
+          const tr = document.createElement('tr')
+          for (const column of cols) {
+            tr.appendChild(Utils.loadTemplate(`<td>${row[column]}</td>`))
+          }
+          table.appendChild(tr)
+        }
+      }
+      reader.readAsText(csvFile.files[0])
+    })
+
+    const confirm = async (form) => {
+      const formData = new FormData()
+      formData.append('data', csvFile.files[0])
+      for (const option of columns.querySelectorAll('input:checked')) {
+        formData.append('columns', option.value)
+      }
+      const response = await this._umap.request.post(
+        'https://api-adresse.data.gouv.fr/search/csv/',
+        {},
+        formData
+      )
+      if (response?.ok) {
+        importer.raw = await response.text()
+        importer.format = 'csv'
+      }
+    }
+
+    importer.dialog
+      .open({
+        template: container,
+        className: `${this.id} importer dark`,
+        cancel: false,
+        accept: translate('Geocode'),
+      })
+      .then(confirm)
+  }
+}

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

@@ -1,9 +1,9 @@
 import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 import { BaseAjax, SingleMixin } from '../autocomplete.js'
+import { translate } from '../i18n.js'
 import * as Util from '../utils.js'
 import { AutocompleteCommunes } from './communesfr.js'
-import { translate } from '../i18n.js'
-import { uMapAlert as Alert } from '../../components/alerts/alert.js'
 
 const TEMPLATE = `
   <h3>Cadastre</h3>

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

@@ -15,7 +15,7 @@ export class AutocompleteCommunes extends SingleMixin(BaseAjax) {
     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"
+      url = 'https://geo.api.gouv.fr/communes?code={code}&limit=5'
       options = { code: encodeURIComponent(value) }
     }
     return Util.template(url, options)

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

@@ -1,18 +1,16 @@
 import { DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
-import { translate } from './i18n.js'
 import { uMapAlert as Alert } from '../components/alerts/alert.js'
-import { ServerStored } from './saving.js'
-import * as Utils from './utils.js'
 import { MutatingForm } from './form/builder.js'
+import { translate } from './i18n.js'
+import * as Utils from './utils.js'
 
 // Dedicated object so we can deal with a separate dirty status, and thus
 // call the endpoint only when needed, saving one call at each save.
-export class MapPermissions extends ServerStored {
+export class MapPermissions {
   constructor(umap) {
-    super()
     this.setProperties(umap.properties.permissions)
     this._umap = umap
-    this._isDirty = false
+    this.sync = umap.syncEngine.proxy(this)
   }
 
   setProperties(properties) {
@@ -28,6 +26,13 @@ export class MapPermissions extends ServerStored {
     )
   }
 
+  getSyncMetadata() {
+    return {
+      subject: 'mappermissions',
+      metadata: {},
+    }
+  }
+
   render() {
     this._umap.render(['properties.permissions'])
   }
@@ -188,7 +193,6 @@ export class MapPermissions extends ServerStored {
   }
 
   async save() {
-    if (!this.isDirty) return
     const formData = new FormData()
     if (!this.isAnonymousMap() && this.properties.editors) {
       const editors = this.properties.editors.map((u) => u.id)
@@ -247,9 +251,8 @@ export class MapPermissions extends ServerStored {
   }
 }
 
-export class DataLayerPermissions extends ServerStored {
+export class DataLayerPermissions {
   constructor(umap, datalayer) {
-    super()
     this._umap = umap
     this.properties = Object.assign(
       {
@@ -259,6 +262,14 @@ export class DataLayerPermissions extends ServerStored {
     )
 
     this.datalayer = datalayer
+    this.sync = umap.syncEngine.proxy(this)
+  }
+
+  getSyncMetadata() {
+    return {
+      subject: 'datalayerpermissions',
+      metadata: { id: this.datalayer.id },
+    }
   }
 
   edit(container) {
@@ -289,7 +300,6 @@ export class DataLayerPermissions extends ServerStored {
   }
 
   async save() {
-    if (!this.isDirty) return
     const formData = new FormData()
     formData.append('edit_status', this.properties.edit_status)
     const [data, response, error] = await this._umap.server.post(

umap/static/umap/js/modules/rendering/icon.js

@@ -1,11 +1,11 @@
 import {
+  DivIcon,
   DomEvent,
   DomUtil,
-  DivIcon,
   Icon,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
-import * as Utils from '../utils.js'
 import { SCHEMA } from '../schema.js'
+import * as Utils from '../utils.js'
 
 export function getClass(name) {
   switch (name) {
@@ -15,6 +15,8 @@ export function getClass(name) {
       return Ball
     case 'Drop':
       return Drop
+    case 'Raw':
+      return Raw
     default:
       return DefaultIcon
   }
@@ -152,6 +154,17 @@ const Circle = BaseIcon.extend({
   },
 })
 
+const Raw = DefaultIcon.extend({
+  default_options: {
+    iconSize: new L.Point(48, 48),
+    popupAnchor: new L.Point(0, 0),
+    tooltipAnchor: new L.Point(0, 0),
+    className: 'umap-raw-icon',
+  },
+
+  _getColor: () => 'transparent',
+})
+
 const Drop = DefaultIcon.extend({
   default_options: {
     iconAnchor: new L.Point(16, 42),

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

@@ -1,9 +1,9 @@
-import { FeatureGroup, DomUtil } from '../../../../vendors/leaflet/leaflet-src.esm.js'
+import colorbrewer from '../../../../vendors/colorbrewer/colorbrewer.js'
+import { DomUtil, FeatureGroup } from '../../../../vendors/leaflet/leaflet-src.esm.js'
 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'
+import { LayerMixin } from './base.js'
 
 // Layer where each feature color is relative to the others,
 // so we need all features before behing able to set one
@@ -117,7 +117,7 @@ export const Choropleth = FeatureGroup.extend({
   },
 
   _getValue: function (feature) {
-    const key = this.datalayer.options.choropleth.property || 'value'
+    const key = this.datalayer.options.choropleth?.property || 'value'
     const value = +feature.properties[key]
     if (!Number.isNaN(value)) return value
   },
@@ -130,12 +130,12 @@ export const Choropleth = FeatureGroup.extend({
       this.options.colors = []
       return
     }
-    const mode = this.datalayer.options.choropleth.mode
-    let classes = +this.datalayer.options.choropleth.classes || 5
+    const mode = this.datalayer.options.choropleth?.mode
+    let classes = +this.datalayer.options.choropleth?.classes || 5
     let breaks
     classes = Math.min(classes, values.length)
     if (mode === 'manual') {
-      const manualBreaks = this.datalayer.options.choropleth.breaks
+      const manualBreaks = this.datalayer.options.choropleth?.breaks
       if (manualBreaks) {
         breaks = manualBreaks
           .split(',')

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

@@ -1,10 +1,10 @@
+import { Evented } from '../../../../vendors/leaflet/leaflet-src.esm.js'
 // WARNING must be loaded dynamically, or at least after leaflet.markercluster
 // Uses global L.MarkerCluster and L.MarkerClusterGroup, not exposed as ESM
 import { translate } from '../../i18n.js'
-import { LayerMixin } from './base.js'
 import * as Utils from '../../utils.js'
-import { Evented } from '../../../../vendors/leaflet/leaflet-src.esm.js'
 import { Cluster as ClusterIcon } from '../icon.js'
+import { LayerMixin } from './base.js'
 
 const MarkerCluster = L.MarkerCluster.extend({
   // Custom class so we can call computeTextColor

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

@@ -1,14 +1,14 @@
 // Uses global L.HeatLayer, not exposed as ESM
 import {
-  Marker,
+  Bounds,
   LatLng,
+  Marker,
   latLngBounds,
-  Bounds,
   point,
 } from '../../../../vendors/leaflet/leaflet-src.esm.js'
-import { LayerMixin } from './base.js'
-import * as Utils from '../../utils.js'
 import { translate } from '../../i18n.js'
+import * as Utils from '../../utils.js'
+import { LayerMixin } from './base.js'
 
 export const Heat = L.HeatLayer.extend({
   statics: {

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

@@ -1,18 +1,18 @@
 // Goes here all code related to Leaflet, DOM and user interactions.
 import {
   Map as BaseMap,
-  DomUtil,
+  Control,
   DomEvent,
-  latLngBounds,
+  DomUtil,
   latLng,
-  Control,
+  latLngBounds,
   setOptions,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
-import { translate } from '../i18n.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
+import DropControl from '../drop.js'
+import { translate } from '../i18n.js'
 import * as Utils from '../utils.js'
 import * as Icon from './icon.js'
-import DropControl from '../drop.js'
 
 // Those options are not saved on the server, so they can live here
 // instead of in umap.properties
@@ -91,6 +91,10 @@ 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 () {
@@ -265,8 +269,12 @@ export const LeafletMap = BaseMap.extend({
     this.renderUI()
   },
 
-  renderUI: function () {
+  pullProperties() {
     setOptions(this, this._umap.properties)
+  },
+
+  renderUI: function () {
+    this.pullProperties()
     if (this.options.scrollWheelZoom) {
       this.scrollWheelZoom.enable()
       this.dragging.enable()

umap/static/umap/js/modules/rendering/popup.js

@@ -1,11 +1,11 @@
 import {
+  Popup as BasePopup,
   DomEvent,
   DomUtil,
   Path,
-  Popup as BasePopup,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
-import loadTemplate from './template.js'
 import Browser from '../browser.js'
+import loadTemplate from './template.js'
 
 export default function loadPopup(name) {
   switch (name) {

umap/static/umap/js/modules/rendering/template.js

@@ -1,8 +1,8 @@
-import { DomUtil, DomEvent } from '../../../vendors/leaflet/leaflet-src.esm.js'
-import { translate, getLocale } from '../i18n.js'
+import { DomEvent, DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { getLocale, translate } from '../i18n.js'
+import { Request } from '../request.js'
 import * as Utils from '../utils.js'
 import * as Icon from './icon.js'
-import { Request } from '../request.js'
 
 export default async function loadTemplate(name, feature, container) {
   let klass = PopupTemplate

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

@@ -1,18 +1,18 @@
 // Goes here all code related to Leaflet, DOM and user interactions.
 import {
-  Marker,
-  Polyline,
-  Polygon,
   CircleMarker as BaseCircleMarker,
+  DomEvent,
   DomUtil,
-  LineUtil,
-  latLng,
   LatLng,
   LatLngBounds,
-  DomEvent,
+  LineUtil,
+  Marker,
+  Polygon,
+  Polyline,
+  latLng,
 } from '../../../vendors/leaflet/leaflet-src.esm.js'
-import { translate } from '../i18n.js'
 import { uMapAlert as Alert } from '../../components/alerts/alert.js'
+import { translate } from '../i18n.js'
 import * as Utils from '../utils.js'
 import * as Icon from './icon.js'
 
@@ -97,7 +97,6 @@ const FeatureMixin = {
   },
 
   onCommit: function () {
-    this.feature.pullGeometry(false)
     this.feature.onCommit()
   },
 }
@@ -112,7 +111,7 @@ const PointMixin = {
     this.on('dragend', (event) => {
       this.isDirty = true
       this.feature.edit(event)
-      this.feature.pullGeometry(false)
+      // this.feature.pullGeometry(false)
     })
     if (!this.feature.isReadOnly()) this.on('mouseover', this._enableDragging)
     this.on('mouseout', this._onMouseOut)
@@ -303,13 +302,13 @@ const PathMixin = {
     this._container = null
     FeatureMixin.onAdd.call(this, map)
     this.setStyle()
-    if (this.editing?.enabled()) this.editing.addHooks()
+    if (this.editor?.enabled()) this.editor.addHooks()
     this.resetTooltip()
     this._path.dataset.feature = this.feature.id
   },
 
   onRemove: function (map) {
-    if (this.editing?.enabled()) this.editing.removeHooks()
+    if (this.editor?.enabled()) this.editor.removeHooks()
     FeatureMixin.onRemove.call(this, map)
   },
 
@@ -362,6 +361,13 @@ const PathMixin = {
   isOnScreen: function (bounds) {
     return bounds.overlaps(this.getBounds())
   },
+
+  _setLatLngs: function (latlngs) {
+    this.parentClass.prototype._setLatLngs.call(this, latlngs)
+    if (this.editor?.enabled()) {
+      this.editor.reset()
+    }
+  },
 }
 
 export const LeafletPolyline = Polyline.extend({

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

@@ -1,9 +1,9 @@
 import { DomEvent, DomUtil, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
-import { translate } from './i18n.js'
-import * as Utils from './utils.js'
 import { AutocompleteDatalist } from './autocomplete.js'
-import Orderable from './orderable.js'
 import { MutatingForm } from './form/builder.js'
+import { translate } from './i18n.js'
+import Orderable from './orderable.js'
+import * as Utils from './utils.js'
 
 const EMPTY_VALUES = ['', undefined, null]
 
@@ -17,20 +17,10 @@ class Rule {
     this.parse()
   }
 
-  get isDirty() {
-    return this._isDirty
-  }
-
-  set isDirty(status) {
-    this._isDirty = status
-    if (status) this._umap.isDirty = status
-  }
-
   constructor(umap, condition = '', options = {}) {
     // TODO make this public properties when browser coverage is ok
     // cf https://caniuse.com/?search=public%20class%20field
     this._condition = null
-    this._isDirty = false
     this.OPERATORS = [
       ['>', this.gt],
       ['<', this.lt],
@@ -190,17 +180,25 @@ class Rule {
 
   _delete() {
     this._umap.rules.rules = this._umap.rules.rules.filter((rule) => rule !== this)
+    this._umap.rules.commit()
+  }
+
+  setter(key, value) {
+    const oldRules = Utils.CopyJSON(this._umap.properties.rules || {})
+    Utils.setObjectValue(this, key, value)
+    this._umap.rules.commit()
+    this._umap.sync.update('properties.rules', this._umap.properties.rules, oldRules)
   }
 }
 
 export default class Rules {
   constructor(umap) {
     this._umap = umap
-    this.rules = []
     this.load()
   }
 
   load() {
+    this.rules = []
     if (!this._umap.properties.rules?.length) return
     for (const { condition, options } of this._umap.properties.rules) {
       if (!condition) continue
@@ -222,8 +220,8 @@ export default class Rules {
     else if (finalIndex > initialIndex) newIdx = referenceIdx
     else newIdx = referenceIdx + 1
     this.rules.splice(newIdx, 0, moved)
-    moved.isDirty = true
     this._umap.render(['rules'])
+    this.commit()
   }
 
   edit(container) {
@@ -242,7 +240,6 @@ export default class Rules {
 
   addRule() {
     const rule = new Rule(this._umap)
-    rule.isDirty = true
     this.rules.push(rule)
     rule.edit(map)
   }