umap-project 2.9.0b0__py3-none-any.whl → 2.9.1__py3-none-any.whl

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

@@ -63,7 +63,7 @@ export class Form extends Utils.WithEvents {
       try {
         value = value[sub]
       } catch {
-        console.log(field)
+        console.debug(field)
       }
     }
     return value
@@ -142,49 +142,50 @@ export class MutatingForm extends Form {
       slugKey: 'PropertyInput',
       labelKey: 'PropertyInput',
     }
-    for (const [key, schema] of Object.entries(SCHEMA)) {
-      if (schema.type === Boolean) {
-        if (schema.nullable) schema.handler = 'NullableChoices'
-        else schema.handler = 'Switch'
-      } else if (schema.type === 'Text') {
-        schema.handler = 'Textarea'
-      } else if (schema.type === Number) {
-        if (schema.step) schema.handler = 'Range'
-        else schema.handler = 'IntInput'
-      } else if (schema.choices) {
-        const text_length = schema.choices.reduce(
+    for (const [key, defaults] of Object.entries(SCHEMA)) {
+      const properties = Object.assign({}, defaults)
+      if (properties.type === Boolean) {
+        if (properties.nullable) properties.handler = 'NullableChoices'
+        else properties.handler = 'Switch'
+      } else if (properties.type === 'Text') {
+        properties.handler = 'Textarea'
+      } else if (properties.type === Number) {
+        if (properties.step) properties.handler = 'Range'
+        else properties.handler = 'IntInput'
+      } else if (properties.choices) {
+        const text_length = properties.choices.reduce(
           (acc, [_, label]) => acc + label.length,
           0
         )
         // Try to be smart and use MultiChoice only
         // for choices where labels are shorts…
         if (text_length < 40) {
-          schema.handler = 'MultiChoice'
+          properties.handler = 'MultiChoice'
         } else {
-          schema.handler = 'Select'
-          schema.selectOptions = schema.choices
+          properties.handler = 'Select'
+          properties.selectOptions = properties.choices
         }
       } else {
         switch (key) {
           case 'color':
           case 'fillColor':
-            schema.handler = 'ColorPicker'
+            properties.handler = 'ColorPicker'
             break
           case 'iconUrl':
-            schema.handler = 'IconUrl'
+            properties.handler = 'IconUrl'
             break
           case 'licence':
-            schema.handler = 'LicenceChooser'
+            properties.handler = 'LicenceChooser'
             break
         }
       }
 
       if (customHandlers[key]) {
-        schema.handler = customHandlers[key]
+        properties.handler = customHandlers[key]
       }
       // Input uses this key for its type attribute
-      delete schema.type
-      this.defaultProperties[key] = schema
+      delete properties.type
+      this.defaultProperties[key] = properties
     }
   }
 
@@ -202,7 +203,7 @@ export class MutatingForm extends Form {
   getTemplate(helper) {
     let template
     if (helper.properties.inheritable) {
-      const extraClassName = helper.get(true) === undefined ? ' undefined' : ''
+      const extraClassName = this.getter(helper.field) === undefined ? ' undefined' : ''
       template = `
         <div class="umap-field-${helper.name} formbox inheritable${extraClassName}">
           <div class="header" data-ref=header>

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

@@ -80,11 +80,17 @@ class BaseElement {
     this.input.value = ''
   }
 
-  get(own) {
-    if (!this.properties.inheritable || own) return this.builder.getter(this.field)
+  get() {
+    let value
     const path = this.field.split('.')
     const key = path[path.length - 1]
-    return this.obj.getOption(key) || SCHEMA[key]?.default
+    if (!this.properties.inheritable) {
+      value = this.builder.getter(this.field)
+    } else {
+      value = this.obj.getOption(key)
+    }
+    if (value === undefined) return SCHEMA[key]?.default
+    return value
   }
 
   toHTML() {
@@ -1164,7 +1170,7 @@ Fields.MultiChoice = class extends BaseElement {
 
 Fields.TernaryChoices = class extends Fields.MultiChoice {
   getDefault() {
-    return 'null'
+    return null
   }
 
   toJS() {
@@ -1195,7 +1201,7 @@ Fields.NullableChoices = class extends Fields.TernaryChoices {
       this.properties.choices || [
         [true, translate('always')],
         [false, translate('never')],
-        ['null', translate('hidden')],
+        [null, translate('hidden')],
       ]
     )
   }
@@ -1251,6 +1257,7 @@ Fields.Range = class extends Fields.FloatInput {
 
 Fields.ManageOwner = class extends BaseElement {
   build() {
+    super.build()
     const options = {
       className: 'edit-owner',
       on_select: L.bind(this.onSelect, this),
@@ -1281,6 +1288,7 @@ Fields.ManageOwner = class extends BaseElement {
 
 Fields.ManageEditors = class extends BaseElement {
   build() {
+    super.build()
     const options = {
       className: 'edit-editors',
       on_select: L.bind(this.onSelect, this),

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

@@ -103,8 +103,12 @@ export class Formatter {
               message: err[0].message,
             })
           }
-          Alert.error(message, 10000)
-          console.debug(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)

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 })
   }
 
@@ -233,22 +243,6 @@ export default class Help {
       }
     }
   }
-
-  _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)
-    }
-    return container
-  }
 }
 
 Help.MENU_ACTIONS = {}

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())
   }
 

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

@@ -166,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() {

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) {

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

@@ -40,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'),
@@ -231,7 +217,7 @@ const ManageTilelayerMixin = {
     }
   },
 
-  updateTileLayers: function () {
+  editTileLayers: function () {
     if (this._controls.tilelayersChooser) {
       this._controls.tilelayersChooser.openSwitcher({ edit: true })
     }
@@ -264,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) => {
@@ -298,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

@@ -147,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,
@@ -450,7 +452,7 @@ export const SCHEMA = {
     choices: [
       [true, translate('always')],
       [false, translate('never')],
-      ['null', translate('on hover')],
+      [null, translate('on hover')],
     ],
   },
   slideshow: {
@@ -507,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/sync/engine.js

@@ -2,6 +2,7 @@ import * as Utils from '../utils.js'
 import { HybridLogicalClock } from './hlc.js'
 import { DataLayerUpdater, FeatureUpdater, MapUpdater } from './updaters.js'
 import { WebSocketTransport } from './websocket.js'
+import * as SaveManager from '../saving.js'
 
 // Start reconnecting after 2 seconds, then double the delay each time
 // maxing out at 32 seconds.
@@ -65,27 +66,35 @@ export class SyncEngine {
     this.peerId = Utils.generateId()
   }
 
+  get isOpen() {
+    return this.transport?.isOpen
+  }
+
   async authenticate() {
+    if (this.isOpen) return
     const websocketTokenURI = this._umap.urls.get('map_websocket_auth_token', {
       map_id: this._umap.id,
     })
 
     const [response, _, error] = await this._umap.server.get(websocketTokenURI)
-    if (!error) {
-      this.start(response.token)
+    if (error) {
+      this.reconnect()
+      return
     }
+    await this.start(response.token)
   }
 
-  start(authToken) {
+  async start(authToken) {
     const path = this._umap.urls.get('ws_sync', { map_id: this._umap.id })
     const protocol = window.location.protocol === 'http:' ? 'ws:' : 'wss:'
-    this.transport = new WebSocketTransport(
+    this.transport = new WebSocketTransport(this)
+    await this.transport.connect(
       `${protocol}//${window.location.host}${path}`,
       authToken,
-      this,
       this.peerId,
       this._umap.properties.user?.name
     )
+    this.onConnection()
   }
 
   stop() {
@@ -106,11 +115,11 @@ export class SyncEngine {
     this.websocketConnected = false
     this.updaters.map.update({ key: 'numberOfConnectedPeers' })
 
-    this._reconnectTimeout = setTimeout(() => {
+    this._reconnectTimeout = setTimeout(async () => {
       if (this._reconnectDelay < MAX_RECONNECT_DELAY) {
         this._reconnectDelay = this._reconnectDelay * RECONNECT_DELAY_FACTOR
       }
-      this.authenticate()
+      await this.authenticate()
     }, this._reconnectDelay)
   }
   upsert(subject, metadata, value) {
@@ -125,6 +134,16 @@ export class SyncEngine {
     this._send({ verb: 'delete', subject, metadata, key })
   }
 
+  saved() {
+    if (this.offline) return
+    if (this.transport) {
+      this.transport.send('SavedMessage', {
+        sender: this.peerId,
+        lastKnownHLC: this._operations.getLastKnownHLC(),
+      })
+    }
+  }
+
   _send(inputMessage) {
     const message = this._operations.addLocal(inputMessage)
 
@@ -168,6 +187,8 @@ export class SyncEngine {
       } else if (payload.message.verb === 'ListOperationsResponse') {
         this.onListOperationsResponse(payload)
       }
+    } else if (kind === 'SavedMessage') {
+      this.onSavedMessage(payload)
     } else {
       throw new Error(`Received unknown message from the websocket server: ${kind}`)
     }
@@ -182,6 +203,7 @@ export class SyncEngine {
    */
   onOperationMessage(payload) {
     if (payload.sender === this.peerId) return
+    debug('received operation', payload)
     this._operations.storeRemoteOperations([payload])
     this._applyOperation(payload)
   }
@@ -245,7 +267,7 @@ export class SyncEngine {
    * @param {*} operations The list of (encoded operations)
    */
   onListOperationsResponse({ sender, message }) {
-    debug(`received operations from peer ${sender}`, message.operations)
+    debug(`received operations list from peer ${sender}`, message.operations)
 
     if (message.operations.length === 0) return
 
@@ -280,6 +302,13 @@ export class SyncEngine {
     // Else: apply
   }
 
+  onSavedMessage({ sender, lastKnownHLC }) {
+    debug(`received saved message from peer ${sender}`, lastKnownHLC)
+    if (lastKnownHLC === this._operations.getLastKnownHLC() && SaveManager.isDirty) {
+      SaveManager.clear()
+    }
+  }
+
   /**
    * Send a message to another peer (via the transport layer)
    *
@@ -350,7 +379,7 @@ export class Operations {
   }
 
   /**
-   * Tick the clock and add store the passed message in the operations list.
+   * Tick the clock and store the passed message in the operations list.
    *
    * @param {*} inputMessage
    * @returns {*} clock-aware message
@@ -479,11 +508,7 @@ export class Operations {
    * @return {bool} true if the two operations share the same context.
    */
   static haveSameContext(local, remote) {
-    const shouldCheckKey =
-      local.hasOwnProperty('key') &&
-      remote.hasOwnProperty('key') &&
-      typeof local.key !== 'undefined' &&
-      typeof remote.key !== 'undefined'
+    const shouldCheckKey = local.key !== undefined && remote.key !== undefined
 
     return (
       Utils.deepEqual(local.subject, remote.subject) &&

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

@@ -54,10 +54,11 @@ export class MapUpdater extends BaseUpdater {
 export class DataLayerUpdater extends BaseUpdater {
   upsert({ value }) {
     // Upsert only happens when a new datalayer is created.
-    const datalayer = this._umap.createDataLayer(value, false)
-    // Prevent the layer to get data from the server, as it will get it
-    // from the sync.
-    datalayer._loaded = true
+    try {
+      this.getDataLayerFromID(value.id)
+    } catch {
+      this._umap.createDataLayer(value, false)
+    }
   }
 
   update({ key, metadata, value }) {
@@ -92,7 +93,7 @@ export class FeatureUpdater extends BaseUpdater {
   upsert({ metadata, value }) {
     const { id, layerId } = metadata
     const datalayer = this.getDataLayerFromID(layerId)
-    const feature = this.getFeatureFromMetadata(metadata, value)
+    const feature = this.getFeatureFromMetadata(metadata)
 
     if (feature) {
       feature.geometry = value.geometry
@@ -109,7 +110,7 @@ export class FeatureUpdater extends BaseUpdater {
       return
     }
     if (key === 'geometry') {
-      const feature = this.getFeatureFromMetadata(metadata, value)
+      const feature = this.getFeatureFromMetadata(metadata)
       feature.geometry = value
     } else {
       this.updateObjectValue(feature, key, value)