umap-project 2.9.3__py3-none-any.whl → 3.0.1__py3-none-any.whl

umap/static/umap/js/modules/ui/bar.js

@@ -1,16 +1,22 @@
 import { DomEvent } from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { LineString, Point, Polygon } from '../data/features.js'
 import { translate } from '../i18n.js'
 import { WithTemplate } from '../utils.js'
-import ContextMenu from './contextmenu.js'
 import * as Utils from '../utils.js'
-import { Point, LineString, Polygon } from '../data/features.js'
+import ContextMenu from './contextmenu.js'
 
 const TOP_BAR_TEMPLATE = `
 <div class="umap-main-edit-toolbox with-transition dark">
     <div class="umap-left-edit-toolbox" data-ref="left">
         <div class="logo"><a class="" href="/" title="${translate('Go to the homepage')}">uMap</a></div>
-        <button class="map-name flat" type="button" data-ref="name"></button>
-        <button class="share-status flat" type="button" data-ref="share"></button>
+        <button class="map-name flat truncate" type="button" data-ref="name"></button>
+        <button class="share-status flat truncate" type="button" data-ref="share"></button>
+        <button class="edit-undo round flat" type="button" data-ref="undo" disabled>
+            <i class="icon icon-16 icon-undo"></i>
+        </button>
+        <button class="edit-redo round flat" type="button" data-ref="redo" disabled>
+            <i class="icon icon-16 icon-redo"></i>
+        </button>
     </div>
     <div class="umap-right-edit-toolbox" data-ref="right">
         <button class="connected-peers round" type="button" data-ref="peers">
@@ -19,18 +25,14 @@ const TOP_BAR_TEMPLATE = `
         </button>
         <button class="umap-user flat" type="button" data-ref="user">
           <i class="icon icon-16 icon-profile"></i>
-          <span class="username" data-ref="username"></span>
+          <span class="username truncate" data-ref="username"></span>
         </button>
         <button class="umap-help-link flat" type="button" title="${translate('Help')}" data-ref="help">${translate('Help')}</button>
-        <button class="edit-cancel round" type="button" data-ref="cancel">
-            <i class="icon icon-16 icon-restore"></i>
-            <span class="">${translate('Cancel edits')}</span>
-        </button>
-        <button class="edit-disable round" type="button" data-ref="view">
+        <button class="edit-disable round disabled-on-dirty" type="button" data-ref="view">
             <i class="icon icon-16 icon-eye"></i>
-            <span class="">${translate('View')}</span>
+            <span>${translate('View')}</span>
         </button>
-        <button class="edit-save button round" type="button" data-ref="save">
+        <button class="edit-save button round enabled-on-dirty" type="button" data-ref="save">
             <i class="icon icon-16 icon-save"></i>
             <i class="icon icon-16 icon-save-disabled"></i>
             <span hidden data-ref="saveLabel">${translate('Save')}</span>
@@ -118,11 +120,21 @@ export class TopBar extends WithTemplate {
     })
 
     this.elements.help.addEventListener('click', () => this._umap.help.showGetStarted())
