umap-project 2.7.0b2__py3-none-any.whl → 2.7.1__py3-none-any.whl

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.
  *
@@ -407,6 +423,10 @@ export class WithTemplate {
   }
 }
 
-export function deepEqual(object1, object2){
+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

@@ -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 () {
@@ -661,11 +657,36 @@ const ControlsMixin = {
         })
       }
       button.addEventListener('click', () => {
-        const x = button.offsetLeft
-        const y = button.offsetTop + button.offsetHeight
-        menu.openAt([x, y], actions)
+        menu.openBelow(button, actions)
+      })
+    }
+
+    const connectedPeers = this.sync.getNumberOfConnectedPeers()
+    if (connectedPeers !== 0) {
+      const connectedPeersCount = L.DomUtil.createButton(
+        'leaflet-control-connected-peers',
+        rightContainer,
+        ''
+      )
+      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',
@@ -1161,17 +1182,6 @@ U.Editable = L.Editable.extend({
   initialize: function (map, options) {
     L.Editable.prototype.initialize.call(this, map, options)
     this.on('editable:drawing:click editable:drawing:move', this.drawingTooltip)
-    this.on('editable:drawing:end', (event) => {
-      this.map.tooltip.close()
-      // Leaflet.Editable will delete the drawn shape if invalid
-      // (eg. line has only one drawn point)
-      // So let's check if the layer has no more shape
-      if (!event.layer.feature.hasGeom()) {
-        event.layer.feature.del()
-      } else {
-        event.layer.feature.edit()
-      }
-    })
     // Layer for items added by users
     this.on('editable:drawing:cancel', (event) => {
       if (event.layer instanceof U.LeafletMarker) event.layer.feature.del()
@@ -1301,4 +1311,19 @@ U.Editable = L.Editable.extend({
     L.DomEvent.stop(e)
     e.cancel()
   },
+
+  onEscape: function () {
+    this.once('editable:drawing:end', (event) => {
+      this.map.tooltip.close()
+      // Leaflet.Editable will delete the drawn shape if invalid
+      // (eg. line has only one drawn point)
+      // So let's check if the layer has no more shape
+      if (!event.layer.feature.hasGeom()) {
+        event.layer.feature.del()
+      } else {
+        event.layer.feature.edit()
+      }
+    })
+    this.stopDrawing()
+  },
 })

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

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

umap/static/umap/js/umap.js

@@ -191,15 +191,17 @@ U.Map = L.Map.extend({
       this.renderEditToolbar()
     }
 
-    this.initShortcuts()
-    if (!this.options.noControl) this.initCaptionBar()
-    this.onceDataLoaded(this.setViewFromQueryString)
+    if (!this.options.noControl) {
+      this.initShortcuts()
+      this.initCaptionBar()
+      this.on('contextmenu', this.onContextMenu)
+      this.onceDataLoaded(this.setViewFromQueryString)
+      this.on('click', this.closeInplaceToolbar)
+      this.propagate()
+    }
 
     window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null
     this.backup()
-    this.on('click', this.closeInplaceToolbar)
-    this.on('contextmenu', this.onContextMenu)
-    this.propagate()
   },
 
   initSyncEngine: async function () {
@@ -222,8 +224,12 @@ U.Map = L.Map.extend({
   },
 
   render: function (fields) {
-    const impacts = U.Utils.getImpactsFromSchema(fields)
+    if (fields.includes('numberOfConnectedPeers')) {
+      this.renderEditToolbar()
+      this.propagate()
+    }
 
+    const impacts = U.Utils.getImpactsFromSchema(fields)
     for (const impact of impacts) {
       switch (impact) {
         case 'ui':
@@ -557,7 +563,7 @@ U.Map = L.Map.extend({
         if (this.importer.dialog.visible) {
           this.importer.dialog.close()
         } else if (this.editEnabled && this.editTools.drawing()) {
-          this.editTools.stopDrawing()
+          this.editTools.onEscape()
         } else if (this.measureTools.enabled()) {
           this.measureTools.stopDrawing()
         } else if (this.fullPanel?.isOpen()) {
@@ -1047,7 +1053,6 @@ U.Map = L.Map.extend({
       return
     }
     this.options.user = data.user
-    this.renderEditToolbar()
     if (!this.options.umap_id) {
       this.options.umap_id = data.id
       this.permissions.setOptions(data.permissions)
@@ -1085,7 +1090,6 @@ U.Map = L.Map.extend({
     } else {
       window.location = data.url
     }
-    this.propagate()
     return true
   },
 
@@ -1104,7 +1108,10 @@ U.Map = L.Map.extend({
       if (datalayer.isDirty) await datalayer.save()
     }
     this.isDirty = false
-    this.renderEditToolbar()
+    // Do a blind render for now, as we are not sure what could
+    // have changed, we'll be more subtil when we'll remove the
+    // save action
+    this.render(['name', 'user', 'permissions'])
     this.fire('saved')
   },
 
@@ -1592,7 +1599,7 @@ U.Map = L.Map.extend({
       'umap-caption-bar',
       this._controlContainer
     )
-    const name = L.DomUtil.create('h3', '', container)
+    const name = L.DomUtil.create('h3', 'map-name', container)
     L.DomEvent.disableClickPropagation(container)
     this.addAuthorLink('span', container)
     if (this.getOption('captionMenus')) {
@@ -1618,11 +1625,6 @@ U.Map = L.Map.extend({
         )
       }
     }
-    const setName = function () {
-      name.textContent = this.getDisplayName()
-    }
-    L.bind(setName, this)()
-    this.on('postsync', L.bind(setName, this))
     this.onceDatalayersLoaded(function () {
       this.slideshow.renderToolbox(container)
     })
@@ -1686,7 +1688,7 @@ U.Map = L.Map.extend({
     this.loader.onAdd(this)
   },
 
-  getContextMenuItems: function (event) {
+  getOwnContextMenuItems: function (event) {
     const items = []
     if (this.hasEditMode()) {
       if (this.editEnabled) {
@@ -1752,9 +1754,14 @@ U.Map = L.Map.extend({
       },
       {
         label: this.help.displayLabel('SEARCH'),
-        action: () => this.search(event),
+        action: () => this.search(),
       }
     )
+    return items
+  },
+
+  getContextMenuItems: function (event) {
+    const items = []
     if (this.options.urls.routing) {
       items.push('-', {
         label: L._('Directions from here'),
@@ -1771,7 +1778,9 @@ U.Map = L.Map.extend({
   },
 
   onContextMenu: function (event) {
-    const items = this.getContextMenuItems(event)
+    const items = this.getOwnContextMenuItems(event).concat(
+      this.getContextMenuItems(event)
+    )
     this.contextmenu.open(event.originalEvent, items)
   },
 

umap/static/umap/locale/ca.js

@@ -102,7 +102,7 @@ const locale = {
     "Define link to open in a new window on polygon click.": "Define link to open in a new window on polygon click.",
     "define": "definir",
     "Delay between two transitions when in play mode": "Delay between two transitions when in play mode",
-    "Delete layer": "Delete layer",
+    "Delete layer": "Suprimeix la capa",
     "Delete this feature": "Suprimeix aquesta característica",
     "Delete this shape": "Delete this shape",
     "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)",
@@ -456,8 +456,8 @@ const locale = {
     "key=value or key!=value": "key=value or key!=value",
     "Are you sure you want to delete this rule?": "Are you sure you want to delete this rule?",
     "empty rule": "empty rule",
-    "Conditional style rules": "Conditional style rules",
-    "Add rule": "Add rule",
+    "Conditional style rules": "Regles d'estil condicional",
+    "Add rule": "Afegeix una regla",
     "Browser: data": "Navegador: dades",
     "Browser: layers": "Navegador: capes",
     "Browser: filters": "Navegador: filtres",
@@ -513,7 +513,11 @@ const locale = {
     "Type new owner's username": "Type new owner's username",
     "Type editor's username": "Type editor's username",
     "Map": "Map",
-    "Manage collaborators": "Manage collaborators"
+    "Manage collaborators": "Manage collaborators",
+    "show/hide all layers": "show/hide all layers",
+    "zoom to data extent": "zoom to data extent",
+    "download visible data": "download visible data",
+    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map"
 }
 L.registerLocale("ca", locale)
 L.setLocale("ca")

umap/static/umap/locale/ca.json

@@ -102,7 +102,7 @@
     "Define link to open in a new window on polygon click.": "Define link to open in a new window on polygon click.",
     "define": "definir",
     "Delay between two transitions when in play mode": "Delay between two transitions when in play mode",
-    "Delete layer": "Delete layer",
+    "Delete layer": "Suprimeix la capa",
     "Delete this feature": "Suprimeix aquesta característica",
     "Delete this shape": "Delete this shape",
     "Delete this vertex (Alt+Click)": "Delete this vertex (Alt+Click)",
@@ -456,8 +456,8 @@
     "key=value or key!=value": "key=value or key!=value",
     "Are you sure you want to delete this rule?": "Are you sure you want to delete this rule?",
     "empty rule": "empty rule",
-    "Conditional style rules": "Conditional style rules",
-    "Add rule": "Add rule",
+    "Conditional style rules": "Regles d'estil condicional",
+    "Add rule": "Afegeix una regla",
     "Browser: data": "Navegador: dades",
     "Browser: layers": "Navegador: capes",
     "Browser: filters": "Navegador: filtres",
@@ -513,5 +513,9 @@
     "Type new owner's username": "Type new owner's username",
     "Type editor's username": "Type editor's username",
     "Map": "Map",
-    "Manage collaborators": "Manage collaborators"
+    "Manage collaborators": "Manage collaborators",
+    "show/hide all layers": "show/hide all layers",
+    "zoom to data extent": "zoom to data extent",
+    "download visible data": "download visible data",
+    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map"
 }

umap/static/umap/locale/en.js

@@ -513,7 +513,11 @@ const locale = {
     "Type new owner's username": "Type new owner's username",
     "Type editor's username": "Type editor's username",
     "Map": "Map",
-    "Manage collaborators": "Manage collaborators"
+    "Manage collaborators": "Manage collaborators",
+    "show/hide all layers": "show/hide all layers",
+    "zoom to data extent": "zoom to data extent",
+    "download visible data": "download visible data",
+    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -513,5 +513,9 @@
     "Type new owner's username": "Type new owner's username",
     "Type editor's username": "Type editor's username",
     "Map": "Map",
-    "Manage collaborators": "Manage collaborators"
+    "Manage collaborators": "Manage collaborators",
+    "show/hide all layers": "show/hide all layers",
+    "zoom to data extent": "zoom to data extent",
+    "download visible data": "download visible data",
+    "{connectedPeers} peer(s) currently connected to this map": "{connectedPeers} peer(s) currently connected to this map"
 }