umap-project 2.4.2__py3-none-any.whl → 2.5.1__py3-none-any.whl

umap/static/umap/js/modules/importers/geodatamine.js

@@ -25,7 +25,6 @@ const TEMPLATE = `
   </label>
   <label id="boundary">
   </label>
-  <button class="button">${translate('Choose this data')}</button>
 `
 
 class Autocomplete extends SingleMixin(BaseAjax) {
@@ -66,7 +65,6 @@ export class Importer {
     } else {
       console.error(response)
     }
-    const asPoint = container.querySelector('[name=aspoint]')
     this.autocomplete = new Autocomplete(container.querySelector('#boundary'), {
       placeholder: translate('Search admin boundary'),
       url: `${this.baseUrl}/boundaries/search?text={q}`,
@@ -75,21 +73,23 @@ export class Importer {
         boundaryName = choice.item.label
       },
     })
-    const confirm = () => {
+    const confirm = (form) => {
       if (!boundary || !select.value) {
         Alert.error(translate('Please choose a theme and a boundary first.'))
         return
       }
-      importer.url = `${this.baseUrl}/data/${select.value}/${boundary}?format=geojson&aspoint=${asPoint.checked}`
+      importer.url = `${this.baseUrl}/data/${form.theme}/${boundary}?format=geojson&aspoint=${Boolean(form.aspoint)}`
       importer.format = 'geojson'
       importer.layerName = `${boundaryName} — ${select.options[select.selectedIndex].textContent}`
-      importer.dialog.close()
     }
-    DomEvent.on(container.querySelector('button'), 'click', confirm)
 
-    importer.dialog.open({
-      content: container,
-      className: `${this.id} importer dark`,
-    })
+    importer.dialog
+      .open({
+        template: container,
+        className: `${this.id} importer dark`,
+        accept: translate('Choose this data'),
+        cancel: false,
+      })
+      .then(confirm)
   }
 }

umap/static/umap/js/modules/importers/overpass.js

