umap-project 2.8.2__py3-none-any.whl → 2.9.0__py3-none-any.whl

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

@@ -1,5 +1,6 @@
 /* Uses globals for: csv2geojson, osmtogeojson (not available as ESM) */
 import { translate } from './i18n.js'
+import { uMapAlert as Alert } from '../components/alerts/alert.js'
 
 export const EXPORT_FORMATS = {
   geojson: {
@@ -58,11 +59,7 @@ export class Formatter {
   }
 
   async fromGeoJSON(str) {
-    try {
-      return JSON.parse(str)
-    } catch (err) {
-      U.Alert.error(`Invalid JSON file: ${err}`)
-    }
+    return JSON.parse(str)
   }
 
   async fromOSM(str) {
@@ -106,8 +103,12 @@ export class Formatter {
               message: err[0].message,
             })
           }
-          U.Alert.error(message, 10000)
-          console.error(err)
+          if (str.split(/\r\n|\r|\n/).length <= 2) {
+            // Seems like a blank CSV, let's not warn
+            console.debug(err)
+          } else {
+            Alert.error(message, 10000)
+          }
         }
         if (result?.features.length) {
           callback(result)
@@ -127,7 +128,7 @@ export class Formatter {
     const doc = new DOMParser().parseFromString(x, 'text/xml')
     const errorNode = doc.querySelector('parsererror')
     if (errorNode) {
-      U.Alert.error(translate('Cannot parse data'))
+      Alert.error(translate('Cannot parse data'))
     }
     return doc
   }

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

@@ -206,13 +206,23 @@ export default class Help {
 
   // Special dynamic case. Do we still think this dialog is useful?
   showGetStarted() {
-    const container = DomUtil.add('div')
-    DomUtil.createTitle(container, translate('Where do we go from here?'))
-    DomUtil.element({
-      tagName: 'div',
-      className: 'umap-help-entry',
-      parent: container,
-    }).appendChild(this._buildEditEntry())
+    const [container, { ul }] = Utils.loadTemplateWithRefs(`
+      <div>
+        <h3><i class="icon icon-16 icon-help"></i>${translate('Where do we go from here?')}</h3>
+        <ul data-ref=ul class="umap-getstarted"></ul>
+      </div>
+    `)
+    const elements = document.querySelectorAll('[data-getstarted]')
+    for (const el of elements) {
+      const [node, { button }] = Utils.loadTemplateWithRefs(
+        `<li><button data-ref=button type="button" title="${el.title}">${el.innerHTML}${el.title}</button></li>`
+      )
+      ul.appendChild(node)
+      button.addEventListener('click', () => {
+        el.click()
+        this.dialog.close()
+      })
+    }
     this.dialog.open({ template: container })
   }
 
@@ -228,24 +238,10 @@ export default class Help {
 
   parse(container) {
     for (const element of container.querySelectorAll('[data-help]')) {
-      this.button(element, element.dataset.help.split(','))
-    }
-  }
-
-  _buildEditEntry() {
-    const container = DomUtil.create('div', '')
-    const actionsContainer = DomUtil.create('ul', 'umap-edit-actions', container)
-    const addAction = (action) => {
-      const actionContainer = DomUtil.add('li', '', actionsContainer)
-      DomUtil.add('i', action.options.className, actionContainer)
-      DomUtil.add('span', '', actionContainer, action.options.tooltip)
-      DomEvent.on(actionContainer, 'click', action.addHooks, action)
-      DomEvent.on(actionContainer, 'click', this.dialog.close, this.dialog)
-    }
-    for (const action of Object.values(Help.MENU_ACTIONS)) {
-      addAction(action)
+      if (element.dataset.help) {
+        this.button(element, element.dataset.help.split(','))
+      }
     }
-    return container
   }
 }
 

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

@@ -10,7 +10,7 @@ import Dialog from './ui/dialog.js'
 import * as Utils from './utils.js'
 
 const TEMPLATE = `
-  <div class="umap-upload">
+  <div class="umap-import">
     <h3><i class="icon icon-16 icon-upload"></i><span>${translate('Import data')}</span></h3>
     <fieldset class="formbox">
       <legend class="counter">${translate('Choose data')}</legend>
@@ -261,7 +261,10 @@ export default class Importer extends Utils.WithTemplate {
 
   open() {
     if (!this.container) this.build()
-    const onLoad = this._umap.editPanel.open({ content: this.container })
+    const onLoad = this._umap.editPanel.open({
+      content: this.container,
+      highlight: 'import',
+    })
     onLoad.then(() => this.onLoad())
   }
 
@@ -305,7 +308,7 @@ export default class Importer extends Utils.WithTemplate {
       this.onSuccess()
     } catch (e) {
       this.onError(translate('Invalid umap data'))
-      console.error(e)
+      console.debug(e)
       return false
     }
   }

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

@@ -3,6 +3,7 @@ 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'
 
 // 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.
@@ -58,7 +59,7 @@ export class MapPermissions extends ServerStored {
           selectOptions: this._umap.properties.share_statuses,
         },
       ])
-      const builder = new U.FormBuilder(this, fields)
+      const builder = new MutatingForm(this, fields)
       const form = builder.build()
       container.appendChild(form)
 
@@ -133,7 +134,7 @@ export class MapPermissions extends ServerStored {
       { handler: 'ManageEditors', label: translate("Map's editors") },
     ])
 
-    const builder = new U.FormBuilder(this, topFields)
+    const builder = new MutatingForm(this, topFields)
     const form = builder.build()
     container.appendChild(form)
     if (collaboratorsFields.length) {
@@ -141,7 +142,7 @@ export class MapPermissions extends ServerStored {
         `<fieldset class="separator"><legend>${translate('Manage collaborators')}</legend></fieldset>`
       )
       container.appendChild(fieldset)
-      const builder = new U.FormBuilder(this, collaboratorsFields)
+      const builder = new MutatingForm(this, collaboratorsFields)
       const form = builder.build()
       container.appendChild(form)
     }
@@ -165,12 +166,16 @@ export class MapPermissions extends ServerStored {
       Alert.info(translate('Please save the map first'))
       return
     }
-    const container = DomUtil.create('div', 'permissions-panel')
+    const container = DomUtil.create('div', 'umap-edit-permissions')
     DomUtil.createTitle(container, translate('Update permissions'), 'icon-key')
     if (this.isAnonymousMap()) this._editAnonymous(container)
     else this._editWithOwner(container)
     this._editDatalayers(container)
-    this._umap.editPanel.open({ content: container, className: 'dark' })
+    this._umap.editPanel.open({
+      content: container,
+      className: 'dark',
+      highlight: 'permissions',
+    })
   }
 
   async attach() {
@@ -269,7 +274,7 @@ export class DataLayerPermissions extends ServerStored {
         },
       ],
     ]
-    const builder = new U.FormBuilder(this, fields, {
+    const builder = new MutatingForm(this, fields, {
       className: 'umap-form datalayer-permissions',
     })
     const form = builder.build()

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

@@ -70,6 +70,11 @@ const BaseIcon = DivIcon.extend({
   },
 
   onAdd: () => {},
+
+  _setIconStyles: function (img, name) {
+    if (this.feature.isActive()) this.options.className += ' umap-icon-active'
+    DivIcon.prototype._setIconStyles.call(this, img, name)
+  },
 })
 
 const DefaultIcon = BaseIcon.extend({
@@ -86,7 +91,6 @@ const DefaultIcon = BaseIcon.extend({
   },
 
   _setIconStyles: function (img, name) {
-    if (this.feature.isActive()) this.options.className += ' umap-icon-active'
     BaseIcon.prototype._setIconStyles.call(this, img, name)
     const color = this._getColor()
     const opacity = this._getOpacity()

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

@@ -75,7 +75,7 @@ const ClassifiedMixin = {
   },
 
   renderLegend: function (container) {
-    if (!this.datalayer.hasDataLoaded()) return
+    if (!this.datalayer.isLoaded()) return
     const parent = DomUtil.create('ul', '', container)
     const items = this.getLegendItems()
     for (const [color, label] of items) {
@@ -88,7 +88,11 @@ const ClassifiedMixin = {
   },
 
   getColorSchemes: function (classes) {
-    return this.colorSchemes.filter((scheme) => Boolean(colorbrewer[scheme][classes]))
+    const found = this.colorSchemes.filter((scheme) =>
+      Boolean(colorbrewer[scheme][classes])
+    )
+    if (found.length) return found
+    return [['', translate('Default')]]
   },
 }
 
@@ -191,7 +195,7 @@ export const Choropleth = FeatureGroup.extend({
         'options.choropleth.property',
         {
           handler: 'Select',
-          selectOptions: this.datalayer._propertiesIndex,
+          selectOptions: this.datalayer.allProperties(),
           label: translate('Choropleth property value'),
         },
       ],
@@ -300,7 +304,7 @@ export const Circles = FeatureGroup.extend({
         'options.circles.property',
         {
           handler: 'Select',
-          selectOptions: this.datalayer._propertiesIndex,
+          selectOptions: this.datalayer.allProperties(),
           label: translate('Property name to compute circles'),
         },
       ],
@@ -377,7 +381,7 @@ export const Categorized = FeatureGroup.extend({
 
   _getValue: function (feature) {
     const key =
-      this.datalayer.options.categorized.property || this.datalayer._propertiesIndex[0]
+      this.datalayer.options.categorized.property || this.datalayer.allProperties()[0]
     return feature.properties[key]
   },
 
@@ -420,7 +424,7 @@ export const Categorized = FeatureGroup.extend({
     } else {
       this.options.colors = colorbrewer?.Accent[this._classes]
         ? colorbrewer?.Accent[this._classes]
-        : U.COLORS // Fixme: move COLORS to modules/
+        : Utils.COLORS
     }
   },
 
@@ -430,7 +434,7 @@ export const Categorized = FeatureGroup.extend({
         'options.categorized.property',
         {
           handler: 'Select',
-          selectOptions: this.datalayer._propertiesIndex,
+          selectOptions: this.datalayer.allProperties(),
           label: translate('Category property'),
         },
       ],
@@ -464,7 +468,7 @@ export const Categorized = FeatureGroup.extend({
 
   onEdit: function (field, builder) {
     // Only compute the categories if we're dealing with categorized
-    if (!field.startsWith('options.categorized')) return
+    if (!field.startsWith('options.categorized') && field !== 'options.type') return
     // If user touches the categories, then force manual mode
     if (field === 'options.categorized.categories') {
       this.datalayer.options.categorized.mode = 'manual'

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

@@ -63,7 +63,17 @@ export const Cluster = L.MarkerClusterGroup.extend({
 
   addLayer: function (layer) {
     this._layers.push(layer)
-    return L.MarkerClusterGroup.prototype.addLayer.call(this, layer)
+    try {
+      return L.MarkerClusterGroup.prototype.addLayer.call(this, layer)
+    } catch (error) {
+      console.debug(error)
+      // Certainly a race condition when loading a clustered layer
+      // while zooming (this for example can happen at load, when the
+      // initial zoom is changed by uMap).
+      // FIXME: remove when this is merged:
+      // https://github.com/Leaflet/Leaflet.markercluster/pull/1048/files
+      return this
+    }
   },
 
   removeLayer: function (layer) {

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

@@ -32,7 +32,6 @@ const ControlsMixin = {
     'locate',
     'measure',
     'editinosm',
-    'star',
     'tilelayers',
   ],
 
@@ -41,20 +40,6 @@ const ControlsMixin = {
 
     if (this._umap.hasEditMode() && !this.options.noControl) {
       new U.EditControl(this).addTo(this)
-
-      new U.DrawToolbar({ map: this }).addTo(this)
-      const editActions = [
-        U.EditCaptionAction,
-        U.ImportAction,
-        U.EditLayersAction,
-        U.ChangeTileLayerAction,
-        U.UpdateExtentAction,
-        U.UpdatePermsAction,
-        U.EditPropertiesAction,
-      ]
-      if (this.options.editMode === 'advanced') {
-        new U.SettingsToolbar({ actions: editActions }).addTo(this)
-      }
     }
     this._controls.zoom = new Control.Zoom({
       zoomInTitle: translate('Zoom in'),
@@ -84,7 +69,6 @@ const ControlsMixin = {
     this._controls.search = new U.SearchControl()
     this._controls.embed = new Control.Embed(this._umap)
     this._controls.tilelayersChooser = new U.TileLayerChooser(this)
-    if (this.options.user?.id) this._controls.star = new U.StarControl(this._umap)
     this._controls.editinosm = new Control.EditInOSM({
       position: 'topleft',
       widgetOptions: {
@@ -233,7 +217,7 @@ const ManageTilelayerMixin = {
     }
   },
 
-  updateTileLayers: function () {
+  editTileLayers: function () {
     if (this._controls.tilelayersChooser) {
       this._controls.tilelayersChooser.openSwitcher({ edit: true })
     }
@@ -266,7 +250,6 @@ export const LeafletMap = BaseMap.extend({
       DomEvent.on(document.body, 'dataload', (event) =>
         this.fire('dataload', event.detail)
       )
-      this.on('click', this.closeInplaceToolbar)
     }
 
     this.on('baselayerchange', (e) => {
@@ -300,11 +283,6 @@ export const LeafletMap = BaseMap.extend({
     this.handleLimitBounds()
   },
 
-  closeInplaceToolbar: function () {
-    const toolbar = this._toolbars[L.Toolbar.Popup._toolbar_class_id]
-    if (toolbar) toolbar.remove()
-  },
-
   latLng: (a, b, c) => {
     // manage geojson case and call original method
     if (!(a instanceof L.LatLng) && a.coordinates) {

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

@@ -29,12 +29,9 @@ const FeatureMixin = {
 
   onRemove: function (map) {
     this.parentClass.prototype.onRemove.call(this, map)
-    if (map.editedFeature === this.feature) {
-      this.feature._marked_for_deletion = true
+    if (map._umap.editedFeature === this.feature) {
       this.feature.endEdit()
-      if (map.editedFeature === this.feature) {
-        map.editPanel.close()
-      }
+      map._umap.editPanel.close()
     }
   },
 
@@ -47,6 +44,7 @@ const FeatureMixin = {
   addInteractions: function () {
     this.on('contextmenu editable:vertex:contextmenu', this.onContextMenu)
     this.on('click', this.onClick)
+    this.on('editable:edited', this.onCommit)
   },
 
   onClick: function (event) {
@@ -59,15 +57,13 @@ const FeatureMixin = {
         if (event.originalEvent.ctrlKey || event.originalEvent.metaKey) {
           this.feature.datalayer.edit(event)
         } else {
-          if (this.feature._toggleEditing) this.feature._toggleEditing(event)
-          else this.feature.edit(event)
+          this.feature.toggleEditing(event)
         }
       } else if (!this._map.editTools?.drawing()) {
-        new L.Toolbar.Popup(event.latlng, {
-          className: 'leaflet-inplace-toolbar',
-          anchor: this.getPopupToolbarAnchor(),
-          actions: this.feature.getInplaceToolbarActions(event),
-        }).addTo(this._map, this.feature, event.latlng)
+        this._map._umap.editContextmenu.open(
+          event.originalEvent,
+          this.feature.getInplaceEditMenu(event)
+        )
       }
     }
     DomEvent.stop(event)
@@ -104,8 +100,6 @@ const FeatureMixin = {
     this.feature.pullGeometry(false)
     this.feature.onCommit()
   },
-
-  getPopupToolbarAnchor: () => [0, 0],
 }
 
 const PointMixin = {
@@ -118,9 +112,8 @@ const PointMixin = {
     this.on('dragend', (event) => {
       this.isDirty = true
       this.feature.edit(event)
-      this.feature.pullGeometry()
+      this.feature.pullGeometry(false)
     })
-    this.on('editable:drawing:commit', this.onCommit)
     if (!this.feature.isReadOnly()) this.on('mouseover', this._enableDragging)
     this.on('mouseout', this._onMouseOut)
   },
@@ -248,10 +241,6 @@ export const LeafletMarker = Marker.extend({
     this._redraw()
     this._resetZIndex()
   },
-
-  getPopupToolbarAnchor: function () {
-    return this.options.icon.options.popupAnchor
-  },
 })
 
 const PathMixin = {
@@ -267,6 +256,8 @@ const PathMixin = {
   },
 
   makeGeometryEditable: function () {
+    // Feature has been removed since then?
+    if (!this._map) return
     if (this._map._umap.editedFeature !== this.feature) {
       this.disableEdit()
       return
@@ -285,13 +276,17 @@ const PathMixin = {
 
   addInteractions: function () {
     FeatureMixin.addInteractions.call(this)
-    this.on('editable:disable', this.onCommit)
     this.on('mouseover', this._onMouseOver)
     this.on('drag editable:drag', this._onDrag)
     this.on('popupopen', this.highlightPath)
     this.on('popupclose', this._redraw)
   },
 
+  bindTooltip: function (content, options) {
+    options.sticky = !options.permanent
+    this.parentClass.prototype.bindTooltip.call(this, content, options)
+  },
+
   highlightPath: function () {
     this.parentClass.prototype.setStyle.call(this, {
       fillOpacity: Math.sqrt(this.feature.getDynamicOption('fillOpacity', 1.0)),
@@ -335,13 +330,11 @@ const PathMixin = {
     this.resetTooltip()
   },
 
-  getVertexActions: () => [U.DeleteVertexAction],
-
   onVertexRawClick: function (event) {
-    new L.Toolbar.Popup(event.latlng, {
-      className: 'leaflet-inplace-toolbar',
-      actions: this.getVertexActions(event),
-    }).addTo(this._map, this, event.latlng, event.vertex)
+    this._map._umap.editContextmenu.open(
+      event.originalEvent,
+      this.feature.getInplaceEditVertexMenu(event)
+    )
   },
 
   isolateShape: function (atLatLng) {
@@ -377,17 +370,6 @@ export const LeafletPolyline = Polyline.extend({
 
   getClass: () => LeafletPolyline,
 
-  getVertexActions: function (event) {
-    const actions = PathMixin.getVertexActions.call(this, event)
-    const index = event.vertex.getIndex()
-    if (index === 0 || index === event.vertex.getLastIndex()) {
-      actions.push(U.ContinueLineAction)
-    } else {
-      actions.push(U.SplitLineAction)
-    }
-    return actions
-  },
-
   getMeasure: function (shape) {
     let shapes
     if (shape) {

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

@@ -3,6 +3,7 @@ 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'
 
 const EMPTY_VALUES = ['', undefined, null]
 
@@ -129,7 +130,7 @@ class Rule {
       'options.dashArray',
     ]
     const container = DomUtil.create('div')
-    const builder = new U.FormBuilder(this, options)
+    const builder = new MutatingForm(this, options)
     const defaultShapeProperties = DomUtil.add('div', '', container)
     defaultShapeProperties.appendChild(builder.build())
     const autocomplete = new AutocompleteDatalist(builder.helpers.condition.input)
@@ -146,7 +147,7 @@ class Rule {
           .map((str) => `${value}${str || ''}`)
       }
     })
-    this._umap.editPanel.open({ content: container })
+    this._umap.editPanel.open({ content: container, highlight: 'settings' })
   }
 
   renderToolbox(row) {

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

@@ -10,6 +10,11 @@ export async function save() {
   }
 }
 
+export function clear() {
+  _queue.clear()
+  onUpdate()
+}
+
 function add(obj) {
   _queue.add(obj)
   onUpdate()

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

@@ -278,6 +278,7 @@ export const SCHEMA = {
     impacts: ['ui'],
     nullable: true,
     label: translate('Display the locate control'),
+    default: null,
   },
   longCredit: {
     type: 'Text',
@@ -290,6 +291,7 @@ export const SCHEMA = {
     impacts: ['ui'],
     nullable: true,
     label: translate('Display the measure control'),
+    default: null,
   },
   mask: {
     type: Boolean,
@@ -447,6 +449,11 @@ export const SCHEMA = {
     label: translate('Display label'),
     inheritable: true,
     default: false,
+    choices: [
+      [true, translate('always')],
+      [false, translate('never')],
+      [null, translate('on hover')],
+    ],
   },
   slideshow: {
     type: Object,
@@ -478,12 +485,6 @@ export const SCHEMA = {
     label: translate('Sort key'),
     inheritable: true,
   },
-  starControl: {
-    type: Boolean,
-    impacts: ['ui'],
-    nullable: true,
-    label: translate('Display the star map button'),
-  },
   stroke: {
     type: Boolean,
     impacts: ['data'],
@@ -508,6 +509,7 @@ export const SCHEMA = {
     impacts: ['ui'],
     nullable: true,
     label: translate('Display the tile layers control'),
+    default: null,
   },
   toZoom: {
     type: Number,

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

@@ -2,6 +2,7 @@ import { DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { EXPORT_FORMATS } from './formatter.js'
 import { translate } from './i18n.js'
 import * as Utils from './utils.js'
+import { MutatingForm } from './form/builder.js'
 
 export default class Share {
   constructor(umap) {
@@ -125,9 +126,8 @@ export default class Share {
       exportUrl.value = window.location.protocol + iframeExporter.buildUrl()
     }
     buildIframeCode()
-    const builder = new U.FormBuilder(iframeExporter, UIFields, {
-      callback: buildIframeCode,
-    })
+    const builder = new MutatingForm(iframeExporter, UIFields)
+    builder.on('set', buildIframeCode)
     const iframeOptions = DomUtil.createFieldset(
       this.container,
       translate('Embed and link options')