umap-project 3.4.0b1__py3-none-any.whl → 3.4.2__py3-none-any.whl

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

@@ -25,7 +25,7 @@ export function getLocale() {
 }
 
 // @function translate(string: String, data?: Object): String
-// Actually try to translate the `string`, with optionnal variable passed in `data`.
+// Actually try to translate the `string`, with optional variable passed in `data`.
 export function translate(string, data = {}) {
   if (locale && locales[locale] && locales[locale][string] !== undefined) {
     string = locales[locale][string]

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

@@ -1,13 +1,10 @@
-import {
-  DomEvent,
-  DomUtil,
-  LatLngBounds,
-} from '../../vendors/leaflet/leaflet-src.esm.js'
+import { LatLngBounds } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../components/alerts/alert.js'
 import { translate } from './i18n.js'
 import { SCHEMA } from './schema.js'
 import Dialog from './ui/dialog.js'
 import * as Utils from './utils.js'
+import * as DOMUtils from './domutils.js'
 
 const TEMPLATE = `
   <div class="umap-import">
@@ -203,18 +200,15 @@ export default class Importer extends Utils.WithTemplate {
       button.toggleAttribute('hidden', false)
     }
     for (const type of this.TYPES) {
-      DomUtil.element({
-        tagName: 'option',
-        parent: this.qs('[name=format]'),
-        value: type,
-        textContent: type,
-      })
+      this.qs('[name=format]').appendChild(
+        DOMUtils.loadTemplate(`<option value="${type}">${type}</option>`)
+      )
     }
     this._umap.help.parse(this.container)
     this.qs('[name=submit]').addEventListener('click', () => this.submit())
-    DomEvent.on(this.qs('[type=file]'), 'change', this.onFileChange, this)
+    this.qs('[type=file]').addEventListener('change', () => this.onFileChange())
     for (const element of this.container.querySelectorAll('[onchange]')) {
-      DomEvent.on(element, 'change', this.onChange, this)
+      element.addEventListener('change', () => this.onChange())
     }
   }
 
@@ -253,21 +247,18 @@ export default class Importer extends Utils.WithTemplate {
     layerSelect.innerHTML = ''
     this._umap.datalayers.reverse().map((datalayer) => {
       if (datalayer.isLoaded() && !datalayer.isRemoteLayer()) {
-        DomUtil.element({
-          tagName: 'option',
-          parent: layerSelect,
-          textContent: datalayer.getName(),
-          value: datalayer.id,
-        })
+        layerSelect.appendChild(
+          DOMUtils.loadTemplate(
+            `<option value="${datalayer.id}">${datalayer.getName()}</option>`
+          )
+        )
       }
     })
-    DomUtil.element({
-      tagName: 'option',
-      value: '',
-      textContent: translate('Import in a new layer'),
-      parent: layerSelect,
-      selected: true,
-    })
+    layerSelect.appendChild(
+      DOMUtils.loadTemplate(
+        `<option value="" selected>${translate('Import in a new layer')}</option>`
+      )
+    )
   }
 
   open() {
@@ -353,7 +344,7 @@ export default class Importer extends Utils.WithTemplate {
 
   async copy() {
     // Format may be guessed from file later.
-    // Usefull in case of multiple files with different formats.
+    // Useful in case of multiple files with different formats.
     if (!this.format && !this.files.length) {
       this.onError(translate('Please choose a format'))
       return false

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

@@ -1,4 +1,3 @@
-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'

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

@@ -1,26 +1,28 @@
-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 * as DOMUtils from '../domutils.js'
 import { AutocompleteCommunes } from './communesfr.js'
 
 const TEMPLATE = `
-  <h3>Cadastre</h3>
-  <p>Importer les données cadastrales d’une commune française.</p>
-  <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>
+    <h3>Cadastre</h3>
+    <p>Importer les données cadastrales d’une commune française.</p>
+    <div class="formbox">
+      <select name="theme" data-ref="select">
+        <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>
   </div>
 `
 
@@ -33,9 +35,7 @@ export class Importer {
   async open(importer) {
     let boundary = null
     let boundaryName = null
-    const container = DomUtil.create('div')
-    container.innerHTML = TEMPLATE
-    const select = container.querySelector('select')
+    const [container, { select }] = DOMUtils.loadTemplateWithRefs(TEMPLATE)
     const options = {
       placeholder: 'Nom ou code INSEE…',
       url: 'https://geo.api.gouv.fr/communes?nom={q}&limit=5',

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

@@ -1,6 +1,6 @@
-import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { BaseAjax, SingleMixin } from '../autocomplete.js'
 import * as Util from '../utils.js'
+import * as DOMUtils from '../domutils.js'
 
 export class AutocompleteCommunes extends SingleMixin(BaseAjax) {
   createResult(item) {
@@ -29,13 +29,12 @@ export class Importer {
   }
 
   async open(importer) {
-    const container = DomUtil.create('div')
-    DomUtil.createTitle(container, this.name)
-    DomUtil.element({
-      tagName: 'p',
-      parent: container,
-      textContent: "Importer les contours d'une commune française.",
-    })
+    const container = DOMUtils.loadTemplate(`
+      <div>
+        <h3>${this.name}</h3>
+        <p>Importer les contours d'une commune française.</p>
+      </div>
+    `)
     const options = {
       placeholder: 'Nom ou code INSEE…',
       url: 'https://geo.api.gouv.fr/communes?nom={q}&limit=5',

umap/static/umap/js/modules/importers/datasets.js

@@ -1,5 +1,5 @@
-import { DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from '../i18n.js'
+import * as DOMUtils from '../domutils.js'
 
 export class Importer {
   constructor(map, options) {
@@ -9,20 +9,20 @@ export class Importer {
   }
 
   async open(importer) {
-    const container = DomUtil.create('div', 'formbox')
-    DomUtil.element({ tagName: 'h3', textContent: this.name, parent: container })
-    const select = DomUtil.create('select', '', container)
-    const noPreset = DomUtil.element({
-      tagName: 'option',
-      parent: select,
-      value: '',
-      textContent: translate('Choose a dataset'),
-    })
+    const [container, { select }] = DOMUtils.loadTemplateWithRefs(`
+      <div class="formbox">
+        <h3>${this.name}</h3>
+        <select data-ref="select">
+          <option value="">${translate('Choose a dataset')}</option>
+        </select>
+      </div>
+    `)
+
     for (const dataset of this.choices) {
-      const option = DomUtil.create('option', '', select)
-      option.value = dataset.url
-      option.textContent = dataset.label
-      option.dataset.format = dataset.format || 'geojson'
+      const option = DOMUtils.loadTemplate(
+        `<option value="${dataset.url}" data-format="${dataset.format || 'geojson'}">${dataset.label}</option>`
+      )
+      select.appendChild(option)
     }
     const confirm = () => {
       if (select.value) {

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

@@ -1,8 +1,8 @@
-import { DomEvent, 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 * as DOMUtils from '../domutils.js'
 
 const BOUNDARY_TYPES = {
   admin_6: 'département',
@@ -14,18 +14,20 @@ const BOUNDARY_TYPES = {
 }
 
 const TEMPLATE = `
-  <h3>GeoDataMine</h3>
-  <p>${translate('GeoDataMine: thematic data from OpenStreetMap')}.</p>
-  <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>
+    <h3>GeoDataMine</h3>
+    <p>${translate('GeoDataMine: thematic data from OpenStreetMap')}.</p>
+    <div class="formbox">
+      <select name="theme" data-ref="select">
+        <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>
   </div>
 `
 
@@ -49,20 +51,16 @@ export class Importer {
   async open(importer) {
     let boundary = null
     let boundaryName = null
-    const container = DomUtil.create('div')
-    container.innerHTML = TEMPLATE
+    const [container, { select }] = DOMUtils.loadTemplateWithRefs(TEMPLATE)
     const response = await this.umap.request.get(`${this.baseUrl}/themes`)
-    const select = container.querySelector('select')
     if (response?.ok) {
       const { themes } = await response.json()
       themes.sort((a, b) => Utils.naturalSort(a['name:fr'], b['name:fr']))
       for (const theme of themes) {
-        DomUtil.element({
-          tagName: 'option',
-          value: theme.id,
-          textContent: theme['name:fr'],
-          parent: select,
-        })
+        const option = DOMUtils.loadTemplate(
+          `<option value="${theme.id}">${theme['name:fr']}</option>`
+        )
+        select.appendChild(option)
       }
     } else {
       console.error(response)

umap/static/umap/js/modules/importers/opendata.js

@@ -63,6 +63,16 @@ const PORTALS = [
     url: 'https://admin.geospm.com',
     platform: 'prodige',
   },
+  {
+    name: 'SNCF',
+    url: 'https://ressources.data.sncf.com',
+    platform: 'opendatasoft',
+  },
+  {
+    name: 'Réseau STAR Rennes',
+    url: 'https://data.explore.star.fr',
+    platform: 'opendatasoft',
+  },
   {
     name: 'Toulouse Métropole',
     url: 'https://data.toulouse-metropole.fr',

umap/static/umap/js/modules/importers/overpass.js

@@ -1,22 +1,24 @@
-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 DOMUtils from '../domutils.js'
 
 const TEMPLATE = `
-  <h3>Overpass</h3>
-  <label>
-    <span data-help="overpassImporter">${translate('Expression')}</span>
-    <input type="text" placeholder="amenity=drinking_water" name="tags" />
-  </label>
-  <label>
-    ${translate('Geometry mode')}
-    <select name="out">
-      <option value="geom" selected>${translate('Default')}</option>
-      <option value="center">${translate('Only geometry centers')}</option>
-    </select>
-  </label>
-  <label id="area"><span>${translate('Search area')}</span></label>
+  <div>
+    <h3>Overpass</h3>
+    <label>
+      <span data-help="overpassImporter">${translate('Expression')}</span>
+      <input type="text" placeholder="amenity=drinking_water" name="tags" data-ref="tags" />
+    </label>
+    <label>
+      ${translate('Geometry mode')}
+      <select name="out">
+        <option value="geom" selected>${translate('Default')}</option>
+        <option value="center">${translate('Only geometry centers')}</option>
+      </select>
+    </label>
+    <label data-ref="area" id="area"><span>${translate('Search area')}</span></label>
+  </div>
 `
 
 class Autocomplete extends SingleMixin(BaseAjax) {
@@ -57,12 +59,11 @@ export class Importer {
   }
 
   async open(importer) {
-    const container = DomUtil.create('div')
-    container.innerHTML = TEMPLATE
+    const [container, { area, tags }] = DOMUtils.loadTemplateWithRefs(TEMPLATE)
     if (this.expression) {
-      container.querySelector('[name=tags]').value = this.expression
+      tags.value = this.expression
     }
-    this.autocomplete = new Autocomplete(container.querySelector('#area'), {
+    this.autocomplete = new Autocomplete(area, {
       url: this.searchUrl,
       placeholder: translate(
         'Type area name, or let empty to load data in current map view'

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

@@ -1,8 +1,4 @@
 import * as Utils from './utils.js'
-import { translate } from './i18n.js'
-import Orderable from './orderable.js'
-import { uMapAlert as Alert } from '../components/alerts/alert.js'
-import { Form } from './form/builder.js'
 
 export class DataLayerManager extends Object {
   add(datalayer) {
@@ -11,7 +7,7 @@ export class DataLayerManager extends Object {
   active() {
     return Object.values(this)
       .filter((datalayer) => !datalayer.isDeleted)
-      .sort((a, b) => a.rank > b.rank)
+      .sort((a, b) => a.rank - b.rank)
   }
   reverse() {
     return this.active().reverse()
@@ -116,263 +112,3 @@ export class FeatureManager extends Map {
     return this.all()[index - 1]
   }
 }
-
-export class FieldManager extends Map {
-  constructor(parent, dialog) {
-    super()
-    this.parent = parent
-    this.dialog = dialog
-    this.parent.properties.fields ??= []
-    this.pull()
-  }
-
-  pull() {
-    this.clear()
-    for (const field of this.parent.properties.fields) {
-      this.add(field)
-    }
-  }
-
-  push() {
-    this.parent.properties.fields = this.all().map((field) => {
-      // We don't want to keep the reference, otherwise editing
-      // it will also change the old value
-      return { ...field }
-    })
-  }
-
-  async commit() {
-    return new Promise((resolve) => {
-      const oldFields = Utils.CopyJSON(this.parent.properties.fields)
-      resolve()
-      this.push()
-      this.parent.sync.update(
-        'properties.fields',
-        this.parent.properties.fields,
-        oldFields
-      )
-    })
-  }
-
-  add(field) {
-    if (!field?.key) {
-      console.error('Invalid field', field)
-      return
-    }
-    field.type ??= 'String'
-    // Copy object, so not to affect original
-    // when edited.
-    this.set(field.key, { ...field })
-    this.push()
-  }
-
-  delete(key) {
-    super.delete(key)
-    this.push()
-  }
-
-  all() {
-    return Array.from(this.values())
-  }
-
-  edit(container) {
-    const [root, { ul, add, manageFilters }] = Utils.loadTemplateWithRefs(`
-      <details id="fields-management">
-        <summary><h4>${translate('Manage Fields')}</h4></summary>
-        <fieldset>
-          <ul data-ref=ul></ul>
-          <div class="button-bar half">
-            <button type="button" data-ref=add>${translate('Add a new field')}</button>
-            <button type="button" data-ref="manageFilters">${translate('Manage filters')}</button>
-          </div>
-        </fieldset>
-      </details>
-    `)
-    container.appendChild(root)
-    add.hidden = this.parent.isRemoteLayer?.()
-    add.addEventListener('click', () => {
-      this.editField().then(() => {
-        this.parent.edit().then((panel) => {
-          panel.scrollTo('details#fields-management')
-        })
-      })
-    })
-    manageFilters.addEventListener('click', () => this.parent.filters.edit())
-    for (const field of this.all()) {
-      const [row, { edit, del, addFilter, editFilter }] = Utils.loadTemplateWithRefs(
-        `<li class="orderable with-toolbox" data-key="${field.key}">
-          <span>
-            <i class="icon icon-16 icon-field-${field.type}" title="${field.type}"></i>
-            ${field.key}
-          </span>
-          <span>
-            <button class="icon icon-16 icon-edit" title="${translate('Edit this field')}" data-ref=edit></button>
-            <button class="icon icon-16 icon-filters" title="${translate('Edit filter')}" data-ref=editFilter></button>
-            <button class="icon icon-16 icon-filters-empty" title="${translate('Add a filter for this field')}" data-ref=addFilter></button>
-            <button class="icon icon-16 icon-delete" title="${translate('Delete this field')}" data-ref=del></button>
-            <i class="icon icon-16 icon-drag" title="${translate('Drag to reorder')}"></i>
-          </span>
-        </li>`
-      )
-      editFilter.hidden = !this.parent.filters.has(field.key)
-      addFilter.hidden = this.parent.filters.has(field.key)
-      del.hidden = this.parent.isRemoteLayer?.()
-      editFilter.addEventListener('click', () =>
-        this.parent.filters.createFilterForm(field.key)
-      )
-      addFilter.addEventListener('click', () =>
-        this.parent.filters.createFilterForm(field.key)
-      )
-      ul.appendChild(row)
-      edit.addEventListener('click', () => {
-        this.editField(field.key).then(() => {
-          this.parent.edit().then((panel) => {
-            panel.scrollTo('details#fields-management')
-          })
-        })
-      })
-      del.addEventListener('click', () => {
-        this.confirmDelete(field.key).then(() => {
-          this.parent.edit().then((panel) => {
-            panel.scrollTo('details#fields-management')
-          })
-        })
-      })
-    }
-    const onReorder = (src, dst, initialIndex, finalIndex) => {
-      const orderedKeys = Array.from(ul.querySelectorAll('li')).map(
-        (el) => el.dataset.key
-      )
-      const oldFields = Utils.CopyJSON(this.parent.properties.fields)
-      const copy = Object.fromEntries(this)
-      this.clear()
-      for (const key of orderedKeys) {
-        this.add(copy[key])
-      }
-      this.parent.sync.update(
-        'properties.fields',
-        this.parent.properties.fields,
-        oldFields
-      )
-    }
-    const orderable = new Orderable(ul, onReorder)
-  }
-
-  async editField(name) {
-    if (!name && this.parent.isRemoteLayer?.()) return
-    const FIELD_TYPES = [
-      'String',
-      'Text',
-      'Number',
-      'Date',
-      'Datetime',
-      'Enum',
-      'Boolean',
-    ]
-    const field = this.get(name) || {}
-    const metadatas = [
-      [
-        'key',
-        {
-          handler: 'BlurInput',
-          label: translate('Field Name'),
-          disabled: this.parent.isRemoteLayer?.(),
-        },
-      ],
-      [
-        'type',
-        {
-          handler: 'Select',
-          selectOptions: FIELD_TYPES,
-          label: translate('Field Type'),
-        },
-      ],
-    ]
-    const form = new Form(field, metadatas)
-
-    const [container, { body, addFilter }] = Utils.loadTemplateWithRefs(`
-      <div>
-        <h3>${translate('Manage field')}</h3>
-        <div data-ref=body></div>
-        <button type="button" data-ref=addFilter hidden><i class="icon icon-16 icon-filters"></i>${translate('Add filter for this field')}</button>
-      </div>
-    `)
-    body.appendChild(form.build())
-    if (this.parent.filters) {
-      addFilter.addEventListener('click', () => {
-        this.dialog.accept()
-        this.parent.filters.createFilterForm(field.key)
-      })
-      addFilter.hidden = false
-    }
-
-    return this.dialog.open({ template: container }).then(() => {
-      if (!this.validateName(field.key, field.key !== name)) {
-        this.pull()
-        return
-      }
-      this.parent.sync.startBatch()
-      const oldFields = Utils.CopyJSON(this.parent.properties.fields)
-      if (!name) {
-        this.add(field)
-      } else if (name !== field.key) {
-        this.clear()
-        // Keep order on rename
-        for (const old of oldFields) {
-          if (old.key === name) {
-            this.add(field)
-          } else {
-            this.add(old)
-          }
-        }
-        this.parent.renameField(name, field.key)
-      } else {
-        this.push()
-      }
-      this.parent.sync.update(
-        'properties.fields',
-        this.parent.properties.fields,
-        oldFields
-      )
-      this.parent.sync.commitBatch()
-      this.parent.render(['properties.fields'])
-    })
-  }
-
-  validateName(name, isNew = false) {
-    if (!name) {
-      Alert.error(translate('Name cannot be empty.'))
-      return false
-    }
-    if (name.includes('.')) {
-      Alert.error(translate('Name “{name}” should not contain a dot.', { name }))
-      return false
-    }
-    if (isNew && this.has(name)) {
-      Alert.error(translate('This name already exists: “{name}”', { name }))
-      return false
-    }
-    return true
-  }
-
-  async confirmDelete(name) {
-    return this.dialog
-      .confirm(translate('Are you sure you want to delete this field on all the data?'))
-      .then(() => {
-        this.parent.sync.startBatch()
-        const oldFields = Utils.CopyJSON(this.parent.properties.fields)
-        this.delete(name)
-        this.push()
-        if (this.parent.filters.has(name)) {
-          this.parent.filters.remove(name)
-        }
-        this.parent.deleteField(name)
-        this.parent.sync.update(
-          'properties.fields',
-          this.parent.properties.fields,
-          oldFields
-        )
-        this.parent.sync.commitBatch()
-      })
-  }
-}

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

@@ -1,4 +1,3 @@
-import { DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { uMapAlert as Alert } from '../components/alerts/alert.js'
 import { MutatingForm } from './form/builder.js'
 import { translate } from './i18n.js'
@@ -177,8 +176,11 @@ export class MapPermissions {
       Alert.info(translate('Please save the map first'))
       return
     }
-    const container = DomUtil.create('div', 'umap-edit-permissions')
-    DomUtil.createTitle(container, translate('Update permissions'), 'icon-key')
+    const container = DOMUtils.loadTemplate(`
+      <div class="umap-edit-permissions">
+        <h3><i class="icon icon-16 icon-key"></i> ${translate('Update permissions')}</h3>
+      </div>
+    `)
     if (this.isAnonymousMap()) this._editAnonymous(container)
     else this._editWithOwner(container)
     this._editDatalayers(container)