umap-project 3.3.2__py3-none-any.whl → 3.4.0__py3-none-any.whl

umap/static/umap/js/modules/form/builder.js

@@ -1,7 +1,7 @@
 import { translate } from '../i18n.js'
 import { SCHEMA } from '../schema.js'
 import * as Utils from '../utils.js'
-import getClass from './fields.js'
+import { getClass } from './fields.js'
 
 export class Form extends Utils.WithEvents {
   constructor(obj, fields, properties) {
@@ -84,7 +84,7 @@ export class Form extends Utils.WithEvents {
 
   getName(field) {
     const fieldEls = field.split('.')
-    return fieldEls[fieldEls.length - 1]
+    return Utils.escapeHTML(fieldEls[fieldEls.length - 1])
   }
 
   fetchAll() {
@@ -107,14 +107,18 @@ export class Form extends Utils.WithEvents {
 
   finish() {}
 
-  getTemplate(helper) {
+  getHelperTemplate(helper) {
     let tpl = helper.getTemplate()
     if (helper.properties.label && !tpl.includes(helper.properties.label)) {
       tpl = `<label>${helper.properties.label}${tpl}</label>`
     }
+    return tpl
+  }
+
+  getTemplate(helper) {
     return `
       <div class="formbox" data-ref=container>
-        ${tpl}
+        ${this.getHelperTemplate(helper)}
         <small class="help-text" data-ref=helpText></small>
       </div>`
   }
@@ -132,7 +136,6 @@ export class MutatingForm extends Form {
     const customHandlers = {
       sortKey: 'PropertyInput',
       easing: 'Switch',
-      facetKey: 'PropertyInput',
       slugKey: 'PropertyInput',
       labelKey: 'PropertyInput',
       color: 'ColorPicker',

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

@@ -8,15 +8,15 @@ import * as Icon from '../rendering/icon.js'
 import { SCHEMA } from '../schema.js'
 import * as Utils from '../utils.js'
 
-const Fields = {}
+export const Fields = {}
 
-export default function getClass(name) {
+export function getClass(name) {
   if (typeof name === 'function') return name
   if (!Fields[name]) throw Error(`Unknown class ${name}`)
   return Fields[name]
 }
 
-class BaseElement {
+Fields.Base = class {
   constructor(builder, field, properties) {
     this.builder = builder
     this.obj = this.builder.obj
@@ -25,7 +25,7 @@ class BaseElement {
     this.setProperties(properties)
     this.fieldEls = this.field.split('.')
     this.name = this.builder.getName(field)
-    this.id = `${this.builder.properties.id || Date.now()}.${this.name}`
+    this.id = `id.${this.builder.properties.id || Date.now()}.${this.name}`
   }
 
   getDefaultProperties() {
@@ -49,6 +49,7 @@ class BaseElement {
     this.elements = elements
     this.container = elements.container
     this.form.appendChild(this.root)
+    return [root, elements]
   }
 
   getTemplate() {
@@ -56,6 +57,7 @@ class BaseElement {
   }
 
   build() {
+    if (!this.elements.helpText) return
     if (this.properties.helpText) {
       this.elements.helpText.textContent = this.properties.helpText
     } else {
@@ -113,9 +115,7 @@ class BaseElement {
   getLabelTemplate() {
     const label = this.properties.label
     const help = this.properties.helpEntries?.join() || ''
-    return label
-      ? `<label title="${label}" data-ref=label data-help="${help}">${label}</label>`
-      : ''
+    return label ? `<label data-ref=label data-help="${help}">${label}</label>` : ''
   }
 
   fetch() {}
@@ -129,7 +129,7 @@ class BaseElement {
   }
 }
 
-Fields.Textarea = class extends BaseElement {
+Fields.Textarea = class extends Fields.Base {
   getTemplate() {
     return `<textarea placeholder="${this.properties.placeholder || ''}" name="${this.name}" data-ref=textarea></textarea>`
   }
@@ -169,7 +169,7 @@ Fields.Textarea = class extends BaseElement {
   }
 }
 
-Fields.Input = class extends BaseElement {
+Fields.Input = class extends Fields.Base {
   getTemplate() {
     return `<input type="${this.type()}" name="${this.name}" placeholder="${this.properties.placeholder || ''}" data-ref=input />`
   }
@@ -190,6 +190,9 @@ Fields.Input = class extends BaseElement {
     if (this.properties.step) {
       this.input.step = this.properties.step
     }
+    if (this.properties.disabled) {
+      this.input.disabled = true
+    }
     this.fetch()
     this.listenForSync()
     this.input.addEventListener('keydown', (event) => this.onKeyDown(event))
@@ -296,7 +299,41 @@ Fields.BlurFloatInput = class extends FloatMixin(Fields.BlurInput) {
   }
 }
 
-Fields.CheckBox = class extends BaseElement {
+const DateMixin = (Base) =>
+  class extends Base {
+    toHTML() {
+      const raw = super.toHTML()
+      if (!raw) return null
+      const parsed = Utils.parseNaiveDate(raw)
+      if (!parsed) return null
+      return parsed.toISOString().substring(0, 10)
+    }
+
+    type() {
+      return 'date'
+    }
+  }
+
+Fields.DateInput = class extends DateMixin(Fields.Input) {}
+
+const DateTimeMixin = (Base) =>
+  class extends Base {
+    toHTML() {
+      const raw = super.toHTML()
+      if (!raw) return null
+      const datetime = new Date(raw)
+      if (isNaN(datetime)) return null
+      return datetime.toISOString()
+    }
+
+    type() {
+      return 'datetime-local'
+    }
+  }
+
+Fields.DateTimeInput = class extends DateTimeMixin(Fields.Input) {}
+
+Fields.CheckBox = class extends Fields.Base {
   getTemplate() {
     return `<input type=checkbox name="${this.name}" data-ref=input />`
   }
@@ -327,7 +364,7 @@ Fields.CheckBox = class extends BaseElement {
   }
 }
 
-Fields.CheckBoxes = class extends BaseElement {
+Fields.CheckBoxes = class extends Fields.Base {
   getInputTemplate(value, label) {
     return `<label><input type=checkbox value="${value}" name="${this.name}" data-ref=input />${label}</label>`
   }
@@ -350,13 +387,16 @@ Fields.CheckBoxes = class extends BaseElement {
   }
 }
 
-Fields.Select = class extends BaseElement {
+Fields.Select = class extends Fields.Base {
   getTemplate() {
     return `<select name="${this.name}" data-ref=select></select>`
   }
 
   build() {
     this.select = this.elements.select
+    if (this.properties.disabled) {
+      this.select.disabled = true
+    }
     this.validValues = []
     this.buildOptions()
     this.select.addEventListener('change', () => this.sync())
@@ -423,7 +463,7 @@ Fields.IntSelect = class extends Fields.Select {
   }
 }
 
-Fields.EditableText = class extends BaseElement {
+Fields.EditableText = class extends Fields.Base {
   getTemplate() {
     return `<span class="${this.properties.className || ''}" data-ref=input></span>`
   }
@@ -579,12 +619,9 @@ Fields.SlideshowDelay = class extends Fields.IntSelect {
   }
 }
 
-Fields.DataLayerSwitcher = class extends Fields.Select {
+const BaseDataLayerSwitcher = class extends Fields.Select {
   getOptions() {
     const options = []
-    if (this.properties.allowEmpty) {
-      options.push([null, translate('Import in a new layer')])
-    }
     this.builder._umap.datalayers.reverse().map((datalayer) => {
       if (
         datalayer.isLoaded() &&
@@ -611,6 +648,36 @@ Fields.DataLayerSwitcher = class extends Fields.Select {
   }
 }
 
+Fields.NullableDataLayerSwitcher = class extends BaseDataLayerSwitcher {
+  getOptions() {
+    const options = super.getOptions()
+    options.unshift([null, translate('Import in a new layer')])
+    return options
+  }
+}
+
+Fields.EditableDataLayerSwitcher = class extends BaseDataLayerSwitcher {
+  getTemplate() {
+    return `
+      <div class="select-with-actions">
+        ${super.getTemplate()}
+        <button type="button" class="icon icon-16 icon-edit flat" data-ref=openEditPanel></button>
+        <button type="button" class="icon icon-16 icon-table flat" data-ref=openTableEditor></button>
+      </div>
+    `
+  }
+
+  build() {
+    super.build()
+    this.elements.openEditPanel.addEventListener('click', () => {
+      this.obj.datalayer.edit()
+    })
+    this.elements.openTableEditor.addEventListener('click', () => {
+      this.obj.datalayer.tableEdit()
+    })
+  }
+}
+
 Fields.DataFormat = class extends Fields.Select {
   getOptions() {
     return [
@@ -679,7 +746,7 @@ Fields.PropertyInput = class extends Fields.BlurInput {
     super.build()
     const autocomplete = new AutocompleteDatalist(this.input)
     // Will be used on Umap and DataLayer
-    const properties = this.builder.obj.fieldKeys
+    const properties = Array.from(this.builder.obj.fields.keys())
     autocomplete.suggestions = properties
   }
 }
@@ -689,6 +756,15 @@ Fields.IconUrl = class extends Fields.BlurInput {
     return 'hidden'
   }
 
+  get() {
+    // We never want to have parent value here
+    // TODO: check if/when we need the getOption call
+    // in the super method, maybe it's useless for all fields.
+    const path = this.field.split('.')
+    const key = path[path.length - 1]
+    return this.builder.getter(this.field)
+  }
+
   getTemplate() {
     return `
       <div>
@@ -964,216 +1040,27 @@ Fields.Url = class extends Fields.Input {
 }
 
 Fields.Switch = class extends Fields.CheckBox {
+  getLabelTemplate() {
+    if (!this.properties.inheritable) return ''
+    return super.getLabelTemplate()
+  }
   getTemplate() {
-    const label = this.properties.label
-    const help = this.properties.helpEntries?.join() || ''
-    return `${super.getTemplate()}<label title="${label}" for="${this.id}" data-ref=customLabel data-help="${help}">${label}</label>`
+    const label = this.properties.inheritable ? '' : this.properties.label
+    const help = this.properties.inheritable
+      ? ''
+      : this.properties.helpEntries?.join() || ''
+    return `${super.getTemplate()}<label for="${this.id}" data-ref=customLabel data-help="${help}">${label}</label>`
   }
 
   build() {
     super.build()
-    // We have it in our template
-    if (!this.properties.inheritable) {
-      // We already have the label near the switch,
-      // only show the default label in inheritable mode
-      // as the switch itself may be hidden (until "defined")
-      if (this.elements.label) {
-        this.elements.label.hidden = true
-        this.elements.label.innerHTML = ''
-        this.elements.label.title = ''
-      }
-    }
     this.container.classList.add('with-switch')
     this.input.classList.add('switch')
     this.input.id = this.id
   }
 }
 
-Fields.FacetSearchBase = class extends BaseElement {
-  buildLabel() {}
-}
-
-Fields.FacetSearchChoices = class extends Fields.FacetSearchBase {
-  getTemplate() {
-    return `
-      <fieldset class="umap-facet">
-        <legend data-ref=label>${Utils.escapeHTML(this.properties.label)}</legend>
-        <ul data-ref=ul></ul>
-      </fieldset>
-      `
-  }
-
-  build() {
-    this.type = this.properties.criteria.type
-
-    const choices = this.properties.criteria.choices
-    choices.sort()
-    choices.forEach((value) => this.buildLi(value))
-    super.build()
-  }
-
-  buildLi(value) {
-    const name = `${this.type}_${this.name}`
-    const [li, { input, label }] = Utils.loadTemplateWithRefs(`
-      <li>
-        <label>
-          <input type="${this.type}" name="${name}" data-ref=input />
-          <span data-ref=label></span>
-        </label>
-      </li>
-    `)
-    label.textContent = value
-    input.checked = this.get().choices.includes(value)
-    input.dataset.value = value
-    input.addEventListener('change', () => this.sync())
-    this.elements.ul.appendChild(li)
-  }
-
-  toJS() {
-    return {
-      type: this.type,
-      choices: [...this.elements.ul.querySelectorAll('input:checked')].map(
-        (i) => i.dataset.value
-      ),
-    }
-  }
-}
-
-Fields.MinMaxBase = class extends Fields.FacetSearchBase {
-  getInputType(type) {
-    return type
-  }
-
-  getLabels() {
-    return [translate('Min'), translate('Max')]
-  }
-
-  prepareForHTML(value) {
-    return value.valueOf()
-  }
-
-  getTemplate() {
-    const [minLabel, maxLabel] = this.getLabels()
-    const { min, max, type } = this.properties.criteria
-    this.type = type
-    const inputType = this.getInputType(this.type)
-    const minHTML = this.prepareForHTML(min)
-    const maxHTML = this.prepareForHTML(max)
-    return `
-      <fieldset class="umap-facet">
-        <legend>${Utils.escapeHTML(this.properties.label)}</legend>
-        <label>${minLabel}<input min="${minHTML}" max="${maxHTML}" step=any type="${inputType}" data-ref=minInput /></label>
-        <label>${maxLabel}<input min="${minHTML}" max="${maxHTML}" step=any type="${inputType}" data-ref=maxInput /></label>
-      </fieldset>
-    `
-  }
-
-  build() {
-    this.minInput = this.elements.minInput
-    this.maxInput = this.elements.maxInput
-    const { min, max, type } = this.properties.criteria
-    const { min: modifiedMin, max: modifiedMax } = this.get()
-
-    const currentMin = modifiedMin !== undefined ? modifiedMin : min
-    const currentMax = modifiedMax !== undefined ? modifiedMax : max
-    if (min != null) {
-      // The value stored using setAttribute is not modified by
-      // user input, and will be used as initial value when calling
-      // form.reset(), and can also be retrieve later on by using
-      // getAttributing, to compare with current value and know
-      // if this value has been modified by the user
-      // https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement/reset
-      this.minInput.setAttribute('value', this.prepareForHTML(min))
-      this.minInput.value = this.prepareForHTML(currentMin)
-    }
-
-    if (max != null) {
-      // Cf comment above about setAttribute vs value
-      this.maxInput.setAttribute('value', this.prepareForHTML(max))
-      this.maxInput.value = this.prepareForHTML(currentMax)
-    }
-    this.toggleStatus()
-
-    this.minInput.addEventListener('change', () => this.sync())
-    this.maxInput.addEventListener('change', () => this.sync())
-    super.build()
-  }
-
-  toggleStatus() {
-    this.minInput.dataset.modified = this.isMinModified()
-    this.maxInput.dataset.modified = this.isMaxModified()
-  }
-
-  sync() {
-    super.sync()
-    this.toggleStatus()
-  }
-
-  isMinModified() {
-    const default_ = this.minInput.getAttribute('value')
-    const current = this.minInput.value
-    return current !== default_
-  }
-
-  isMaxModified() {
-    const default_ = this.maxInput.getAttribute('value')
-    const current = this.maxInput.value
-    return current !== default_
-  }
-
-  toJS() {
-    const opts = {
-      type: this.type,
-    }
-    if (this.minInput.value !== '' && this.isMinModified()) {
-      opts.min = this.prepareForJS(this.minInput.value)
-    }
-    if (this.maxInput.value !== '' && this.isMaxModified()) {
-      opts.max = this.prepareForJS(this.maxInput.value)
-    }
-    return opts
-  }
-}
-
-Fields.FacetSearchNumber = class extends Fields.MinMaxBase {
-  prepareForJS(value) {
-    return new Number(value)
-  }
-}
-
-Fields.FacetSearchDate = class extends Fields.MinMaxBase {
-  prepareForJS(value) {
-    return new Date(value)
-  }
-
-  toLocaleDateTime(dt) {
-    return new Date(dt.valueOf() - dt.getTimezoneOffset() * 60000)
-  }
-
-  prepareForHTML(value) {
-    // Value must be in local time
-    if (Number.isNaN(value)) return
-    return this.toLocaleDateTime(value).toISOString().substr(0, 10)
-  }
-
-  getLabels() {
-    return [translate('From'), translate('Until')]
-  }
-}
-
-Fields.FacetSearchDateTime = class extends Fields.FacetSearchDate {
-  getInputType(type) {
-    return 'datetime-local'
-  }
-
-  prepareForHTML(value) {
-    // Value must be in local time
-    if (Number.isNaN(value)) return
-    return this.toLocaleDateTime(value).toISOString().slice(0, -1)
-  }
-}
-
-Fields.MultiChoice = class extends BaseElement {
+Fields.MultiChoice = class extends Fields.Base {
   getDefault() {
     return 'null'
   }
@@ -1207,7 +1094,10 @@ Fields.MultiChoice = class extends BaseElement {
   }
 
   getChoices() {
-    return this.properties.choices || this.choices
+    let choices = this.properties.choices || this.choices
+    // Allow to pass flat arrays [c1, c2, c3] instead of [[c1, v1], [c2, v2]]
+    if (!Array.isArray(choices[0])) choices = choices.map((key) => [key, key])
+    return choices
   }
 
   getTemplate() {
@@ -1224,7 +1114,7 @@ Fields.MultiChoice = class extends BaseElement {
   }
 
   addChoice(value, label, counter) {
-    const id = `${Date.now()}.${this.name}.${counter}`
+    const id = `id.${Date.now()}.${this.name}.${counter}`
     const input = Utils.loadTemplate(
       `<input type="radio" name="${this.name}" id="${id}" value="${value}" />`
     )
@@ -1322,7 +1212,7 @@ Fields.Range = class extends Fields.FloatInput {
   }
 }
 
-Fields.ManageOwner = class extends BaseElement {
+Fields.ManageOwner = class extends Fields.Base {
   build() {
     super.build()
     const options = {
@@ -1353,7 +1243,7 @@ Fields.ManageOwner = class extends BaseElement {
   }
 }
 
-Fields.ManageEditors = class extends BaseElement {
+Fields.ManageEditors = class extends Fields.Base {
   build() {
     super.build()
     const options = {

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

@@ -32,6 +32,10 @@ export const EXPORT_FORMATS = {
     ext: '.csv',
     filetype: 'text/csv',
   },
+  wkt: {
+    ext: '.csv',
+    filetype: 'text/csv',
+  },
 }
 
 export class Formatter {
@@ -84,7 +88,12 @@ export class Formatter {
           const first = result.features[0]
           if (first.geometry === null) {
             const geomFields = ['geom', 'geometry', 'wkt', 'geojson']
-            for (const field of geomFields) {
+            const availableFields = Object.keys(first.properties).reduce((acc, key) => {
+              acc[key.toLowerCase()] = key
+              return acc
+            }, {})
+            for (let field of geomFields) {
+              field = availableFields[field]
               if (first.properties[field]) {
                 for (const feature of result.features) {
                   feature.geometry = await parseTextGeom(feature.properties[field])
@@ -169,6 +178,8 @@ export class Formatter {
     switch (format) {
       case 'csv':
         return await this.toCSV(features)
+      case 'wkt':
+        return await this.toWKT(features)
       case 'gpx':
         return await this.toGPX(features)
       case 'kml':
@@ -215,4 +226,16 @@ export class Formatter {
     }
     return csv2geojson.dsv.csvFormat(table)
   }
+
+  async toWKT(features) {
+    const table = []
+    const betterknown = await import('../../vendors/betterknown/betterknown.mjs')
+    for (const feature of features) {
+      const row = feature.toGeoJSON().properties
+      delete row._umap_options
+      row.geometry = betterknown.geoJSONToWkt(feature.geometry)
+      table.push(row)
+    }
+    return csv2geojson.dsv.csvFormat(table)
+  }
 }

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

@@ -92,8 +92,8 @@ const ENTRIES = {
   filterKey: translate(
     'Comma separated list of properties to use when filtering features by text input'
   ),
-  facetKey: translate(
-    'Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.'
+  filters: translate(
+    'Filters will be displayed in the data browser to ease data selection.'
   ),
   interactive: translate(
     'If false, the polygon or line will act as a part of the underlying map.'
@@ -118,7 +118,7 @@ const ENTRIES = {
     <dt>KML</dt>
     <dd>${translate('Properties imported:')}name, description</dd>
     <dt>CSV</dt>
-    <dd>${translate('Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.')}</dd>
+    <dd>${translate('Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the beginning of the header, case insensitive. All other column are imported as properties.')}</dd>
     <dt>uMap</dt>
     <dd>${translate('Imports all umap data, including layers and settings.')}</dd>
   </div>
@@ -170,6 +170,7 @@ const ENTRIES = {
       <li>${translate('key!=value (eg. building!=yes)')}</li>
       <li>${translate('key~value (eg. name~Grisy)')}</li>
       <li>${translate('key="value|value2" (eg. name="Paris|Berlin")')}</li>
+      <li>${translate('[key="value"][key2="value2"] (eg. [boundary="educational"][name="Académie de Lyon"])')}</li>
     </ul>
     <div>${translate('More info about Overpass syntax')}: <a href="https://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide">https://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide</a></div>
     <div>${translate('For more complex needs, see')} <a href="https://overpass-turbo.eu/">https://overpass-turbo.eu/</a></div>

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

@@ -353,7 +353,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/opendata.js

@@ -33,6 +33,11 @@ const PORTALS = [
     url: 'https://opendata.clermont-ferrand.fr',
     platform: 'opendatasoft',
   },
+  {
+    name: 'Ministère de la Culture',
+    url: 'https://data.culture.gouv.fr',
+    platform: 'opendatasoft',
+  },
   {
     name: 'Métropole de Dijon',
     url: 'https://data.metropole-dijon.fr',
@@ -58,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/openrouteservice.js

@@ -37,7 +37,7 @@ export class Importer {
     }
 
     const metadatas = [
-      ['datalayer', { handler: 'DataLayerSwitcher', allowEmpty: true }],
+      ['datalayer', { handler: 'NullableDataLayerSwitcher' }],
       [
         'profile',
         { handler: 'Select', selectOptions: PROFILES, label: translate('Profile') },
@@ -82,6 +82,11 @@ export class Importer {
           params.interval = (properties.range / properties.lines) * 60
         }
         const data = await Isochrones.calculate(params)
+        data.features.reverse()
+        for (const feature of data.features) {
+          feature.properties.duration = Number(feature.properties.value) / 60
+          feature.properties.profile = properties.profile
+        }
         this.umap.importer.build()
         this.umap.importer.raw = JSON.stringify(data)
         this.umap.importer.format = 'geojson'