umap-project 2.5.1__py3-none-any.whl → 2.6.0b0__py3-none-any.whl

umap/static/umap/js/modules/share.js

@@ -1,4 +1,7 @@
+import { DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { EXPORT_FORMATS } from './formatter.js'
+import { translate } from './i18n.js'
+import * as Utils from './utils.js'
 
 export default class Share {
   constructor(map) {
@@ -6,85 +9,103 @@ export default class Share {
   }
 
   build() {
-    this.container = L.DomUtil.create('div', '')
-    this.title = L.DomUtil.createTitle(
+    this.container = DomUtil.create('div', '')
+    this.title = DomUtil.createTitle(
       this.container,
-      L._('Share and download'),
+      translate('Share and download'),
       'icon-share'
     )
 
-    L.DomUtil.createCopiableInput(
+    DomUtil.createCopiableInput(
       this.container,
-      L._('Link to view the map'),
-      window.location.protocol + U.Utils.getBaseUrl()
+      translate('Link to view the map'),
+      window.location.protocol + Utils.getBaseUrl()
     )
 
     if (this.map.options.shortUrl) {
-      L.DomUtil.createCopiableInput(
+      DomUtil.createCopiableInput(
         this.container,
-        L._('Short link'),
+        translate('Short link'),
         this.map.options.shortUrl
       )
     }
 
-    L.DomUtil.create('hr', '', this.container)
+    DomUtil.create('hr', '', this.container)
 
-    L.DomUtil.add('h4', '', this.container, L._('Download'))
-    L.DomUtil.add('small', 'label', this.container, L._("Only visible layers' data"))
+    DomUtil.add('h4', '', this.container, translate('Download'))
+    DomUtil.add(
+      'small',
+      'label',
+      this.container,
+      translate("Only visible layers' data")
+    )
+    const list = document.createElement('ul')
+    list.classList.add('downloads')
+    this.container.appendChild(list)
     for (const format of Object.keys(EXPORT_FORMATS)) {
-      L.DomUtil.createButton('download-file', this.container, format, () =>
-        this.download(format)
-      )
+      const button = Utils.loadTemplate(`
+        <li>
+          <button class="flat" type="button">
+            <i class="icon icon-16 icon-download"></i>${format}
+          </button>
+        </li>
+      `)
+      button.addEventListener('click', () => this.download(format))
+      list.appendChild(button)
     }
-    L.DomUtil.create('div', 'vspace', this.container)
-    L.DomUtil.add(
+    DomUtil.create('div', 'vspace', this.container)
+    DomUtil.add(
       'small',
       'label',
       this.container,
-      L._('All data and settings of the map')
+      translate('All data and settings of the map')
     )
-    const downloadUrl = U.Utils.template(this.map.options.urls.map_download, {
+    const downloadUrl = Utils.template(this.map.options.urls.map_download, {
       map_id: this.map.options.umap_id,
     })
-    const link = L.DomUtil.createLink(
-      'download-backup',
-      this.container,
-      L._('full backup'),
-      downloadUrl
-    )
-    let name = this.map.options.name || 'data'
-    name = name.replace(/[^a-z0-9]/gi, '_').toLowerCase()
-    link.setAttribute('download', `${name}.umap`)
-    L.DomUtil.create('hr', '', this.container)
-
-    const embedTitle = L.DomUtil.add('h4', '', this.container, L._('Embed the map'))
-    const iframe = L.DomUtil.create('textarea', 'umap-share-iframe', this.container)
-    const urlTitle = L.DomUtil.add('h4', '', this.container, L._('Direct link'))
-    const exportUrl = L.DomUtil.createCopiableInput(
+    const link = Utils.loadTemplate(`
+      <div>
+        <a href="${downloadUrl}">
+          <i class="icon icon-16 icon-backup"></i>${translate('full backup')}
+        </a>
+      </div>
+    `)
+    this.container.appendChild(link)
+    // File will be named by back-office
+    link.setAttribute('download', 'backup.umap')
+    DomUtil.create('hr', '', this.container)
+
+    const embedTitle = DomUtil.add('h4', '', this.container, translate('Embed the map'))
+    const iframe = DomUtil.create('textarea', 'umap-share-iframe', this.container)
+    const urlTitle = DomUtil.add('h4', '', this.container, translate('Direct link'))
+    const exportUrl = DomUtil.createCopiableInput(
       this.container,
-      L._('Share this link to open a customized map view'),
+      translate('Share this link to open a customized map view'),
       ''
     )
 
     exportUrl.type = 'text'
     const UIFields = [
-      ['dimensions.width', { handler: 'Input', label: L._('width') }],
-      ['dimensions.height', { handler: 'Input', label: L._('height') }],
+      ['dimensions.width', { handler: 'Input', label: translate('width') }],
+      ['dimensions.height', { handler: 'Input', label: translate('height') }],
       [
         'options.includeFullScreenLink',
-        { handler: 'Switch', label: L._('Include full screen link?') },
+        { handler: 'Switch', label: translate('Include full screen link?') },
       ],
       [
         'options.currentView',
-        { handler: 'Switch', label: L._('Current view instead of default map view?') },
+        {
+          handler: 'Switch',
+          label: translate('Current view instead of default map view?'),
+        },
       ],
       [
         'options.keepCurrentDatalayers',
-        { handler: 'Switch', label: L._('Keep current visible layers') },
+        { handler: 'Switch', label: translate('Keep current visible layers') },
       ],
       [
         'options.viewCurrentFeature',
-        { handler: 'Switch', label: L._('Open current feature on load') },
+        { handler: 'Switch', label: translate('Open current feature on load') },
       ],
       'queryString.moreControl',
       'queryString.scrollWheelZoom',
@@ -106,9 +127,9 @@ export default class Share {
     const builder = new U.FormBuilder(iframeExporter, UIFields, {
       callback: buildIframeCode,
     })
-    const iframeOptions = L.DomUtil.createFieldset(
+    const iframeOptions = DomUtil.createFieldset(
       this.container,
-      L._('Embed and link options')
+      translate('Embed and link options')
     )
     iframeOptions.appendChild(builder.build())
   }
@@ -144,7 +165,7 @@ export default class Share {
 class IframeExporter {
   constructor(map) {
     this.map = map
-    this.baseUrl = U.Utils.getBaseUrl()
+    this.baseUrl = Utils.getBaseUrl()
     this.options = {
       includeFullScreenLink: true,
       currentView: false,
@@ -199,7 +220,7 @@ class IframeExporter {
     }
     const currentView = this.options.currentView ? window.location.hash : ''
     const queryString = L.extend({}, this.queryString, options)
-    return `${this.baseUrl}?${U.Utils.buildQueryString(queryString)}${currentView}`
+    return `${this.baseUrl}?${Utils.buildQueryString(queryString)}${currentView}`
   }
 
   build() {
@@ -207,7 +228,7 @@ class IframeExporter {
     let code = `<iframe width="${this.dimensions.width}" height="${this.dimensions.height}" frameborder="0" allowfullscreen allow="geolocation" src="${iframeUrl}"></iframe>`
     if (this.options.includeFullScreenLink) {
       const fullUrl = this.buildUrl({ scrollWheelZoom: true })
-      code += `<p><a href="${fullUrl}">${L._('See full screen')}</a></p>`
+      code += `<p><a href="${fullUrl}">${translate('See full screen')}</a></p>`
     }
     return code
   }

umap/static/umap/js/modules/sync/updaters.js

@@ -71,15 +71,13 @@ export class FeatureUpdater extends BaseUpdater {
   upsert({ metadata, value }) {
     const { id, layerId } = metadata
     const datalayer = this.getDataLayerFromID(layerId)
-    let feature = this.getFeatureFromMetadata(metadata, value)
-
-    feature = datalayer.geoJSONToLeaflet({
-      geometry: value.geometry,
-      geojson: value,
-      id,
-      feature,
-    })
-    datalayer.addLayer(feature)
+    const feature = this.getFeatureFromMetadata(metadata, value)
+
+    if (feature) {
+      feature.geometry = value.geometry
+    } else {
+      datalayer.makeFeature(value)
+    }
   }
 
   // Update a property of an object
@@ -90,7 +88,8 @@ export class FeatureUpdater extends BaseUpdater {
     }
     if (key === 'geometry') {
       const datalayer = this.getDataLayerFromID(metadata.layerId)
-      datalayer.geoJSONToLeaflet({ geometry: value, id: metadata.id, feature })
+      const feature = this.getFeatureFromMetadata(metadata, value)
+      feature.geometry = value
     } else {
       this.updateObjectValue(feature, key, value)
       feature.datalayer.indexProperties(feature)

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

@@ -89,15 +89,15 @@ export default class TableEditor extends WithTemplate {
     const bounds = this.map.getBounds()
     const inBbox = this.map.browser.options.inBbox
     let html = ''
-    for (const feature of Object.values(this.datalayer._layers)) {
-      if (feature.isFiltered()) continue
-      if (inBbox && !feature.isOnScreen(bounds)) continue
+    this.datalayer.eachFeature((feature) => {
+      if (feature.isFiltered()) return
+      if (inBbox && !feature.isOnScreen(bounds)) return
       const tds = this.properties.map(
         (prop) =>
           `<td tabindex="0" data-property="${prop}">${feature.properties[prop] || ''}</td>`
       )
       html += `<tr data-feature="${feature.id}"><th><input type="checkbox" /></th>${tds.join('')}</tr>`
-    }
+    })
     this.elements.body.innerHTML = html
   }
 
@@ -125,7 +125,7 @@ export default class TableEditor extends WithTemplate {
       .prompt(translate('Please enter the new name of this property'))
       .then(({ prompt }) => {
         if (!prompt || !this.validateName(prompt)) return
-        this.datalayer.eachLayer((feature) => {
+        this.datalayer.eachFeature((feature) => {
           feature.renameProperty(property, prompt)
         })
         this.datalayer.deindexProperty(property)
@@ -140,7 +140,7 @@ export default class TableEditor extends WithTemplate {
         translate('Are you sure you want to delete this property on all the features?')
       )
       .then(() => {
-        this.datalayer.eachLayer((feature) => {
+        this.datalayer.eachFeature((feature) => {
           feature.deleteProperty(property)
         })
         this.datalayer.deindexProperty(property)
@@ -318,7 +318,7 @@ export default class TableEditor extends WithTemplate {
           feature.del()
         }
         this.datalayer.show()
-        this.datalayer.fire('datachanged')
+        this.datalayer.dataChanged()
         this.renderBody()
         if (this.map.browser.isOpen()) {
           this.map.browser.resetFilters()

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

@@ -97,9 +97,11 @@ export default class Dialog extends WithTemplate {
 
   currentZIndex() {
     return Math.max(
-      ...Array.from(document.querySelectorAll('dialog')).map(
-        (el) => window.getComputedStyle(el).getPropertyValue('z-index') || 0
-      )
+      ...Array.from(document.querySelectorAll('dialog')).map((el) => {
+        const zIndex = window.getComputedStyle(el).getPropertyValue('z-index')
+        if (zIndex === 'auto') return 0
+        return zIndex || 0
+      })
     )
   }
 
@@ -127,7 +129,9 @@ export default class Dialog extends WithTemplate {
     this.hasFormData = this.elements.fieldset.elements.length > 0
 
     const currentZIndex = this.currentZIndex()
-    if (currentZIndex) this.dialog.style.zIndex = currentZIndex + 1
+    if (currentZIndex) {
+      this.dialog.style.zIndex = currentZIndex + 1
+    }
 
     this.toggle(true)
 

umap/static/umap/js/modules/utils.js

@@ -240,12 +240,13 @@ export function greedyTemplate(str, data, ignore) {
       if (staticFallback !== undefined) {
         vars.push(staticFallback)
       }
-      for (let i = 0; i < vars.length; i++) {
-        path = vars[i]
-        if (path.startsWith('"') && path.endsWith('"'))
+      for (const path of vars) {
+        if (path.startsWith('"') && path.endsWith('"')) {
           value = path.substring(1, path.length - 1) // static default value.
-        else value = getValue(data, path.split('.'))
-        if (value !== undefined) break
+        } else {
+          value = getValue(data, path.split('.'))
+        }
+        if (value !== undefined && value !== null) break
       }
       if (value === undefined) {
         if (ignore) value = str
@@ -301,6 +302,10 @@ export function flattenCoordinates(coords) {
   return coords
 }
 
+export function polygonMustBeFlattened(coords) {
+  return coords.length === 1 && typeof coords?.[0]?.[0]?.[0] !== 'number'
+}
+
 export function buildQueryString(params) {
   const query_string = []
   for (const key in params) {
@@ -381,19 +386,23 @@ export function toggleBadge(element, value) {
 export function loadTemplate(html) {
   const template = document.createElement('template')
   template.innerHTML = html
-    .split('\n')
-    .map((line) => line.trim())
-    .join('')
   return template.content.firstElementChild
 }
 
+export function loadTemplateWithRefs(html) {
+  const element = loadTemplate(html)
+  const elements = {}
+  for (const node of element.querySelectorAll('[data-ref]')) {
+    elements[node.dataset.ref] = node
+  }
+  return [element, elements]
+}
+
 export class WithTemplate {
   loadTemplate(html) {
-    this.element = loadTemplate(html)
-    this.elements = {}
-    for (const element of this.element.querySelectorAll('[data-ref]')) {
-      this.elements[element.dataset.ref] = element
-    }
+    const [element, elements] = loadTemplateWithRefs(html)
+    this.element = element
+    this.elements = elements
     return this.element
   }
 }