umap-project 2.6.2__py3-none-any.whl → 2.7.0__py3-none-any.whl

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

@@ -5,10 +5,14 @@ export default class URLs {
     this.urls = serverUrls
   }
 
+  has(urlName) {
+    return urlName in this.urls
+  }
+
   get(urlName, params) {
     if (typeof this[urlName] === 'function') return this[urlName](params)
 
-    if (this.urls.hasOwnProperty(urlName)) {
+    if (this.has(urlName)) {
       return template(this.urls[urlName], params)
     }
     throw `Unable to find a URL for route ${urlName}`

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

@@ -35,7 +35,7 @@ export function checkId(string) {
  * @returns Array[string]
  */
 export function getImpactsFromSchema(fields, schema) {
-  schema = schema || U.SCHEMA
+  const current_schema = schema || U.SCHEMA
   const impacted = fields
     .map((field) => {
       // remove the option prefix for fields
@@ -46,14 +46,30 @@ export function getImpactsFromSchema(fields, schema) {
     .reduce((acc, field) => {
       // retrieve the "impacts" field from the schema
       // and merge them together using sets
-      const impacts = schema[field]?.impacts || []
-      impacts.forEach((impact) => acc.add(impact))
+      const impacts = current_schema[field]?.impacts || []
+      for (const impact of impacts) {
+        acc.add(impact)
+      }
       return acc
     }, new Set())
 
   return Array.from(impacted)
 }
 
+/**
+ * Check if a field exists in the schema.
+ *
+ * @param {string} field
+ * @param {object} schema
+ * @returns {boolean}
+ */
+export function fieldInSchema(field, schema) {
+  const current_schema = schema || U.SCHEMA
+  if (typeof field !== 'string') return false
+  const field_name = field.replace('options.', '').split('.')[0]
+  return current_schema[field_name] !== undefined
+}
+
 /**
  * Import DOM purify, and initialize it.
  *
@@ -178,7 +194,7 @@ export function toHTML(r, options) {
 }
 
 export function isObject(what) {
-  return typeof what === 'object' && what !== null
+  return typeof what === 'object' && what !== null && !Array.isArray(what)
 }
 
 export function CopyJSON(geojson) {
@@ -406,3 +422,11 @@ export class WithTemplate {
     return this.element
   }
 }
+
+export function deepEqual(object1, object2) {
+  return JSON.stringify(object1) === JSON.stringify(object2)
+}
+
+export function slugify(str) {
+  return (str || 'data').replace(/[^a-z0-9]/gi, '_').toLowerCase()
+}

umap/static/umap/js/umap.controls.js

@@ -231,7 +231,7 @@ U.DeleteShapeAction = U.BaseFeatureAction.extend({
   },
 
   onClick: function (e) {
-    this.feature.enableEdit().deleteShapeAt(e.latlng)
+    this.feature.ui.enableEdit().deleteShapeAt(e.latlng)
   },
 })
 
@@ -453,17 +453,13 @@ U.PermanentCreditsControl = L.Control.extend({
   },
 
   onAdd: function () {
-    const paragraphContainer = L.DomUtil.create(
+    this.paragraphContainer = L.DomUtil.create(
       'div',
-      'umap-permanent-credits-container'
+      'umap-permanent-credits-container text'
     )
-    const creditsParagraph = L.DomUtil.create('p', '', paragraphContainer)
-
-    this.paragraphContainer = paragraphContainer
     this.setCredits()
     this.setBackground()
-
-    return paragraphContainer
+    return this.paragraphContainer
   },
 
   setCredits: function () {
@@ -578,11 +574,15 @@ const ControlsMixin = {
   ],
 
   renderEditToolbar: function () {
-    const container = L.DomUtil.create(
-      'div',
-      'umap-main-edit-toolbox with-transition dark',
-      this._controlContainer
-    )
+    const className = 'umap-main-edit-toolbox'
+    const container =
+      document.querySelector(`.${className}`) ||
+      L.DomUtil.create(
+        'div',
+        `${className} with-transition dark`,
+        this._controlContainer
+      )
+    container.innerHTML = ''
     const leftContainer = L.DomUtil.create('div', 'umap-left-edit-toolbox', container)
     const rightContainer = L.DomUtil.create('div', 'umap-right-edit-toolbox', container)
     const logo = L.DomUtil.create('div', 'logo', leftContainer)
@@ -623,33 +623,70 @@ const ControlsMixin = {
       },
       this
     )
-    const update = () => {
-      const status = this.permissions.getShareStatusDisplay()
-      nameButton.textContent = this.getDisplayName()
-      // status is not set until map is saved once
-      if (status) {
-        shareStatusButton.textContent = L._('Visibility: {status}', {
-          status: status,
-        })
-      }
-    }
-    update()
-    this.once('saved', L.bind(update, this))
     if (this.options.editMode === 'advanced') {
       L.DomEvent.on(nameButton, 'click', this.editCaption, this)
       L.DomEvent.on(shareStatusButton, 'click', this.permissions.edit, this.permissions)
     }
-    this.on('postsync', L.bind(update, this))
     if (this.options.user?.id) {
-      L.DomUtil.createLink(
-        'umap-user',
+      const button = U.Utils.loadTemplate(`
+        <button class="umap-user flat" type="button">
+          <i class="icon icon-16 icon-profile"></i>
+          <span>${this.options.user.name}</span>
+        </button>
+        `)
+      rightContainer.appendChild(button)
+      const menu = new U.ContextMenu({ className: 'dark', fixed: true })
+      const actions = [
+        {
+          label: L._('New map'),
+          action: this.urls.get('map_new'),
+        },
+        {
+          label: L._('My maps'),
+          action: this.urls.get('user_dashboard'),
+        },
+        {
+          label: L._('My teams'),
+          action: this.urls.get('user_teams'),
+        },
+      ]
+      if (this.urls.has('user_profile')) {
+        actions.push({
+          label: L._('My profile'),
+          action: this.urls.get('user_profile'),
+        })
+      }
+      button.addEventListener('click', () => {
+        menu.openBelow(button, actions)
+      })
+    }
+
+    const connectedPeers = this.sync.getNumberOfConnectedPeers()
+    if (connectedPeers !== 0) {
+      const connectedPeersCount = L.DomUtil.createButton(
+        'leaflet-control-connected-peers',
         rightContainer,
-        L._('My Dashboard ({username})', {
-          username: this.options.user.name,
-        }),
-        this.options.user.url
+        '',
       )
+      L.DomEvent.on(connectedPeersCount, 'mouseover', () => {
+        this.tooltip.open({
+          content: L._('{connectedPeers} peer(s) currently connected to this map', {
+            connectedPeers: connectedPeers,
+          }),
+          anchor: connectedPeersCount,
+          position: 'bottom',
+          delay: 500,
+          duration: 5000,
+        })
+      })
+
+      const updateConnectedPeersCount = () => {
+        connectedPeersCount.innerHTML =
+          '<span>' + this.sync.getNumberOfConnectedPeers() + '</span>'
+      }
+      updateConnectedPeersCount()
     }
+
     this.help.getStartedLink(rightContainer)
     const controlEditCancel = L.DomUtil.createButton(
       'leaflet-control-edit-cancel',
@@ -808,7 +845,8 @@ U.TileLayerControl = L.Control.IconLayers.extend({
     )
     const button = L.DomUtil.element({
       tagName: 'button',
-      className: 'leaflet-iconLayers-layerCell leaflet-iconLayers-layerCell-plus button',
+      className:
+        'leaflet-iconLayers-layerCell leaflet-iconLayers-layerCell-plus button',
       textContent: '+',
       parent: lastRow,
     })
@@ -1140,23 +1178,6 @@ L.Control.Loading.include({
   },
 })
 
-/*
- * Make it dynamic
- */
-U.ContextMenu = L.Map.ContextMenu.extend({
-  _createItems: function (e) {
-    this._map.setContextMenuItems(e)
-    L.Map.ContextMenu.prototype._createItems.call(this)
-  },
-
-  _showAtPoint: function (pt, e) {
-    this._items = []
-    this._container.innerHTML = ''
-    this._createItems(e)
-    L.Map.ContextMenu.prototype._showAtPoint.call(this, pt, e)
-  },
-})
-
 U.Editable = L.Editable.extend({
   initialize: function (map, options) {
     L.Editable.prototype.initialize.call(this, map, options)
@@ -1181,9 +1202,9 @@ U.Editable = L.Editable.extend({
       if (this.map.editedFeature !== event.layer) event.layer.feature.edit(event)
     })
     this.on('editable:editing', (event) => {
-      const layer = event.layer
-      layer.feature.isDirty = true
-      layer.feature.fromLatLngs(layer.getLatLngs())
+      const feature = event.layer.feature
+      feature.isDirty = true
+      feature.pullGeometry(false)
     })
     this.on('editable:vertex:ctrlclick', (event) => {
       const index = event.vertex.getIndex()
@@ -1282,9 +1303,9 @@ U.Editable = L.Editable.extend({
     }
     if (measure) {
       if (e.layer instanceof L.Polygon) {
-        content += L._(' (area: {measure})', { measure: measure })
+        content += ` ${L._('(area: {measure})', { measure: measure })}`
       } else if (e.layer instanceof L.Polyline) {
-        content += L._(' (length: {measure})', { measure: measure })
+        content += ` ${L._('(length: {measure})', { measure: measure })}`
       }
     }
     if (content) {

umap/static/umap/js/umap.core.js

@@ -141,10 +141,10 @@ L.DomUtil.createButtonIcon = (parent, className, title, callback, size = 16) =>
   return el
 }
 
-L.DomUtil.createTitle = (parent, text, className, tag = 'h3') => {
+L.DomUtil.createTitle = (parent, text, iconClassName, className = '', tag = 'h3') => {
   const title = L.DomUtil.create(tag, '', parent)
-  if (className) L.DomUtil.createIcon(title, className)
-  L.DomUtil.add('span', '', title, text)
+  if (iconClassName) L.DomUtil.createIcon(title, iconClassName)
+  L.DomUtil.add('span', className, title, text)
   return title
 }
 

umap/static/umap/js/umap.forms.js

@@ -1029,6 +1029,7 @@ L.FormBuilder.ManageOwner = L.FormBuilder.Element.extend({
     const options = {
       className: 'edit-owner',
       on_select: L.bind(this.onSelect, this),
+      placeholder: L._("Type new owner's username"),
     }
     this.autocomplete = new U.AjaxAutocomplete(this.parentNode, options)
     const owner = this.toHTML()
@@ -1058,6 +1059,7 @@ L.FormBuilder.ManageEditors = L.FormBuilder.Element.extend({
       className: 'edit-editors',
       on_select: L.bind(this.onSelect, this),
       on_unselect: L.bind(this.onUnselect, this),
+      placeholder: L._("Type editor's username"),
     }
     this.autocomplete = new U.AjaxAutocompleteMultiple(this.parentNode, options)
     this._values = this.toHTML()
@@ -1131,7 +1133,7 @@ U.FormBuilder = L.FormBuilder.extend({
         else schema.handler = 'IntInput'
       } else if (schema.choices) {
         const text_length = schema.choices.reduce(
-          (acc, [value, label]) => acc + label.length,
+          (acc, [_, label]) => acc + label.length,
           0
         )
         // Try to be smart and use MultiChoice only