@@ -11,7 +11,7 @@ const TEMPLATE = `
   </label>
   <label>
     ${translate('Geometry mode')}
-    <select name="out-mode">
+    <select name="out">
       <option value="geom" selected>${translate('Default')}</option>
       <option value="center">${translate('Only geometry centers')}</option>
     </select>
@@ -38,6 +38,9 @@ export class Importer {
     this.map = map
     this.name = options.name || 'Overpass'
     this.baseUrl = options?.url || 'https://overpass-api.de/api/interpreter'
+    this.searchUrl =
+      options?.searchUrl ||
+      'https://photon.komoot.io/api?q={q}&layer=county&layer=city&layer=state'
     this.id = 'overpass'
   }
 
@@ -47,7 +50,7 @@ export class Importer {
     const container = DomUtil.create('div')
     container.innerHTML = TEMPLATE
     this.autocomplete = new Autocomplete(container.querySelector('#area'), {
-      url: 'https://photon.komoot.io/api?q={q}&osm_tag=place',
+      url: this.searchUrl,
       placeholder: translate(
         'Type area name, or let empty to load data in current map view'
       ),
@@ -58,27 +61,28 @@ export class Importer {
     })
     this.map.help.parse(container)
 
-    const confirm = () => {
-      let tags = container.querySelector('[name=tags]').value
-      if (!tags) {
-        Alert.error(translate('Please define an expression for the query first'))
+    const confirm = (form) => {
+      if (!form.tags) {
+        Alert.error(translate('Expression is empty'))
         return
       }
-      const outMode = container.querySelector('[name=out-mode]').value
+      let tags = form.tags
       if (!tags.startsWith('[')) tags = `[${tags}]`
       let area = '{south},{west},{north},{east}'
       if (boundary) area = `area:${boundary}`
-      const query = `[out:json];nwr${tags}(${area});out ${outMode};`
+      const query = `[out:json];nwr${tags}(${area});out ${form.out};`
       importer.url = `${this.baseUrl}?data=${query}`
       if (boundary) importer.layerName = boundaryName
       importer.format = 'osm'
-      importer.dialog.close()
     }
-    L.DomUtil.createButton('', container, translate('Choose this data'), confirm)
 
-    importer.dialog.open({
-      content: container,
-      className: `${this.id} importer dark`,
-    })
+    importer.dialog
+      .open({
+        template: container,
+        className: `${this.id} importer dark`,
+        accept: translate('Choose this data'),
+        cancel: false
+      })
+      .then(confirm)
   }
 }

umap/static/umap/js/modules/rules.js

@@ -1,6 +1,7 @@
 import { DomEvent, DomUtil, stamp } from '../../vendors/leaflet/leaflet-src.esm.js'
 import { translate } from './i18n.js'
 import * as Utils from './utils.js'
+import { AutocompleteDatalist } from './autocomplete.js'
 
 class Rule {
   get condition() {
@@ -123,7 +124,18 @@ class Rule {
     const builder = new U.FormBuilder(this, options)
     const defaultShapeProperties = DomUtil.add('div', '', container)
     defaultShapeProperties.appendChild(builder.build())
-
+    const autocomplete = new AutocompleteDatalist(builder.helpers.condition.input)
+    const properties = this.map.allProperties()
+    autocomplete.suggestions = properties
+    autocomplete.input.addEventListener('input', (event) => {
+      const value = event.target.value
+      if (properties.includes(value)) {
+        autocomplete.suggestions = [`${value}=`, `${value}!=`, `${value}>`, `${value}<`]
+      } else if (value.endsWith('=')) {
+        const key = value.split('!')[0].split('=')[0]
+        autocomplete.suggestions = this.map.sortedValues(key).map((str) => `${value}${str || ''}`)
+      }
+    })
     this.map.editPanel.open({ content: container })
   }
 

umap/static/umap/js/modules/schema.js

@@ -40,12 +40,16 @@ export const SCHEMA = {
     label: translate('Do you want to display caption menus?'),
     default: true,
   },
+  categorized: {
+    type: Object,
+    impacts: ['data'],
+  },
   color: {
     type: String,
     impacts: ['data'],
     handler: 'ColorPicker',
     label: translate('color'),
-    helpEntries: 'colorValue',
+    helpEntries: ['colorValue'],
     inheritable: true,
     default: 'DarkBlue',
   },
@@ -65,7 +69,7 @@ export const SCHEMA = {
     type: String,
     impacts: ['data'],
     label: translate('dash array'),
-    helpEntries: 'dashArray',
+    helpEntries: ['dashArray'],
     inheritable: true,
   },
   datalayersControl: {
@@ -92,7 +96,7 @@ export const SCHEMA = {
     type: 'Text',
     impacts: ['ui'],
     label: translate('description'),
-    helpEntries: 'textFormatting',
+    helpEntries: ['textFormatting'],
   },
   displayOnLoad: {
     type: Boolean,
@@ -131,7 +135,7 @@ export const SCHEMA = {
     type: Boolean,
     impacts: ['data'],
     label: translate('fill'),
-    helpEntries: 'fill',
+    helpEntries: ['fill'],
     inheritable: true,
     default: true,
   },
@@ -140,7 +144,7 @@ export const SCHEMA = {
     impacts: ['data'],
     handler: 'ColorPicker',
     label: translate('fill color'),
-    helpEntries: 'fillColor',
+    helpEntries: ['fillColor'],
     inheritable: true,
   },
   fillOpacity: {
@@ -216,7 +220,7 @@ export const SCHEMA = {
     type: Boolean,
     impacts: ['data'],
     label: translate('Allow interactions'),
-    helpEntries: 'interactive',
+    helpEntries: ['interactive'],
     inheritable: true,
     default: true,
   },
@@ -243,7 +247,7 @@ export const SCHEMA = {
   labelKey: {
     type: String,
     impacts: ['data'],
-    helpEntries: 'labelKey',
+    helpEntries: ['labelKey'],
     placeholder: translate('Default: name'),
     label: translate('Label key'),
     inheritable: true,
@@ -319,7 +323,7 @@ export const SCHEMA = {
     type: String,
     impacts: [],
     label: translate('Link to…'),
-    helpEntries: 'outlink',
+    helpEntries: ['outlink'],
     placeholder: 'http://...',
     inheritable: true,
   },
@@ -441,7 +445,7 @@ export const SCHEMA = {
     max: 10,
     step: 0.5,
     label: translate('Simplify'),
-    helpEntries: 'smoothFactor',
+    helpEntries: ['smoothFactor'],
     inheritable: true,
     default: 1.0,
   },
@@ -459,7 +463,7 @@ export const SCHEMA = {
     type: Boolean,
     impacts: ['data'],
     label: translate('stroke'),
-    helpEntries: 'stroke',
+    helpEntries: ['stroke'],
     inheritable: true,
     default: true,
   },
@@ -467,7 +471,7 @@ export const SCHEMA = {
     type: Boolean,
     impacts: ['sync', 'ui'],
     label: translate('Enable real-time collaboration'),
-    helpEntries: 'sync',
+    helpEntries: ['sync'],
     default: false,
   },
   tilelayer: {
@@ -526,7 +530,7 @@ export const SCHEMA = {
     type: Number,
     impacts: [], // not need to update the view
     placeholder: translate('Inherit'),
-    helpEntries: 'zoomTo',
+    helpEntries: ['zoomTo'],
     label: translate('Default zoom level'),
     inheritable: true,
   },

umap/static/umap/js/{umap.share.js → modules/share.js}

@@ -1,43 +1,11 @@
-U.Share = L.Class.extend({
-  EXPORT_TYPES: {
-    geojson: {
-      formatter: (map) => JSON.stringify(map.toGeoJSON(), null, 2),
-      ext: '.geojson',
-      filetype: 'application/json',
-    },
-    gpx: {
-      formatter: (map) => togpx(map.toGeoJSON()),
-      ext: '.gpx',
-      filetype: 'application/gpx+xml',
-    },
-    kml: {
-      formatter: (map) => tokml(map.toGeoJSON()),
-      ext: '.kml',
-      filetype: 'application/vnd.google-earth.kml+xml',
-    },
-    csv: {
-      formatter: (map) => {
-        const table = []
-        map.eachFeature((feature) => {
-          const row = feature.toGeoJSON().properties
-          const center = feature.getCenter()
-          delete row._umap_options
-          row.Latitude = center.lat
-          row.Longitude = center.lng
-          table.push(row)
-        })
-        return csv2geojson.dsv.csvFormat(table)
-      },
-      ext: '.csv',
-      filetype: 'text/csv',
-    },
-  },
-
-  initialize: function (map) {
+import { EXPORT_FORMATS } from './formatter.js'
+
+export default class Share {
+  constructor(map) {
     this.map = map
-  },
+  }
 
-  build: function () {
+  build() {
     this.container = L.DomUtil.create('div', '')
     this.title = L.DomUtil.createTitle(
       this.container,
@@ -63,16 +31,10 @@ U.Share = L.Class.extend({
 
     L.DomUtil.add('h4', '', this.container, L._('Download'))
     L.DomUtil.add('small', 'label', this.container, L._("Only visible layers' data"))
-    for (const key in this.EXPORT_TYPES) {
-      if (this.EXPORT_TYPES.hasOwnProperty(key)) {
-        L.DomUtil.createButton(
-          'download-file',
-          this.container,
-          this.EXPORT_TYPES[key].name || key,
-          () => this.download(key),
-          this
-        )
-      }
+    for (const format of Object.keys(EXPORT_FORMATS)) {
+      L.DomUtil.createButton('download-file', this.container, format, () =>
+        this.download(format)
+      )
     }
     L.DomUtil.create('div', 'vspace', this.container)
     L.DomUtil.add(
@@ -135,7 +97,7 @@ U.Share = L.Class.extend({
     for (let i = 0; i < this.map.HIDDABLE_CONTROLS.length; i++) {
       UIFields.push(`queryString.${this.map.HIDDABLE_CONTROLS[i]}Control`)
     }
-    const iframeExporter = new U.IframeExporter(this.map)
+    const iframeExporter = new IframeExporter(this.map)
     const buildIframeCode = () => {
       iframe.textContent = iframeExporter.build()
       exportUrl.value = window.location.protocol + iframeExporter.buildUrl()
@@ -149,24 +111,24 @@ U.Share = L.Class.extend({
       L._('Embed and link options')
     )
     iframeOptions.appendChild(builder.build())
-  },
+  }
 
-  open: function () {
+  open() {
     if (!this.container) this.build()
     this.map.panel.open({ content: this.container })
-  },
+  }
 
-  format: function (mode) {
-    const type = this.EXPORT_TYPES[mode]
-    const content = type.formatter(this.map)
+  async format(mode) {
+    const type = EXPORT_FORMATS[mode]
+    const content = await type.formatter(this.map)
     let name = this.map.options.name || 'data'
     name = name.replace(/[^a-z0-9]/gi, '_').toLowerCase()
     const filename = name + type.ext
     return { content, filetype: type.filetype, filename }
-  },
+  }
 
-  download: function (mode) {
-    const { content, filetype, filename } = this.format(mode)
+  async download(mode) {
+    const { content, filetype, filename } = await this.format(mode)
     const blob = new Blob([content], { type: filetype })
     window.URL = window.URL || window.webkitURL
     const el = document.createElement('a')
@@ -176,50 +138,49 @@ U.Share = L.Class.extend({
     document.body.appendChild(el)
     el.click()
     document.body.removeChild(el)
-  },
-})
-
-U.IframeExporter = L.Evented.extend({
-  options: {
-    includeFullScreenLink: true,
-    currentView: false,
-    keepCurrentDatalayers: false,
-    viewCurrentFeature: false,
-  },
-
-  queryString: {
-    scaleControl: false,
-    miniMap: false,
-    scrollWheelZoom: false,
-    zoomControl: true,
-    editMode: 'disabled',
-    moreControl: true,
-    searchControl: null,
-    tilelayersControl: null,
-    embedControl: null,
-    datalayersControl: true,
-    onLoadPanel: 'none',
-    captionBar: false,
-    captionMenus: true,
-  },
-
-  dimensions: {
-    width: '100%',
-    height: '300px',
-  },
-
-  initialize: function (map) {
+  }
+}
+
+class IframeExporter {
+  constructor(map) {
     this.map = map
     this.baseUrl = U.Utils.getBaseUrl()
+    this.options = {
+      includeFullScreenLink: true,
+      currentView: false,
+      keepCurrentDatalayers: false,
+      viewCurrentFeature: false,
+    }
+
+    this.queryString = {
+      scaleControl: false,
+      miniMap: false,
+      scrollWheelZoom: false,
+      zoomControl: true,
+      editMode: 'disabled',
+      moreControl: true,
+      searchControl: null,
+      tilelayersControl: null,
+      embedControl: null,
+      datalayersControl: true,
+      onLoadPanel: 'none',
+      captionBar: false,
+      captionMenus: true,
+    }
+
+    this.dimensions = {
+      width: '100%',
+      height: '300px',
+    }
     // Use map default, not generic default
     this.queryString.onLoadPanel = this.map.getOption('onLoadPanel')
-  },
+  }
 
-  getMap: function () {
+  getMap() {
     return this.map
-  },
+  }
 
-  buildUrl: function (options) {
+  buildUrl(options) {
     const datalayers = []
     if (this.options.viewCurrentFeature && this.map.currentFeature) {
       this.queryString.feature = this.map.currentFeature.getSlug()
@@ -239,9 +200,9 @@ U.IframeExporter = L.Evented.extend({
     const currentView = this.options.currentView ? window.location.hash : ''
     const queryString = L.extend({}, this.queryString, options)
     return `${this.baseUrl}?${U.Utils.buildQueryString(queryString)}${currentView}`
-  },
+  }
 
-  build: function () {
+  build() {
     const iframeUrl = this.buildUrl()
     let code = `<iframe width="${this.dimensions.width}" height="${this.dimensions.height}" frameborder="0" allowfullscreen allow="geolocation" src="${iframeUrl}"></iframe>`
     if (this.options.includeFullScreenLink) {
@@ -249,5 +210,5 @@ U.IframeExporter = L.Evented.extend({
       code += `<p><a href="${fullUrl}">${L._('See full screen')}</a></p>`
     }
     return code
-  },
-})
+  }
+}

umap/static/umap/js/modules/slideshow.js

@@ -0,0 +1,141 @@
+import { WithTemplate } from './utils.js'
+import { translate } from './i18n.js'
+
+const TOOLBOX_TEMPLATE = `
+  <ul class="umap-slideshow-toolbox dark">
+    <li class="play" title="${translate('Start slideshow')}" data-ref="play">
+      <div class="spinner" style="animation: none;"></div>
+    </li>
+    <li class="stop" title="${translate('Stop slideshow')}" data-ref="stop"></li>
+    <li class="prev" title="${translate('Zoom to the previous')}" data-ref="previous"></li>
+    <li class="next" title="${translate('Zoom to the next')}" data-ref="next"></li>
+  </ul>
+`
+
+export default class Slideshow extends WithTemplate {
+  constructor(map, options) {
+    super()
+    this.map = map
+    this._id = null
+    this.CLASSNAME = 'umap-slideshow-active'
+    this.setOptions(options)
+    this._current = null
+
+    if (this.options.autoplay) {
+      this.map.onceDataLoaded(function () {
+        this.play()
+      }, this)
+    }
+    this.map.on(
+      'edit:enabled',
+      function () {
+        this.stop()
+      },
+      this
+    )
+  }
+
+  set current(feature) {
+    this._current = feature
+  }
+
+  get current() {
+    if (!this._current) {
+      const datalayer = this.defaultDatalayer()
+      if (datalayer) this._current = datalayer.getFeatureByIndex(0)
+    }
+    return this._current
+  }
+
+  get next() {
+    if (this._current === null) {
+      return this.current
+    }
+    return this.current.getNext()
+  }
+
+  setOptions(options) {
+    this.options = Object.assign(
+      {
+        delay: 5000,
+        autoplay: false,
+      },
+      options
+    )
+  }
+
+  defaultDatalayer() {
+    return this.map.findDataLayer((d) => d.canBrowse())
+  }
+
+  startSpinner() {
+    const time = Number.parseInt(this.options.delay, 10)
+    if (!time) return
+    const css = `rotation ${time / 1000}s infinite linear`
+    const spinner = document.querySelector('.umap-slideshow-toolbox .play .spinner')
+    spinner.style.animation = css
+  }
+
+  stopSpinner() {
+    const spinner = document.querySelector('.umap-slideshow-toolbox .play .spinner')
+    spinner.style.animation = 'none'
+  }
+
+  play() {
+    if (this._id) return
+    if (this.map.editEnabled || !this.map.options.slideshow.active) return
+    L.DomUtil.addClass(document.body, this.CLASSNAME)
+    this._id = window.setInterval(L.bind(this.loop, this), this.options.delay)
+    this.startSpinner()
+    this.loop()
+  }
+
+  loop() {
+    this.current = this.next
+    this.step()
+  }
+
+  pause() {
+    if (this._id) {
+      this.stopSpinner()
+      L.DomUtil.removeClass(document.body, this.CLASSNAME)
+      window.clearInterval(this._id)
+      this._id = null
+    }
+  }
+
+  stop() {
+    this.pause()
+    this.current = null
+  }
+
+  forward() {
+    this.pause()
+    this.current = this.next
+    this.step()
+  }
+
+  backward() {
+    this.pause()
+    if (this.current) this.current = this.current.getPrevious()
+    this.step()
+  }
+
+  step() {
+    if (!this.current) return this.stop()
+    this.current.zoomTo({ easing: this.options.easing })
+    this.current.view()
+  }
+
+  toggle() {
+    this._id ? this.pause() : this.play()
+  }
+
+  renderToolbox(container) {
+    container.appendChild(this.loadTemplate(TOOLBOX_TEMPLATE))
+    this.elements.play.addEventListener('click', this.toggle.bind(this))
+    this.elements.stop.addEventListener('click', this.stop.bind(this))
+    this.elements.previous.addEventListener('click', this.backward.bind(this))
+    this.elements.next.addEventListener('click', this.forward.bind(this))
+  }
+}