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

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

@@ -578,11 +578,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,32 +627,44 @@ 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',
-        rightContainer,
-        L._('My Dashboard ({username})', {
-          username: this.options.user.name,
-        }),
-        this.options.user.url
-      )
+      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', () => {
+        const x = button.offsetLeft
+        const y = button.offsetTop + button.offsetHeight
+        menu.open([x, y], actions)
+      })
     }
     this.help.getStartedLink(rightContainer)
     const controlEditCancel = L.DomUtil.createButton(
@@ -808,7 +824,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 +1157,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 +1181,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()

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

umap/static/umap/js/umap.js

@@ -58,6 +58,7 @@ U.Map = L.Map.extend({
     this.panel = new U.Panel(this)
     this.dialog = new U.Dialog({ className: 'dark' })
     this.tooltip = new U.Tooltip(this._controlContainer)
+    this.contextmenu = new U.ContextMenu()
     if (this.hasEditMode()) {
       this.editPanel = new U.EditPanel(this)
       this.fullPanel = new U.FullPanel(this)
@@ -109,10 +110,9 @@ U.Map = L.Map.extend({
       delete this.options.advancedFilterKey
     }
 
-    // Global storage for retrieving datalayers and features
-    this.datalayers = {}
-    this.datalayers_index = []
-    this.dirty_datalayers = []
+    // Global storage for retrieving datalayers and features.
+    this.datalayers = {} // All datalayers, including deleted.
+    this.datalayers_index = [] // Datalayers actually on the map and ordered.
     this.features_index = {}
 
     // Needed for actions labels
@@ -197,8 +197,9 @@ U.Map = L.Map.extend({
 
     window.onbeforeunload = () => (this.editEnabled && this.isDirty) || null
     this.backup()
-    this.initContextMenu()
     this.on('click', this.closeInplaceToolbar)
+    this.on('contextmenu', this.onContextMenu)
+    this.propagate()
   },
 
   initSyncEngine: async function () {
@@ -230,6 +231,7 @@ U.Map = L.Map.extend({
           this.renderEditToolbar()
           this.renderControls()
           this.browser.redraw()
+          this.propagate()
           break
         case 'data':
           this.redrawVisibleDataLayers()
@@ -486,7 +488,7 @@ U.Map = L.Map.extend({
   loadDataLayers: async function () {
     this.datalayersLoaded = true
     this.fire('datalayersloaded')
-    for (const datalayer of Object.values(this.datalayers)) {
+    for (const datalayer of this.datalayers_index) {
       if (datalayer.showAtLoad()) await datalayer.show()
     }
     this.dataloaded = true
@@ -724,6 +726,10 @@ U.Map = L.Map.extend({
     }
   },
 
+  hasLayers: function () {
+    return Boolean(this.datalayers_index.length)
+  },
+
   fitDataBounds: function () {
     const bounds = this.getLayersBounds()
     if (!this.hasData() || !bounds.isValid()) return false
@@ -928,6 +934,7 @@ U.Map = L.Map.extend({
       if (mustReindex) datalayer.reindex()
       datalayer.redraw()
     })
+    this.propagate()
     this.fire('postsync')
     this.isDirty = true
   },
@@ -991,12 +998,12 @@ U.Map = L.Map.extend({
     if (this.editTools) this.editTools.stopDrawing()
     this.resetOptions()
     this.datalayers_index = [].concat(this._datalayers_index_bk)
-    this.dirty_datalayers.slice().forEach((datalayer) => {
+    // Iter over all datalayers, including deleted if any.
+    for (const datalayer of Object.values(this.datalayers)) {
       if (datalayer.isDeleted) datalayer.connectToMap()
-      datalayer.reset()
-    })
+      if (datalayer.isDirty) datalayer.reset()
+    }
     this.ensurePanesOrder()
-    this.dirty_datalayers = []
     this.initTileLayers()
     this.isDirty = false
     this.onDataLayersChanged()
@@ -1006,25 +1013,6 @@ U.Map = L.Map.extend({
     this._container.classList.toggle('umap-is-dirty', this.isDirty)
   },
 
-  addDirtyDatalayer: function (datalayer) {
-    if (this.dirty_datalayers.indexOf(datalayer) === -1) {
-      this.dirty_datalayers.push(datalayer)
-      this.isDirty = true
-    }
-  },
-
-  removeDirtyDatalayer: function (datalayer) {
-    if (this.dirty_datalayers.indexOf(datalayer) !== -1) {
-      this.dirty_datalayers.splice(this.dirty_datalayers.indexOf(datalayer), 1)
-      this.checkDirty()
-    }
-  },
-
-  continueSaving: function () {
-    if (this.dirty_datalayers.length) this.dirty_datalayers[0].save()
-    else this.fire('saved')
-  },
-
   exportOptions: function () {
     const properties = {}
     for (const option of Object.keys(U.SCHEMA)) {
@@ -1054,19 +1042,17 @@ U.Map = L.Map.extend({
       return
     }
     if (data.login_required) {
-      window.onLogin = () => this.saveSelf()
+      window.onLogin = () => this.save()
       window.open(data.login_required)
       return
     }
-    if (data.user?.id) {
-      this.options.user = data.user
-      this.renderEditToolbar()
-    }
+    this.options.user = data.user
+    this.renderEditToolbar()
     if (!this.options.umap_id) {
       this.options.umap_id = data.id
       this.permissions.setOptions(data.permissions)
       this.permissions.commit()
-      if (data?.permissions?.anonymous_edit_url) {
+      if (data.permissions?.anonymous_edit_url) {
         this.once('saved', () => {
           U.AlertCreation.info(
             L._('Your map has been created with an anonymous account!'),
@@ -1099,21 +1085,42 @@ U.Map = L.Map.extend({
     } else {
       window.location = data.url
     }
-    this.permissions.save()
+    this.propagate()
+    return true
   },
 
-  save: function () {
+  save: async function () {
     if (!this.isDirty) return
     if (this._default_extent) this._setCenterAndZoom()
     this.backup()
-    this.once('saved', () => {
-      this.isDirty = false
-    })
     if (this.options.editMode === 'advanced') {
       // Only save the map if the user has the rights to do so.
-      this.saveSelf()
-    } else {
-      this.permissions.save()
+      const ok = await this.saveSelf()
+      if (!ok) return
+    }
+    await this.permissions.save()
+    // Iter over all datalayers, including deleted.
+    for (const datalayer of Object.values(this.datalayers)) {
+      if (datalayer.isDirty) await datalayer.save()
+    }
+    this.isDirty = false
+    this.renderEditToolbar()
+    this.fire('saved')
+  },
+
+  propagate: function () {
+    let els = document.querySelectorAll('.map-name')
+    for (const el of els) {
+      el.textContent = this.getDisplayName()
+    }
+    const status = this.permissions.getShareStatusDisplay()
+    els = document.querySelectorAll('.share-status')
+    for (const el of els) {
+      if (status) {
+        el.textContent = L._('Visibility: {status}', {
+          status: status,
+        })
+      }
     }
   },
 
@@ -1653,13 +1660,13 @@ U.Map = L.Map.extend({
   },
 
   clone: async function () {
-    if (
-      confirm(L._('Are you sure you want to clone this map and all its datalayers?'))
-    ) {
-      const url = this.urls.get('map_clone', { map_id: this.options.umap_id })
-      const [data, response, error] = await this.server.post(url)
-      if (data.redirect) window.location = data.redirect
-    }
+    this.dialog
+      .confirm(L._('Are you sure you want to clone this map and all its datalayers?'))
+      .then(async () => {
+        const url = this.urls.get('map_clone', { map_id: this.options.umap_id })
+        const [data, response, error] = await this.server.post(url)
+        if (data.redirect) window.location = data.redirect
+      })
   },
 
   removeDataLayers: function () {
@@ -1679,118 +1686,94 @@ U.Map = L.Map.extend({
     this.loader.onAdd(this)
   },
 
-  initContextMenu: function () {
-    this.contextmenu = new U.ContextMenu(this)
-    this.contextmenu.enable()
-  },
-
-  setContextMenuItems: function (e) {
-    let items = []
-    if (this._zoom !== this.getMaxZoom()) {
-      items.push({
-        text: L._('Zoom in'),
-        callback: function () {
-          this.zoomIn()
-        },
-      })
-    }
-    if (this._zoom !== this.getMinZoom()) {
-      items.push({
-        text: L._('Zoom out'),
-        callback: function () {
-          this.zoomOut()
-        },
-      })
-    }
-    if (e?.relatedTarget) {
-      if (e.relatedTarget.getContextMenuItems) {
-        items = items.concat(e.relatedTarget.getContextMenuItems(e))
-      }
-    }
+  getContextMenuItems: function (event) {
+    const items = []
     if (this.hasEditMode()) {
-      items.push('-')
       if (this.editEnabled) {
         if (!this.isDirty) {
           items.push({
-            text: this.help.displayLabel('STOP_EDIT'),
-            callback: this.disableEdit,
+            label: this.help.displayLabel('STOP_EDIT'),
+            action: () => this.disableEdit(),
           })
         }
         if (this.options.enableMarkerDraw) {
           items.push({
-            text: this.help.displayLabel('DRAW_MARKER'),
-            callback: this.startMarker,
-            context: this,
+            label: this.help.displayLabel('DRAW_MARKER'),
+            action: () => this.startMarker(event),
           })
         }
         if (this.options.enablePolylineDraw) {
           items.push({
-            text: this.help.displayLabel('DRAW_POLYGON'),
-            callback: this.startPolygon,
-            context: this,
+            label: this.help.displayLabel('DRAW_POLYGON'),
+            action: () => this.startPolygon(event),
           })
         }
         if (this.options.enablePolygonDraw) {
           items.push({
-            text: this.help.displayLabel('DRAW_LINE'),
-            callback: this.startPolyline,
-            context: this,
+            label: this.help.displayLabel('DRAW_LINE'),
+            action: () => this.startPolyline(event),
           })
         }
         items.push('-')
         items.push({
-          text: L._('Help'),
-          callback: function () {
-            this.help.show('edit')
-          },
+          label: L._('Help'),
+          action: () => this.help.show('edit'),
         })
       } else {
         items.push({
-          text: this.help.displayLabel('TOGGLE_EDIT'),
-          callback: this.enableEdit,
+          label: this.help.displayLabel('TOGGLE_EDIT'),
+          action: () => this.enableEdit(),
         })
       }
     }
     items.push(
       '-',
       {
-        text: L._('Open browser'),
-        callback: () => this.openBrowser('layers'),
+        label: L._('Open browser'),
+        action: () => this.openBrowser('layers'),
       },
       {
-        text: L._('Browse data'),
-        callback: () => this.openBrowser('data'),
+        label: L._('Browse data'),
+        action: () => this.openBrowser('data'),
       }
     )
     if (this.options.facetKey) {
       items.push({
-        text: L._('Filter data'),
-        callback: () => this.openBrowser('filters'),
+        label: L._('Filter data'),
+        action: () => this.openBrowser('filters'),
       })
     }
     items.push(
       {
-        text: L._('Open caption'),
-        callback: this.openCaption,
+        label: L._('Open caption'),
+        action: () => this.openCaption(),
       },
       {
-        text: this.help.displayLabel('SEARCH'),
-        callback: this.search,
+        label: this.help.displayLabel('SEARCH'),
+        action: () => this.search(event),
       }
     )
     if (this.options.urls.routing) {
       items.push('-', {
-        text: L._('Directions from here'),
-        callback: this.openExternalRouting,
+        label: L._('Directions from here'),
+        action: () => this.openExternalRouting(event),
       })
     }
     if (this.options.urls.edit_in_osm) {
       items.push('-', {
-        text: L._('Edit in OpenStreetMap'),
-        callback: this.editInOSM,
+        label: L._('Edit in OpenStreetMap'),
+        action: () => this.editInOSM(event),
       })
     }
-    this.options.contextmenuItems = items
+    return items
+  },
+
+  onContextMenu: function (event) {
+    const items = this.getContextMenuItems(event)
+    this.contextmenu.open(
+      [event.originalEvent.clientX, event.originalEvent.clientY],
+      items
+    )
   },
 
   editInOSM: function (e) {
@@ -1850,7 +1833,7 @@ U.Map = L.Map.extend({
 
   getFeatureById: function (id) {
     let feature
-    for (const datalayer of Object.values(this.datalayers)) {
+    for (const datalayer of this.datalayers_index) {
       feature = datalayer.getFeatureById(id)
       if (feature) return feature
     }

umap/static/umap/locale/br.js

@@ -1,6 +1,6 @@
 const locale = {
-    "(area: {measure})": "(gorread: {measure})",
-    "(length: {measure})": "(pellder: {measure})",
+    "(area: {measure})": "(area: {measure})",
+    "(length: {measure})": "(length: {measure})",
     "# one hash for main heading": "# un diezenn evit an titl pennañ",
     "## two hashes for second heading": "## div ziezenn evit an eil titl",
     "### three hashes for third heading": "### teir diezenn evit an trede titl",
@@ -477,7 +477,6 @@ const locale = {
     "Search area": "Search area",
     "Type area name, or let empty to load data in current map view": "Type area name, or let empty to load data in current map view",
     "Data successfully imported!": "Roadennoù enporzhiet gant berzh!",
-    "My Dashboard ({username})": "Ma Zaolenn-vourzh ({username})",
     "Clear data": "Skarzhañ ar roadennoù",
     "Remove layers": "Lemel ar gwiskadoù",
     "Categorized": "Dre rummad",
@@ -504,7 +503,17 @@ const locale = {
     "Property name to compute circles": "Property name to compute circles",
     "Min circle radius": "Min circle radius",
     "Max circle radius": "Max circle radius",
-    "Display the open browser control": "Display the open browser control"
+    "Display the open browser control": "Display the open browser control",
+    "Copy as GeoJSON": "Copy as GeoJSON",
+    "Please zoom in to edit the geometry": "Please zoom in to edit the geometry",
+    "New map": "New map",
+    "My maps": "My maps",
+    "My teams": "My teams",
+    "My profile": "My profile",
+    "Type new owner's username": "Type new owner's username",
+    "Type editor's username": "Type editor's username",
+    "Map": "Map",
+    "Manage collaborators": "Manage collaborators"
 }
 L.registerLocale("br", locale)
 L.setLocale("br")

umap/static/umap/locale/br.json

@@ -1,6 +1,6 @@
 {
-    "(area: {measure})": "(gorread: {measure})",
-    "(length: {measure})": "(pellder: {measure})",
+    "(area: {measure})": "(area: {measure})",
+    "(length: {measure})": "(length: {measure})",
     "# one hash for main heading": "# un diezenn evit an titl pennañ",
     "## two hashes for second heading": "## div ziezenn evit an eil titl",
     "### three hashes for third heading": "### teir diezenn evit an trede titl",
@@ -477,7 +477,6 @@
     "Search area": "Search area",
     "Type area name, or let empty to load data in current map view": "Type area name, or let empty to load data in current map view",
     "Data successfully imported!": "Roadennoù enporzhiet gant berzh!",
-    "My Dashboard ({username})": "Ma Zaolenn-vourzh ({username})",
     "Clear data": "Skarzhañ ar roadennoù",
     "Remove layers": "Lemel ar gwiskadoù",
     "Categorized": "Dre rummad",
@@ -504,5 +503,15 @@
     "Property name to compute circles": "Property name to compute circles",
     "Min circle radius": "Min circle radius",
     "Max circle radius": "Max circle radius",
-    "Display the open browser control": "Display the open browser control"
+    "Display the open browser control": "Display the open browser control",
+    "Copy as GeoJSON": "Copy as GeoJSON",
+    "Please zoom in to edit the geometry": "Please zoom in to edit the geometry",
+    "New map": "New map",
+    "My maps": "My maps",
+    "My teams": "My teams",
+    "My profile": "My profile",
+    "Type new owner's username": "Type new owner's username",
+    "Type editor's username": "Type editor's username",
+    "Map": "Map",
+    "Manage collaborators": "Manage collaborators"
 }