umap-project 2.7.3__py3-none-any.whl → 2.8.0__py3-none-any.whl

umap/static/umap/js/modules/tableeditor.js

@@ -14,10 +14,11 @@ const TEMPLATE = `
 `
 
 export default class TableEditor extends WithTemplate {
-  constructor(datalayer) {
+  constructor(umap, datalayer, leafletMap) {
     super()
     this.datalayer = datalayer
-    this.map = this.datalayer.map
+    this._umap = umap
+    this._leafletMap = leafletMap
     this.contextmenu = new ContextMenu({ className: 'dark' })
     this.table = this.loadTemplate(TEMPLATE)
     if (!this.datalayer.isRemoteLayer()) {
@@ -36,20 +37,20 @@ export default class TableEditor extends WithTemplate {
   openHeaderMenu(property) {
     const actions = []
     let filterItem
-    if (this.map.facets.has(property)) {
+    if (this._umap.facets.has(property)) {
       filterItem = {
         label: translate('Remove filter for this column'),
         action: () => {
-          this.map.facets.remove(property)
-          this.map.browser.open('filters')
+          this._umap.facets.remove(property)
+          this._umap.browser.open('filters')
         },
       }
     } else {
       filterItem = {
         label: translate('Add filter for this column'),
         action: () => {
-          this.map.facets.add(property)
-          this.map.browser.open('filters')
+          this._umap.facets.add(property)
+          this._umap.browser.open('filters')
         },
       }
     }
@@ -86,8 +87,8 @@ export default class TableEditor extends WithTemplate {
   }
 
   renderBody() {
-    const bounds = this.map.getBounds()
-    const inBbox = this.map.browser.options.inBbox
+    const bounds = this._leafletMap.getBounds()
+    const inBbox = this._umap.browser.options.inBbox
     let html = ''
     this.datalayer.eachFeature((feature) => {
       if (feature.isFiltered()) return
@@ -104,7 +105,7 @@ export default class TableEditor extends WithTemplate {
   resetProperties() {
     this.properties = this.datalayer._propertiesIndex
     if (this.properties.length === 0) {
-      this.properties = ['name', 'description']
+      this.properties = [U.DEFAULT_LABEL_KEY, 'description']
     }
   }
 
@@ -121,7 +122,7 @@ export default class TableEditor extends WithTemplate {
   }
 
   renameProperty(property) {
-    this.map.dialog
+    this._umap.dialog
       .prompt(translate('Please enter the new name of this property'))
       .then(({ prompt }) => {
         if (!prompt || !this.validateName(prompt)) return
@@ -135,7 +136,7 @@ export default class TableEditor extends WithTemplate {
   }
 
   deleteProperty(property) {
-    this.map.dialog
+    this._umap.dialog
       .confirm(
         translate('Are you sure you want to delete this property on all the features?')
       )
@@ -150,7 +151,7 @@ export default class TableEditor extends WithTemplate {
   }
 
   addProperty() {
-    this.map.dialog
+    this._umap.dialog
       .prompt(translate('Please enter the name of the property'))
       .then(({ prompt }) => {
         if (!prompt || !this.validateName(prompt)) return
@@ -187,10 +188,10 @@ export default class TableEditor extends WithTemplate {
       <button class="flat" type="button" data-ref="filters">
         <i class="icon icon-16 icon-filters"></i>${translate('Filter data')}
       </button>`)
-    filterButton.addEventListener('click', () => this.map.browser.open('filters'))
+    filterButton.addEventListener('click', () => this._umap.browser.open('filters'))
     actions.push(filterButton)
 
-    this.map.fullPanel.open({
+    this._umap.fullPanel.open({
       content: this.table,
       className: 'umap-table-editor',
       actions: actions,
@@ -304,7 +305,7 @@ export default class TableEditor extends WithTemplate {
   deleteRows() {
     const selectedRows = this.getSelectedRows()
     if (!selectedRows.length) return
-    this.map.dialog
+    this._umap.dialog
       .confirm(
         translate('Found {count} rows. Are you sure you want to delete all?', {
           count: selectedRows.length,
@@ -320,9 +321,9 @@ export default class TableEditor extends WithTemplate {
         this.datalayer.show()
         this.datalayer.dataChanged()
         this.renderBody()
-        if (this.map.browser.isOpen()) {
-          this.map.browser.resetFilters()
-          this.map.browser.open('filters')
+        if (this._umap.browser.isOpen()) {
+          this._umap.browser.resetFilters()
+          this._umap.browser.open('filters')
         }
       })
   }

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

@@ -0,0 +1,196 @@
+import { DomEvent } from '../../../vendors/leaflet/leaflet-src.esm.js'
+import { translate } from '../i18n.js'
+import { WithTemplate } from '../utils.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" type="button" data-ref="name"></button>
+        <button class="share-status" type="button" data-ref="share"></button>
+    </div>
+    <div class="umap-right-edit-toolbox" data-ref="right">
+        <button class="connected-peers round" type="button" data-ref="peers">
+          <i class="icon icon-16 icon-peers icon-black"></i>
+          <span></span>
+        </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>
+        </button>
+        <button class="umap-help-link" 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">
+            <i class="icon icon-16 icon-eye"></i>
+            <span class="">${translate('View')}</span>
+        </button>
+        <button class="edit-save button round" 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>
+            <span hidden data-ref="saveDraftLabel">${translate('Save draft')}</span>
+        </button>
+    </div>
+</div>`
+
+export class TopBar extends WithTemplate {
+  constructor(umap, parent) {
+    super()
+    this._umap = umap
+    this._menu = new ContextMenu({ className: 'dark', fixed: true })
+    this.loadTemplate(TOP_BAR_TEMPLATE)
+    this.parent = parent
+  }
+
+  setup() {
+    this.parent.appendChild(this.element)
+    this.elements.name.addEventListener('mouseover', () => {
+      this._umap.tooltip.open({
+        content: translate('Edit the title of the map'),
+        anchor: this.elements.name,
+        position: 'bottom',
+        delay: 500,
+        duration: 5000,
+      })
+    })
+    this.elements.share.addEventListener('mouseover', () => {
+      this._umap.tooltip.open({
+        content: translate('Update who can see and edit the map'),
+        anchor: this.elements.share,
+        position: 'bottom',
+        delay: 500,
+        duration: 5000,
+      })
+    })
+    if (this._umap.properties.editMode === 'advanced') {
+      this.elements.name.addEventListener('click', () => this._umap.editCaption())
+      this.elements.share.addEventListener('click', () => this._umap.permissions.edit())
+    }
+    this.elements.user.addEventListener('click', () => {
+      if (this._umap.properties.user?.id) {
+        const actions = [
+          {
+            label: translate('New map'),
+            action: this._umap.urls.get('map_new'),
+          },
+          {
+            label: translate('My maps'),
+            action: this._umap.urls.get('user_dashboard'),
+          },
+          {
+            label: translate('My teams'),
+            action: this._umap.urls.get('user_teams'),
+          },
+        ]
+        if (this._umap.urls.has('user_profile')) {
+          actions.push({
+            label: translate('My profile'),
+            action: this._umap.urls.get('user_profile'),
+          })
+        }
+        this._menu.openBelow(this.elements.user, actions)
+      }
+    })
+
+    const connectedPeers = this._umap.sync.getNumberOfConnectedPeers()
+    this.elements.peers.addEventListener('mouseover', () => {
+      if (!connectedPeers) return
+      this._umap.tooltip.open({
+        content: translate('{connectedPeers} peer(s) currently connected to this map', {
+          connectedPeers: connectedPeers,
+        }),
+        anchor: this.elements.peers,
+        position: 'bottom',
+        delay: 500,
+        duration: 5000,
+      })
+    })
+
+    this.elements.help.addEventListener('click', () => this._umap.showGetStarted())
+    this.elements.cancel.addEventListener('click', () => this._umap.askForReset())
+    this.elements.cancel.addEventListener('mouseover', () => {
+      this._umap.tooltip.open({
+        content: this._umap.help.displayLabel('CANCEL'),
+        anchor: this.elements.cancel,
+        position: 'bottom',
+        delay: 500,
+        duration: 5000,
+      })
+    })
+    this.elements.view.addEventListener('click', () => this._umap.disableEdit())
+    this.elements.view.addEventListener('mouseover', () => {
+      this._umap.tooltip.open({
+        content: this._umap.help.displayLabel('PREVIEW'),
+        anchor: this.elements.view,
+        position: 'bottom',
+        delay: 500,
+        duration: 5000,
+      })
+    })
+    this.elements.save.addEventListener('click', () => this._umap.saveAll())
+    this.elements.save.addEventListener('mouseover', () => {
+      this._umap.tooltip.open({
+        content: this._umap.help.displayLabel('SAVE'),
+        anchor: this.elements.save,
+        position: 'bottom',
+        delay: 500,
+        duration: 5000,
+      })
+    })
+    this.redraw()
+  }
+
+  redraw() {
+    this.elements.peers.hidden = !this._umap.getProperty('syncEnabled')
+    this.elements.saveLabel.hidden = this._umap.permissions.isDraft()
+    this.elements.saveDraftLabel.hidden = !this._umap.permissions.isDraft()
+  }
+}
+
+const BOTTOM_BAR_TEMPLATE = `
+  <div class="umap-caption-bar">
+    <h3 class="map-name"></h3>
+    <span data-ref="author"></span>
+    <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>
+  </div>
+`
+
+export class BottomBar extends WithTemplate {
+  constructor(umap, slideshow, parent) {
+    super()
+    this._umap = umap
+    this._slideshow = slideshow
+    this.loadTemplate(BOTTOM_BAR_TEMPLATE)
+    this.parent = parent
+  }
+
+  setup() {
+    this.parent.appendChild(this.element)
+    DomEvent.disableClickPropagation(this.element)
+    this._umap.addAuthorLink(this.elements.author)
+    this.elements.caption.addEventListener('click', () => this._umap.openCaption())
+    this.elements.browse.addEventListener('click', () => this._umap.openBrowser('data'))
+    this.elements.filter.addEventListener('click', () =>
+      this._umap.openBrowser('filters')
+    )
+    this._slideshow.renderToolbox(this.element)
+    this.redraw()
+  }
+
+  redraw() {
+    const hasSlideshow = this._slideshow.isEnabled()
+    const barEnabled = this._umap.properties.captionBar || hasSlideshow
+    document.body.classList.toggle('umap-caption-bar-enabled', barEnabled)
+    document.body.classList.toggle('umap-slideshow-enabled', hasSlideshow)
+    const showMenus = this._umap.getProperty('captionMenus')
+    this.elements.caption.hidden = !showMenus
+    this.elements.browse.hidden = !showMenus
+    this.elements.filter.hidden = !showMenus || !this._umap.properties.facetKey
+  }
+}

umap/static/umap/js/modules/ui/dialog.js

@@ -6,6 +6,7 @@ const TEMPLATE = `
     <form method="dialog" data-ref="form">
       <ul class="buttons">
         <li><i class="icon icon-16 icon-close" data-close></i></li>
+        <li hidden data-ref="back"><i class="icon icon-16 icon-back"></i></li>
       </ul>
       <h3 data-ref="message" id="${Math.round(Date.now()).toString(36)}"></h3>
       <fieldset data-ref="fieldset" role="document">
@@ -123,6 +124,10 @@ export default class Dialog extends WithTemplate {
     } else {
       this.elements.template.innerHTML = dialog.template || ''
     }
+    this.elements.back.hidden = !dialog.back
+    if (dialog.back) {
+      this.elements.back.addEventListener('click', dialog.back)
+    }
 
     this.focusable = this.getFocusable()
     this.hasFormData = this.elements.fieldset.elements.length > 0

umap/static/umap/js/modules/ui/panel.js

@@ -2,9 +2,10 @@ import { DomEvent, DomUtil } from '../../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from '../i18n.js'
 
 export class Panel {
-  constructor(map) {
-    this.parent = map._controlContainer
-    this.map = map
+  constructor(umap, leafletMap) {
+    this.parent = leafletMap._controlContainer
+    this._umap = umap
+    this._leafletMap = leafletMap
     this.container = DomUtil.create('div', '', this.parent)
     // This will be set once according to the panel configurated at load
     // or by using panels as popups
@@ -80,26 +81,26 @@ export class Panel {
   onClose() {
     if (DomUtil.hasClass(this.container, 'on')) {
       DomUtil.removeClass(this.container, 'on')
-      this.map.invalidateSize({ pan: false })
+      this._leafletMap.invalidateSize({ pan: false })
     }
   }
 }
 
 export class EditPanel extends Panel {
-  constructor(map) {
-    super(map)
+  constructor(umap, leafletMap) {
+    super(umap, leafletMap)
     this.className = 'right dark'
   }
 
   onClose() {
     super.onClose()
-    this.map.editedFeature = null
+    this._umap.editedFeature = null
   }
 }
 
 export class FullPanel extends Panel {
-  constructor(map) {
-    super(map)
+  constructor(umap, leafletMap) {
+    super(umap, leafletMap)
     this.className = 'full dark'
     this.mode = 'expanded'
   }