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

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 (iconClassName) L.DomUtil.createIcon(title, iconClassName)
+  if (className) L.DomUtil.createIcon(title, iconClassName)
   L.DomUtil.add('span', className, title, text)
   return title
 }

umap/static/umap/js/umap.js

@@ -191,17 +191,15 @@ U.Map = L.Map.extend({
       this.renderEditToolbar()
     }
 
-    if (!this.options.noControl) {
-      this.initShortcuts()
-      this.initCaptionBar()
-      this.on('contextmenu', this.onContextMenu)
-      this.onceDataLoaded(this.setViewFromQueryString)
-      this.on('click', this.closeInplaceToolbar)
-      this.propagate()
-    }
+    this.initShortcuts()
+    if (!this.options.noControl) this.initCaptionBar()
+    this.onceDataLoaded(this.setViewFromQueryString)
 
     window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null
     this.backup()
+    this.on('click', this.closeInplaceToolbar)
+    this.on('contextmenu', this.onContextMenu)
+    this.propagate()
   },
 
   initSyncEngine: async function () {
@@ -224,12 +222,8 @@ U.Map = L.Map.extend({
   },
 
   render: function (fields) {
-    if (fields.includes('numberOfConnectedPeers')) {
-      this.renderEditToolbar()
-      this.propagate()
-    }
-
     const impacts = U.Utils.getImpactsFromSchema(fields)
+
     for (const impact of impacts) {
       switch (impact) {
         case 'ui':
@@ -1053,6 +1047,7 @@ 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)
@@ -1090,6 +1085,7 @@ U.Map = L.Map.extend({
     } else {
       window.location = data.url
     }
+    this.propagate()
     return true
   },
 
@@ -1108,10 +1104,7 @@ U.Map = L.Map.extend({
       if (datalayer.isDirty) await datalayer.save()
     }
     this.isDirty = false
-    // 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.renderEditToolbar()
     this.fire('saved')
   },
 
@@ -1599,7 +1592,7 @@ U.Map = L.Map.extend({
       'umap-caption-bar',
       this._controlContainer
     )
-    const name = L.DomUtil.create('h3', 'map-name', container)
+    const name = L.DomUtil.create('h3', '', container)
     L.DomEvent.disableClickPropagation(container)
     this.addAuthorLink('span', container)
     if (this.getOption('captionMenus')) {
@@ -1625,6 +1618,11 @@ 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)
     })
@@ -1688,7 +1686,7 @@ U.Map = L.Map.extend({
     this.loader.onAdd(this)
   },
 
-  getOwnContextMenuItems: function (event) {
+  getContextMenuItems: function (event) {
     const items = []
     if (this.hasEditMode()) {
       if (this.editEnabled) {
@@ -1728,10 +1726,8 @@ U.Map = L.Map.extend({
         })
       }
     }
-    if (items.length) {
-      items.push('-')
-    }
     items.push(
+      '-',
       {
         label: L._('Open browser'),
         action: () => this.openBrowser('layers'),
@@ -1754,14 +1750,9 @@ U.Map = L.Map.extend({
       },
       {
         label: this.help.displayLabel('SEARCH'),
-        action: () => this.search(),
+        action: () => this.search(event),
       }
     )
-    return items
-  },
-
-  getContextMenuItems: function (event) {
-    const items = []
     if (this.options.urls.routing) {
       items.push('-', {
         label: L._('Directions from here'),
@@ -1778,10 +1769,11 @@ U.Map = L.Map.extend({
   },
 
   onContextMenu: function (event) {
-    const items = this.getOwnContextMenuItems(event).concat(
-      this.getContextMenuItems(event)
+    const items = this.getContextMenuItems(event)
+    this.contextmenu.open(
+      [event.originalEvent.clientX, event.originalEvent.clientY],
+      items
     )
-    this.contextmenu.open(event.originalEvent, items)
   },
 
   editInOSM: function (e) {

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": "Suprimeix la capa",
+    "Delete layer": "Delete layer",
     "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": "Regles d'estil condicional",
-    "Add rule": "Afegeix una regla",
+    "Conditional style rules": "Conditional style rules",
+    "Add rule": "Add rule",
     "Browser: data": "Navegador: dades",
     "Browser: layers": "Navegador: capes",
     "Browser: filters": "Navegador: filtres",
@@ -513,11 +513,7 @@ 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",
-    "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"
+    "Manage collaborators": "Manage collaborators"
 }
 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": "Suprimeix la capa",
+    "Delete layer": "Delete layer",
     "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": "Regles d'estil condicional",
-    "Add rule": "Afegeix una regla",
+    "Conditional style rules": "Conditional style rules",
+    "Add rule": "Add rule",
     "Browser: data": "Navegador: dades",
     "Browser: layers": "Navegador: capes",
     "Browser: filters": "Navegador: filtres",
@@ -513,9 +513,5 @@
     "Type new owner's username": "Type new owner's username",
     "Type editor's username": "Type editor's username",
     "Map": "Map",
-    "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"
+    "Manage collaborators": "Manage collaborators"
 }

umap/static/umap/locale/en.js

@@ -513,11 +513,7 @@ 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",
-    "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"
+    "Manage collaborators": "Manage collaborators"
 }
 L.registerLocale("en", locale)
 L.setLocale("en")

umap/static/umap/locale/en.json

@@ -513,9 +513,5 @@
     "Type new owner's username": "Type new owner's username",
     "Type editor's username": "Type editor's username",
     "Map": "Map",
-    "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"
+    "Manage collaborators": "Manage collaborators"
 }