-    this.elements.cancel.addEventListener('click', () => this._umap.askForReset())
-    this.elements.cancel.addEventListener('mouseover', () => {
+    this.elements.redo.addEventListener('click', () => this._umap.redo())
+    this.elements.undo.addEventListener('click', () => this._umap.undo())
+    this.elements.undo.addEventListener('mouseover', () => {
+      this._umap.tooltip.open({
+        content: this._umap.help.displayLabel('UNDO'),
+        anchor: this.elements.undo,
+        position: 'bottom',
+        delay: 500,
+        duration: 5000,
+      })
+    })
+    this.elements.redo.addEventListener('mouseover', () => {
       this._umap.tooltip.open({
-        content: this._umap.help.displayLabel('CANCEL'),
-        anchor: this.elements.cancel,
+        content: this._umap.help.displayLabel('REDO'),
+        anchor: this.elements.redo,
         position: 'bottom',
         delay: 500,
         duration: 5000,
@@ -154,9 +166,10 @@ export class TopBar extends WithTemplate {
   redraw() {
     const syncEnabled = this._umap.getProperty('syncEnabled')
     this.elements.peers.hidden = !syncEnabled
-    this.elements.cancel.hidden = syncEnabled
+    this.elements.view.disabled = this._umap.sync._undoManager.isDirty()
     this.elements.saveLabel.hidden = this._umap.permissions.isDraft()
     this.elements.saveDraftLabel.hidden = !this._umap.permissions.isDraft()
+    this._umap.sync._undoManager.toggleState()
   }
 }
 
@@ -167,6 +180,7 @@ const BOTTOM_BAR_TEMPLATE = `
     <button class="umap-about-link flat" type="button" title="${translate('Open caption')}" data-ref="caption">${translate('Open caption')}</button>
     <button class="umap-open-browser-link flat" type="button" title="${translate('Browse data')}" data-ref="browse">${translate('Browse data')}</button>
     <button class="umap-open-browser-link flat" type="button" title="${translate('Filter data')}" data-ref="filter">${translate('Filter data')}</button>
+    <select data-ref=layers></select>
   </div>
 `
 
@@ -189,6 +203,14 @@ export class BottomBar extends WithTemplate {
       this._umap.openBrowser('filters')
     )
     this._slideshow.renderToolbox(this.element)
+    this.elements.layers.addEventListener('change', () => {
+      const select = this.elements.layers
+      const selected = select.options[select.selectedIndex].value
+      if (!selected) return
+      this._umap.eachDataLayer((datalayer) => {
+        datalayer.toggle(datalayer.id === selected)
+      })
+    })
     this.redraw()
   }
 
@@ -201,6 +223,27 @@ export class BottomBar extends WithTemplate {
     this.elements.caption.hidden = !showMenus
     this.elements.browse.hidden = !showMenus
     this.elements.filter.hidden = !showMenus || !this._umap.properties.facetKey
+    this.buildDataLayerSwitcher()
+  }
+
+  buildDataLayerSwitcher() {
+    this.elements.layers.innerHTML = ''
+    const datalayers = this._umap.datalayersIndex.filter((d) => d.options.inCaption)
+    if (datalayers.length < 2) {
+      this.elements.layers.hidden = true
+    } else {
+      this.elements.layers.appendChild(Utils.loadTemplate(`<option value=""></option>`))
+      this.elements.layers.hidden = false
+      const visible = datalayers.filter((datalayer) => datalayer.isVisible())
+      for (const datalayer of datalayers) {
+        const selected = visible.length === 1 && datalayer.isVisible() ? 'selected' : ''
+        this.elements.layers.appendChild(
+          Utils.loadTemplate(
+            `<option value="${datalayer.id}" ${selected}>${datalayer.getName()}</option>`
+          )
+        )
+      }
+    }
   }
 }
 
@@ -240,10 +283,7 @@ export class EditBar extends WithTemplate {
     DomEvent.disableClickPropagation(this.element)
     this._onClick('marker', () => this._leafletMap.editTools.startMarker())
     this._onClick('polyline', () => this._leafletMap.editTools.startPolyline())
-    this._onClick('multiline', () => {
-      console.log('click click')
-      this._umap.editedFeature.ui.editor.newShape()
-    })
+    this._onClick('multiline', () => this._umap.editedFeature.ui.editor.newShape())
     this._onClick('polygon', () => this._leafletMap.editTools.startPolygon())
     this._onClick('multipolygon', () => this._umap.editedFeature.ui.editor.newShape())
     this._onClick('caption', () => this._umap.editCaption())

umap/static/umap/js/modules/ui/tooltip.js

@@ -1,7 +1,7 @@
 import { DomEvent } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from '../i18n.js'
-import { Positioned } from './base.js'
 import * as Utils from '../utils.js'
+import { Positioned } from './base.js'
 
 export default class Tooltip extends Positioned {
   constructor(parent) {