umap-project 3.1.2__py3-none-any.whl → 3.3.0__py3-none-any.whl

umap/static/umap/js/modules/sync/updaters.js

@@ -81,7 +81,7 @@ export class DataLayerUpdater extends BaseUpdater {
 export class FeatureUpdater extends BaseUpdater {
   getFeatureFromMetadata({ id, layerId }) {
     const datalayer = this.getDataLayerFromID(layerId)
-    return datalayer.getFeatureById(id)
+    return datalayer.features.get(id)
   }
 
   // Create or update an object at a specific position
@@ -109,11 +109,6 @@ export class FeatureUpdater extends BaseUpdater {
       feature.geometry = value
     } else {
       Utils.setObjectValue(feature, key, value)
-      if (key.startsWith('properties')) {
-        feature.datalayer.indexProperties(feature)
-        const name = key.replace('properties.', '')
-        feature.datalayer.checkIndexForProperty(name)
-      }
     }
 
     feature.render([key])

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

@@ -74,10 +74,10 @@ export default class TableEditor extends WithTemplate {
     const th = loadTemplate('<th><input type="checkbox" /></th>')
     const checkbox = th.firstChild
     this.elements.header.appendChild(th)
-    for (const property of this.properties) {
+    for (const field of this.datalayer.fields) {
       this.elements.header.appendChild(
         loadTemplate(
-          `<th>${property}<button data-property="${property}" class="flat" aria-label="${translate('Advanced actions')}">…</button></th>`
+          `<th>${field.key}<button data-property="${field.key}" class="flat" aria-label="${translate('Advanced actions')}">…</button></th>`
         )
       )
     }
@@ -91,56 +91,32 @@ export default class TableEditor extends WithTemplate {
     const bounds = this._leafletMap.getBounds()
     const inBbox = this._umap.browser.options.inBbox
     let html = ''
-    this.datalayer.eachFeature((feature) => {
+    this.datalayer.features.forEach((feature) => {
       if (feature.isFiltered()) return
       if (inBbox && !feature.isOnScreen(bounds)) return
-      const tds = this.properties.map(
-        (prop) =>
-          `<td tabindex="0" data-property="${prop}">${feature.properties[prop] ?? ''}</td>`
+      const tds = this.datalayer.fields.map(
+        (field) =>
+          `<td tabindex="0" data-property="${field.key}">${feature.properties[field.key] ?? ''}</td>`
       )
       html += `<tr data-feature="${feature.id}"><th><input type="checkbox" /></th>${tds.join('')}</tr>`
     })
     this.elements.body.innerHTML = html
   }
 
-  resetProperties() {
-    this.properties = this.datalayer.allProperties()
-    if (this.properties.length === 0) {
-      this.properties = [U.DEFAULT_LABEL_KEY, 'description']
-    }
-  }
-
   renameProperty(property) {
-    this._umap.dialog
-      .prompt(translate('Please enter the new name of this property'))
-      .then(({ prompt }) => {
-        if (!prompt || !this.datalayer.validateName(prompt)) return
-        this.datalayer.renameProperty(property, prompt)
-        this.open()
-      })
+    this.datalayer.askForRenameProperty(property).then(() => this.open())
   }
 
   deleteProperty(property) {
-    this._umap.dialog
-      .confirm(
-        translate('Are you sure you want to delete this property on all the features?')
-      )
-      .then(() => {
-        this.datalayer.deleteProperty(property)
-        this.resetProperties()
-        this.open()
-      })
+    this.datalayer.confirmDeleteProperty(property).then(() => this.open())
   }
 
   addProperty() {
-    this.datalayer.addProperty().then(() => {
-      this.open()
-    })
+    this.datalayer.addProperty().then(() => this.open())
   }
 
   open() {
     const id = 'tableeditor:edit'
-    this.resetProperties()
     this.renderHeaders()
     this.elements.body.innerHTML = ''
     this.renderBody()
@@ -149,7 +125,7 @@ export default class TableEditor extends WithTemplate {
     if (!this.datalayer.isRemoteLayer()) {
       const addButton = loadTemplate(`
         <button class="flat" type="button" data-ref="add">
-          <i class="icon icon-16 icon-add"></i>${translate('Add a new property')}
+          <i class="icon icon-16 icon-add"></i>${translate('Add a new field')}
         </button>`)
       addButton.addEventListener('click', () => this.addProperty())
       actions.push(addButton)
@@ -181,10 +157,10 @@ export default class TableEditor extends WithTemplate {
     const property = cell.dataset.property
     const field = `properties.${property}`
     const tr = event.target.closest('tr')
-    const feature = this.datalayer.getFeatureById(tr.dataset.feature)
+    const feature = this.datalayer.features.get(tr.dataset.feature)
     const handler = property === 'description' ? 'Textarea' : 'Input'
     const builder = new MutatingForm(feature, [[field, { handler }]], {
-      id: `umap-feature-properties_${L.stamp(feature)}`,
+      id: `umap-feature-properties_${feature.id}`,
     })
     cell.innerHTML = ''
     cell.appendChild(builder.build())
@@ -293,7 +269,7 @@ export default class TableEditor extends WithTemplate {
         this.datalayer.hide()
         for (const row of selectedRows) {
           const id = row.dataset.feature
-          const feature = this.datalayer.getFeatureById(id)
+          const feature = this.datalayer.features.get(id)
           feature.del()
         }
         this.datalayer.show()

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

@@ -60,20 +60,21 @@ export default class TemplateImporter {
               break
           }
           body.textContent = message
+          return
         }
+        const ul = Utils.loadTemplate('<ul></ul>')
+        body.appendChild(ul)
         for (const template of data.templates) {
           const item = Utils.loadTemplate(
-            `<dl>
-              <dt>
+            `<li>
                 <label>
                   <input type="radio" value="${template.id}" name="template" />${template.name}
                   <a href="${template.url}" target="_blank"><nobr>${translate('Explore')}<i class="icon icon-16 icon-external-link"></i></nobr></a>
                 </label>
-              </dt>
-              <dd class="text">${Utils.toHTML(template.description)}</dd>
-            </dl>`
+              </li>
+            `
           )
-          body.appendChild(item)
+          ul.appendChild(item)
         }
         tabs.querySelectorAll('button').forEach((el) => el.classList.remove('on'))
         tabs.querySelector(`[data-value="${source}"]`).classList.add('on')

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

@@ -213,7 +213,9 @@ export class BottomBar extends WithTemplate {
       const selected = select.options[select.selectedIndex].value
       if (!selected) return
       this._umap.datalayers.active().map((datalayer) => {
-        datalayer.toggle(datalayer.id === selected)
+        if (datalayer.properties.inCaption !== false) {
+          datalayer.toggle(datalayer.id === selected)
+        }
       })
     })
     this.redraw()
@@ -263,6 +265,7 @@ const EDIT_BAR_TEMPLATE = `
     <li data-ref="multipolygon" hidden>
       <button type="button" title="${translate('Add a polygon to the current multi')}"><i class="icon icon-24 icon-multipolygon"></i></button>
     </li>
+    <li data-ref="route" hidden><button type="button" data-getstarted title="${translate('Draw along routes')}"><i class="icon icon-24 icon-route"></i></button></li>
     <hr>
     <li data-ref="caption" hidden><button data-getstarted type="button" title="${translate('Edit map name and caption')}"><i class="icon icon-24 icon-caption"></i></button></li>
     <li data-ref="import" hidden><button type="button"><i class="icon icon-24 icon-upload"></i></button></li>
@@ -293,6 +296,7 @@ export class EditBar extends WithTemplate {
     this._onClick('multiline', () => this._umap.editedFeature.ui.editor.newShape())
     this._onClick('polygon', () => this._leafletMap.editTools.startPolygon())
     this._onClick('multipolygon', () => this._umap.editedFeature.ui.editor.newShape())
+    this._onClick('route', () => this._leafletMap.editTools.startRoute())
     this._onClick('caption', () => this._umap.editCaption())
     this._onClick('import', () => this._umap.importer.open())
     this._onClick('templates', () => this.templateIimporter.open())
@@ -321,6 +325,7 @@ export class EditBar extends WithTemplate {
     this.elements.center.hidden = this._umap.properties.editMode !== 'advanced'
     this.elements.permissions.hidden = this._umap.properties.editMode !== 'advanced'
     this.elements.settings.hidden = this._umap.properties.editMode !== 'advanced'
+    this.elements.route.hidden = !this._umap.properties.ORSAPIKey
   }
 
   _addTitle(ref, label) {

umap/static/umap/js/modules/ui/base.js

@@ -12,9 +12,19 @@ export class Positioned {
   }
 
   toggleClassPosition(position) {
-    this.container.classList.toggle('tooltip-bottom', position === 'bottom')
-    this.container.classList.toggle('tooltip-top', position === 'top')
-    this.container.classList.toggle('tooltip-right', position === 'right')
+    const positions = [
+      'bottom',
+      'top',
+      'left',
+      'right',
+      'bottom-right',
+      'bottom-left',
+      'top-right',
+      'top-left',
+    ]
+    for (const known of positions) {
+      this.container.classList.toggle(`tooltip-${known}`, position === known)
+    }
   }
 
   anchorTop(el) {
@@ -39,7 +49,6 @@ export class Positioned {
   anchorRight(el) {
     this.toggleClassPosition('right')
     const coords = this.getPosition(el)
-    console.log(coords)
     this.setPosition({
       left: coords.right + 11,
       top: coords.top,
@@ -71,18 +80,24 @@ export class Positioned {
   }
 
   computePosition([x, y]) {
+    let tooltip = ''
     let left
     let top
-    if (x < window.innerWidth / 2) {
-      left = x
-    } else {
-      left = x - this.container.offsetWidth
-    }
     if (y < window.innerHeight / 2) {
       top = Math.min(y, window.innerHeight - this.container.offsetHeight)
+      tooltip += 'top'
     } else {
       top = Math.max(0, y - this.container.offsetHeight)
+      tooltip += 'bottom'
+    }
+    if (x < window.innerWidth / 2) {
+      left = x
+      tooltip += '-left'
+    } else {
+      left = x - this.container.offsetWidth
+      tooltip += '-right'
     }
+    this.toggleClassPosition(tooltip)
     this.setPosition({ left, top })
   }
 

umap/static/umap/js/modules/ui/contextmenu.js

@@ -1,4 +1,4 @@
-import { loadTemplate } from '../utils.js'
+import { loadTemplate, loadTemplateWithRefs } from '../utils.js'
 import { Positioned } from './base.js'
 
 export default class ContextMenu extends Positioned {
@@ -29,16 +29,21 @@ export default class ContextMenu extends Positioned {
     this.openAt([coords.left, coords.bottom], items)
   }
 
-  openAt([left, top], items) {
-    this.container.innerHTML = ''
+  addItems(items, container) {
     for (const item of items) {
       if (item === '-') {
-        this.container.appendChild(document.createElement('hr'))
+        container.appendChild(document.createElement('hr'))
+      } else if (item.items) {
+        const [li, { bar }] = loadTemplateWithRefs(
+          `<li class="dark"><ul data-ref=bar class="icon-bar"></ul></li>`
+        )
+        this.addItems(item.items, bar)
+        container.appendChild(li)
       } else if (typeof item.action === 'string') {
         const li = loadTemplate(
           `<li class="${item.className || ''}"><a tabindex="0" href="${item.action}">${item.label}</a></li>`
         )
-        this.container.appendChild(li)
+        container.appendChild(li)
       } else {
         let content = item.label || ''
         if (item.icon) {
@@ -51,9 +56,14 @@ export default class ContextMenu extends Positioned {
           this.close()
           item.action()
         })
-        this.container.appendChild(li)
+        container.appendChild(li)
       }
     }
+  }
+
+  openAt([left, top], items) {
+    this.container.innerHTML = ''
+    this.addItems(items, this.container)
     // When adding contextmenu below the map container, clicking on any link will send the
     // "focusout" element on link click, preventing to trigger the click action
     const parent = document
@@ -65,7 +75,7 @@ export default class ContextMenu extends Positioned {
     } else {
       this.computePosition([left, top])
     }
-    this.container.querySelector('li > *').focus()
+    this.container.querySelector('button, a').focus()
     this.container.addEventListener(
       'keydown',
       (event) => {

umap/static/umap/js/modules/ui/dialog.js

@@ -37,7 +37,8 @@ export default class Dialog extends WithTemplate {
     this.init()
   }
 
-  collectFormData(formData) {
+  collectFormData() {
+    const formData = new FormData(this.elements.form)
     const object = {}
     formData.forEach((value, key) => {
       if (!Reflect.has(object, key)) {
@@ -145,6 +146,10 @@ export default class Dialog extends WithTemplate {
     return this.waitForUser()
   }
 
+  on(...args) {
+    this.dialog.addEventListener(...args)
+  }
+
   close() {
     this.toggle(false)
     this.dialog.returnValue = undefined
@@ -171,9 +176,7 @@ export default class Dialog extends WithTemplate {
         'close',
         (event) => {
           if (this.dialog.returnValue === 'accept') {
-            const value = this.hasFormData
-              ? this.collectFormData(new FormData(this.elements.form))
-              : true
+            const value = this.hasFormData ? this.collectFormData() : true
             resolve(value)
           }
         },

umap/static/umap/js/modules/ui/panel.js

@@ -88,6 +88,13 @@ export class Panel {
       this._leafletMap.invalidateSize({ pan: false })
     }
   }
+  scrollTo(selector) {
+    const fieldset = this.container.querySelector(selector)
+    if (!fieldset) return
+    fieldset.open = true
+    const { top, left } = fieldset.getBoundingClientRect()
+    this.container.scrollTo(left, top)
+  }
 }
 
 export class EditPanel extends Panel {

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

@@ -2,7 +2,6 @@ import {
   DomUtil,
   Util as LeafletUtil,
   latLngBounds,
-  stamp,
 } from '../../vendors/leaflet/leaflet-src.esm.js'
 import {
   uMapAlert as Alert,
@@ -34,6 +33,7 @@ import Tooltip from './ui/tooltip.js'
 import URLs from './urls.js'
 import * as Utils from './utils.js'
 import { DataLayerManager } from './managers.js'
+import { Importer as OpenRouteService } from './importers/openrouteservice.js'
 
 export default class Umap {
   constructor(element, geojson) {
@@ -129,7 +129,6 @@ export default class Umap {
     )
     this.tooltip = new Tooltip(this._leafletMap._controlContainer)
     this.contextmenu = new ContextMenu()
-    this.editContextmenu = new ContextMenu({ className: 'dark', orientation: 'rows' })
     this.server = new ServerRequest()
     this.request = new Request()
     this.facets = new Facets(this)
@@ -211,7 +210,7 @@ export default class Umap {
 
     if (!this.properties.noControl) {
       this.initShortcuts()
-      this._leafletMap.on('contextmenu', (e) => this.onContextMenu(e))
+      this._leafletMap.on('contextmenu', (event) => this.onContextMenu(event))
       this.onceDataLoaded(this.setViewFromQueryString)
       this.bottomBar.setup()
       this.propagate()
@@ -262,6 +261,17 @@ export default class Umap {
     return window.self !== window.top
   }
 
+  get fields() {
+    if (!this.properties.fields) this.properties.fields = []
+    return this.properties.fields
+  }
+
+  get fieldKeys() {
+    return this.fields
+      .map((field) => field.key)
+      .concat(...this.datalayers.active().map((dl) => dl.fieldKeys))
+  }
+
   setPropertiesFromQueryString() {
     const asBoolean = (key) => {
       const value = this.searchParams.get(key)
@@ -381,48 +391,28 @@ export default class Umap {
     }
   }
 
-  getOwnContextMenuItems(event) {
+  getOwnContextMenu(event) {
     const items = []
-    if (this.hasEditMode()) {
-      if (this.editEnabled) {
-        if (!this.isDirty) {
-          items.push({
-            label: this.help.displayLabel('STOP_EDIT'),
-            action: () => this.disableEdit(),
-          })
-        }
-        if (this.properties.enableMarkerDraw) {
-          items.push({
-            label: this.help.displayLabel('DRAW_MARKER'),
+    if (this.editEnabled) {
+      items.push({
+        items: [
+          {
+            title: this.help.displayLabel('DRAW_MARKER', false),
+            icon: 'icon-marker',
             action: () => this._leafletMap.editTools.startMarker(),
-          })
-        }
-        if (this.properties.enablePolylineDraw) {
-          items.push({
-            label: this.help.displayLabel('DRAW_POLYGON'),
-            action: () => this._leafletMap.editTools.startPolygon(),
-          })
-        }
-        if (this.properties.enablePolygonDraw) {
-          items.push({
-            label: this.help.displayLabel('DRAW_LINE'),
+          },
+          {
+            title: this.help.displayLabel('DRAW_LINE', false),
+            icon: 'icon-polyline',
             action: () => this._leafletMap.editTools.startPolyline(),
-          })
-        }
-        items.push('-')
-        items.push({
-          label: translate('Help'),
-          action: () => this.help.show('edit'),
-        })
-      } else {
-        items.push({
-          label: this.help.displayLabel('TOGGLE_EDIT'),
-          action: () => this.enableEdit(),
-        })
-      }
-    }
-    if (items.length) {
-      items.push('-')
+          },
+          {
+            title: this.help.displayLabel('DRAW_POLYGON', false),
+            icon: 'icon-polygon',
+            action: () => this._leafletMap.editTools.startPolygon(),
+          },
+        ],
+      })
     }
     items.push(
       {
@@ -453,27 +443,32 @@ export default class Umap {
     return items
   }
 
-  getSharedContextMenuItems(event) {
+  getSharedContextMenu(event) {
     const items = []
     if (this.properties.urls.routing) {
-      items.push('-', {
+      items.push({
         label: translate('Directions from here'),
         action: () => this.openExternalRouting(event),
       })
     }
+    if (this.properties.ORSAPIKey) {
+      items.push({
+        label: translate('Compute isochrone from here'),
+        action: () => this.askForIsochrone(event),
+      })
+    }
     if (this.properties.urls.edit_in_osm) {
-      items.push('-', {
+      items.push({
         label: translate('Edit in OpenStreetMap'),
         action: () => this.editInOSM(event),
       })
     }
+    if (items.length) items.unshift('-')
     return items
   }
 
   onContextMenu(event) {
-    const items = this.getOwnContextMenuItems(event).concat(
-      this.getSharedContextMenuItems(event)
-    )
+    const items = this.getOwnContextMenu(event).concat(this.getSharedContextMenu(event))
     this.contextmenu.open(event.originalEvent, items)
   }
 
@@ -503,6 +498,10 @@ export default class Umap {
     return SCHEMA[key]?.default
   }
 
+  getColor() {
+    return this.getProperty('color')
+  }
+
   getOption(key, feature) {
     // TODO: remove when field.js does not call blindly obj.getOption anymore
     return this.getProperty(key, feature)
@@ -742,10 +741,6 @@ export default class Umap {
     return Boolean(this.datalayers.count())
   }
 
-  allProperties() {
-    return [].concat(...this.datalayers.active().map((dl) => dl.allProperties()))
-  }
-
   sortedValues(property) {
     return []
       .concat(...this.datalayers.active().map((dl) => dl.sortedValues(property)))
@@ -853,6 +848,7 @@ export default class Umap {
     const shapeOptions = [
       'properties.color',
       'properties.iconClass',
+      'properties.iconSize',
       'properties.iconUrl',
       'properties.iconOpacity',
       'properties.opacity',
@@ -1266,20 +1262,6 @@ export default class Umap {
     }
   }
 
-  toGeoJSON() {
-    let features = []
-    this.datalayers.active().map((datalayer) => {
-      if (datalayer.isVisible()) {
-        features = features.concat(datalayer.featuresToGeoJSON())
-      }
-    })
-    const geojson = {
-      type: 'FeatureCollection',
-      features: features,
-    }
-    return geojson
-  }
-
   enableEdit() {
     this.editBar.redraw()
     document.body.classList.add('umap-edit-enabled')
@@ -1463,7 +1445,7 @@ export default class Umap {
 
   eachFeature(callback) {
     this.datalayers.browsable().map((datalayer) => {
-      if (datalayer.isVisible()) datalayer.eachFeature(callback)
+      if (datalayer.isVisible()) datalayer.features.forEach(callback)
     })
   }
 
@@ -1519,6 +1501,7 @@ export default class Umap {
           const oldRank = datalayer.rank
           datalayer.rank = rank
           datalayer.sync.update('options.rank', rank, oldRank)
+          datalayer.redraw()
         }
       })
       this.sync.commitBatch()
@@ -1735,6 +1718,12 @@ export default class Umap {
     if (url) window.open(url)
   }
 
+  async askForIsochrone(event) {
+    if (!this.properties.ORSAPIKey) return
+    const importer = new OpenRouteService(this)
+    importer.isochrone(event.latlng)
+  }
+
   setCenterAndZoom() {
     this._setCenterAndZoom(true)
     Alert.success(translate('The zoom and center have been modified.'))
@@ -1765,4 +1754,32 @@ export default class Umap {
   redo() {
     this.sync._undoManager.redo()
   }
+
+  async screenshot() {
+    const { snapdom, preCache } = await import('../../vendors/snapdom/snapdom.min.mjs')
+    const el = document.querySelector('#map')
+    await preCache(el)
+    const result = await snapdom(el, {
+      scale: 1,
+      type: 'jpg',
+      fast: false,
+      exclude: [
+        '.leaflet-control',
+        '.umap-loader',
+        '.panel',
+        '.umap-caption-bar',
+        '.umap-main-edit-toolbox',
+        '.umap-edit-bar',
+      ],
+    })
+    return result
+  }
+
+  async openPrinter(action) {
+    if (!this._printer) {
+      const Printer = (await import('./printer.js')).default
+      this._printer = new Printer(this)
+    }
+    this._printer.open(action)
+  }
 }

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

@@ -3,15 +3,16 @@ import { default as DOMPurifyInitializer } from '../../vendors/dompurify/purify.
 /**
  * Generate a pseudo-unique identifier (5 chars long, mixed-case alphanumeric)
  *
- * Here's the collision risk:
- * - for 6 chars, 1 in 100 000
- * - for 5 chars, 5 in 100 000
- * - for 4 chars, 500 in 100 000
- *
  * @returns string
  */
-export function generateId() {
-  return btoa(Math.random().toString()).substring(10, 15)
+const CHARACTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+export function generateId(length = 5) {
+  let result = ''
+  const charactersLength = CHARACTERS.length
+  for (let i = 0; i < length; i++) {
+    result += CHARACTERS.charAt(Math.floor(Math.random() * charactersLength))
+  }
+  return result
 }
 
 /**