umap-project 2.2.2__py3-none-any.whl → 2.3.1__py3-none-any.whl

umap/static/umap/js/modules/facets.js

@@ -10,15 +10,18 @@ export default class Facets {
 
   compute(names, defined) {
     const properties = {}
+    let selected
 
     names.forEach((name) => {
       const type = defined[name]['type']
       properties[name] = { type: type }
-      this.selected[name] = { type: type }
+      selected = this.selected[name] || {}
+      selected.type = type
       if (!['date', 'datetime', 'number'].includes(type)) {
         properties[name].choices = []
-        this.selected[name].choices = []
+        selected.choices = selected.choices || []
       }
+      this.selected[name] = selected
     })
 
     this.map.eachBrowsableDataLayer((datalayer) => {
@@ -53,42 +56,20 @@ export default class Facets {
     return properties
   }
 
-  redraw() {
-    if (this.isOpen()) this.open()
-  }
-
-  isOpen() {
-    return !!document.querySelector('.umap-facet-search')
+  isActive() {
+    for (let { type, min, max, choices } of Object.values(this.selected)) {
+      if (min !== undefined || max != undefined || choices?.length) {
+        return true
+      }
+    }
+    return false
   }
 
-  open() {
-    const container = L.DomUtil.create('div', 'umap-facet-search')
-    const title = L.DomUtil.add(
-      'h3',
-      'umap-filter-title',
-      container,
-      translate('Facet search')
-    )
-    this.map.browser.tabsMenu(container, 'facets')
+  build() {
     const defined = this.getDefined()
     const names = Object.keys(defined)
     const facetProperties = this.compute(names, defined)
 
-    const filterFeatures = function () {
-      let found = false
-      this.map.eachBrowsableDataLayer((datalayer) => {
-        datalayer.resetLayer(true)
-        if (datalayer.hasDataVisible()) found = true
-      })
-      // TODO: display a results counter in the panel instead.
-      if (!found) {
-        this.map.ui.alert({
-          content: translate('No results for these facets'),
-          level: 'info',
-        })
-      }
-    }
-
     const fields = names.map((name) => {
       let criteria = facetProperties[name]
       let handler = 'FacetSearchChoices'
@@ -114,13 +95,7 @@ export default class Facets {
       ]
     })
 
-    const builder = new L.FormBuilder(this, fields, {
-      callback: filterFeatures,
-      callbackContext: this,
-    })
-    container.appendChild(builder.build())
-
-    this.map.panel.open({ content: container })
+    return fields
   }
 
   getDefined() {

umap/static/umap/js/modules/global.js

@@ -1,6 +1,7 @@
 import URLs from './urls.js'
 import Browser from './browser.js'
 import Facets from './facets.js'
+import Caption from './caption.js'
 import { Panel, EditPanel, FullPanel } from './panel.js'
 import * as Utils from './utils.js'
 import { SCHEMA } from './schema.js'
@@ -25,4 +26,5 @@ window.U = {
   Utils,
   SCHEMA,
   Orderable,
+  Caption,
 }

umap/static/umap/js/modules/orderable.js

@@ -33,7 +33,7 @@ export default class Orderable {
 
   onDragStart(e) {
     // e.target is the source node.
-    const realSrc = document.elementFromPoint(e.clientX, e.clientY);
+    const realSrc = document.elementFromPoint(e.clientX, e.clientY)
     // Only allow drag from the handle
     if (!realSrc.classList.contains('icon-drag')) {
       e.preventDefault()

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

@@ -6,7 +6,9 @@ export class Panel {
     this.parent = map._controlContainer
     this.map = map
     this.container = DomUtil.create('div', '', this.parent)
-    this.mode = 'condensed'
+    // This will be set once according to the panel configurated at load
+    // or by using panels as popups
+    this.mode = null
     this.classname = 'left'
     DomEvent.disableClickPropagation(this.container)
     DomEvent.on(this.container, 'contextmenu', DomEvent.stopPropagation) // Do not activate our custom context menu.
@@ -14,8 +16,12 @@ export class Panel {
     DomEvent.on(this.container, 'MozMousePixelScroll', DomEvent.stopPropagation)
   }
 
+  setDefaultMode(mode) {
+    if (!this.mode) this.mode = mode
+  }
+
   open({ content, className, actions = [] } = {}) {
-    this.container.className = `with-transition panel ${this.classname} ${this.mode}`
+    this.container.className = `with-transition panel ${this.classname} ${this.mode || ''}`
     this.container.innerHTML = ''
     const actionsContainer = DomUtil.create('ul', 'toolbox', this.container)
     const body = DomUtil.create('div', 'body', this.container)
@@ -40,14 +46,14 @@ export class Panel {
   }
 
   resize() {
-    if (this.mode === 'expanded') {
-      this.mode = 'condensed'
-      this.container.classList.remove('expanded')
-      this.container.classList.add('condensed')
-    } else {
+    if (this.mode === 'condensed') {
       this.mode = 'expanded'
       this.container.classList.remove('condensed')
       this.container.classList.add('expanded')
+    } else {
+      this.mode = 'condensed'
+      this.container.classList.remove('expanded')
+      this.container.classList.add('condensed')
     }
   }
 

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

@@ -83,7 +83,7 @@ export const SCHEMA = {
   easing: {
     type: Boolean,
     impacts: [],
-    default: false
+    default: false,
   },
   editinosmControl: {
     type: Boolean,
@@ -272,9 +272,9 @@ export const SCHEMA = {
     choices: [
       ['none', translate('None')],
       ['caption', translate('Caption')],
-      ['databrowser', translate('Data browser')],
-      ['datalayers', translate('Layers')],
-      ['facet', translate('Facet search')],
+      ['databrowser', translate('Browser in data mode')],
+      ['datalayers', translate('Browser in layers mode')],
+      ['datafilters', translate('Browser in filters mode')],
     ],
     default: 'none',
   },

umap/static/umap/js/modules/urls.js

@@ -1,4 +1,4 @@
-import { template } from "./utils.js"
+import { template } from './utils.js'
 
 export default class URLs {
   constructor(serverUrls) {

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

@@ -88,7 +88,7 @@ export function escapeHTML(s) {
       'span',
     ],
     ADD_ATTR: ['target', 'allow', 'allowfullscreen', 'frameborder', 'scrolling'],
-    ALLOWED_ATTR: ['href', 'src', 'width', 'height', 'style'],
+    ALLOWED_ATTR: ['href', 'src', 'width', 'height', 'style', 'dir', 'title'],
     // Added: `geo:` URL scheme as defined in RFC5870:
     // https://www.rfc-editor.org/rfc/rfc5870.html
     // The base RegExp comes from:
@@ -362,3 +362,11 @@ export function parseNaiveDate(value) {
   // Let's pretend naive date are UTC, and remove time…
   return new Date(Date.UTC(naive.getFullYear(), naive.getMonth(), naive.getDate()))
 }
+
+export function toggleBadge(element, value) {
+  if (!element.nodeType) element = document.querySelector(element)
+  if (!element) return
+  // True means simple badge, without content
+  if (value) element.dataset.badge = value === true ? ' ' : value
+  else delete element.dataset.badge
+}

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

@@ -196,8 +196,11 @@ U.ToggleEditAction = U.BaseFeatureAction.extend({
   },
 
   onClick: function (e) {
-    if (this.feature._toggleEditing) this.feature._toggleEditing(e) // Path
-    else this.feature.edit(e) // Marker
+    if (this.feature._toggleEditing) {
+      this.feature._toggleEditing(e) // Path
+    } else {
+      this.feature.edit(e) // Marker
+    }
   },
 })
 
@@ -496,8 +499,11 @@ L.Control.Button = L.Control.extend({
       this
     )
     L.DomEvent.on(button, 'dblclick', L.DomEvent.stopPropagation)
+    this.afterAdd(container)
     return container
   },
+
+  afterAdd: function (container) {},
 })
 
 U.DataLayersControl = L.Control.Button.extend({
@@ -507,6 +513,10 @@ U.DataLayersControl = L.Control.Button.extend({
     title: L._('See layers'),
   },
 
+  afterAdd: function (container) {
+    U.Utils.toggleBadge(container, this.map.browser.hasFilters())
+  },
+
   onClick: function () {
     this.map.openBrowser()
   },
@@ -520,7 +530,7 @@ U.CaptionControl = L.Control.Button.extend({
   },
 
   onClick: function () {
-    this.map.displayCaption()
+    this.map.openCaption()
   },
 })
 
@@ -597,15 +607,14 @@ U.DataLayer.include({
           if (!this.isVisible()) return
           if (!confirm(L._('Are you sure you want to delete this layer?'))) return
           this._delete()
-          this.map.editPanel.close()
         },
         this
       )
     }
     L.DomEvent.on(toggle, 'click', this.toggle, this)
     L.DomEvent.on(zoomTo, 'click', this.zoomTo, this)
-    L.DomUtil.addClass(container, this.getHidableClass())
-    L.DomUtil.classIf(container, 'off', !this.isVisible())
+    container.classList.add(this.getHidableClass())
+    container.classList.toggle('off', !this.isVisible())
   },
 
   getHidableElements: function () {
@@ -616,10 +625,17 @@ U.DataLayer.include({
     return `show_with_datalayer_${L.stamp(this)}`
   },
 
+  propagateDelete: function () {
+    const els = this.getHidableElements()
+    for (const el of els) {
+      L.DomUtil.remove(el)
+    }
+  },
+
   propagateRemote: function () {
     const els = this.getHidableElements()
-    for (let i = 0; i < els.length; i++) {
-      L.DomUtil.classIf(els[i], 'remotelayer', this.isRemoteLayer())
+    for (const el of els) {
+      el.classList.toggle('remotelayer', this.isRemoteLayer())
     }
   },
 
@@ -643,6 +659,7 @@ U.DataLayer.include({
 U.DataLayer.addInitHook(function () {
   this.on('hide', this.propagateHide)
   this.on('show', this.propagateShow)
+  this.on('erase', this.propagateDelete)
   if (this.isVisible()) this.propagateShow()
 })
 
@@ -660,100 +677,6 @@ const ControlsMixin = {
     'star',
     'tilelayers',
   ],
-  _openFacet: function () {
-    this.facets.open()
-  },
-
-  displayCaption: function () {
-    const container = L.DomUtil.create('div', 'umap-caption')
-    L.DomUtil.createTitle(container, this.options.name, 'icon-caption')
-    this.permissions.addOwnerLink('h5', container)
-    this.browser.tabsMenu(container, 'info')
-    if (this.options.description) {
-      const description = L.DomUtil.element({
-        tagName: 'div',
-        className: 'umap-map-description',
-        safeHTML: U.Utils.toHTML(this.options.description),
-        parent: container,
-      })
-    }
-    const datalayerContainer = L.DomUtil.create('div', 'datalayer-container', container)
-    this.eachVisibleDataLayer((datalayer) => {
-      if (!datalayer.options.inCaption) return
-      const p = L.DomUtil.create('p', 'datalayer-legend', datalayerContainer),
-        legend = L.DomUtil.create('span', '', p),
-        headline = L.DomUtil.create('strong', '', p)
-      datalayer.onceLoaded(function () {
-        datalayer.renderLegend(legend)
-        if (datalayer.options.description) {
-          L.DomUtil.element({
-            tagName: 'span',
-            parent: p,
-            safeHTML: U.Utils.toHTML(datalayer.options.description),
-          })
-        }
-      })
-      datalayer.renderToolbox(headline)
-      L.DomUtil.add('span', '', headline, `${datalayer.options.name} `)
-    })
-    const creditsContainer = L.DomUtil.create('div', 'credits-container', container),
-      credits = L.DomUtil.createFieldset(creditsContainer, L._('Credits'))
-    title = L.DomUtil.add('h5', '', credits, L._('User content credits'))
-    if (this.options.shortCredit || this.options.longCredit) {
-      L.DomUtil.element({
-        tagName: 'p',
-        parent: credits,
-        safeHTML: U.Utils.toHTML(this.options.longCredit || this.options.shortCredit),
-      })
-    }
-    if (this.options.licence) {
-      const licence = L.DomUtil.add(
-        'p',
-        '',
-        credits,
-        `${L._('Map user content has been published under licence')} `
-      )
-      L.DomUtil.createLink(
-        '',
-        licence,
-        this.options.licence.name,
-        this.options.licence.url
-      )
-    } else {
-      L.DomUtil.add('p', '', credits, L._('No licence has been set'))
-    }
-    title = L.DomUtil.create('h5', '', credits)
-    title.textContent = L._('Map background credits')
-    const tilelayerCredit = L.DomUtil.create('p', '', credits)
-    L.DomUtil.element({
-      tagName: 'strong',
-      parent: tilelayerCredit,
-      textContent: `${this.selected_tilelayer.options.name} `,
-    })
-    L.DomUtil.element({
-      tagName: 'span',
-      parent: tilelayerCredit,
-      safeHTML: this.selected_tilelayer.getAttribution(),
-    })
-    const urls = {
-      leaflet: 'http://leafletjs.com',
-      django: 'https://www.djangoproject.com',
-      umap: 'http://wiki.openstreetmap.org/wiki/UMap',
-      changelog: 'https://umap-project.readthedocs.io/en/master/changelog/',
-      version: this.options.umap_version,
-    }
-    const creditHTML = L._(
-      `
-      Powered by <a href="{leaflet}">Leaflet</a> and
-      <a href="{django}">Django</a>,
-      glued by <a href="{umap}">uMap project</a>
-      (version <a href="{changelog}">{version}</a>).
-      `,
-      urls
-    )
-    L.DomUtil.element({ tagName: 'p', innerHTML: creditHTML, parent: credits })
-    this.panel.open({ content: container })
-  },
 
   renderEditToolbar: function () {
     const container = L.DomUtil.create(
@@ -904,7 +827,7 @@ const ControlsMixin = {
       L.DomUtil.createIcon(row, 'icon-drag', L._('Drag to reorder'))
       datalayer.renderToolbox(row)
       const title = L.DomUtil.add('span', '', row, datalayer.options.name)
-      L.DomUtil.classIf(row, 'off', !datalayer.isVisible())
+      row.classList.toggle('off', !datalayer.isVisible())
       title.textContent = datalayer.options.name
       row.dataset.id = L.stamp(datalayer)
     })
@@ -1071,7 +994,7 @@ U.AttributionControl = L.Control.Attribution.extend({
     if (captionMenus) {
       const link = L.DomUtil.add('a', '', container, ` — ${L._('About')}`)
       L.DomEvent.on(link, 'click', L.DomEvent.stop)
-        .on(link, 'click', this._map.displayCaption, this._map)
+        .on(link, 'click', this._map.openCaption, this._map)
         .on(link, 'dblclick', L.DomEvent.stop)
     }
     if (window.top === window.self && captionMenus) {
@@ -1115,8 +1038,17 @@ U.Locate = L.Control.Locate.extend({
   _activate: function () {
     this._map = this.map
     L.Control.Locate.prototype._activate.call(this)
-    this._map = null
   },
+
+  remove: function () {
+    // Prevent to call remove if the control is not really added to the map
+    // This occurs because we do create the control and call its activate
+    // method before adding the control button itself to the map, in the
+    // case where the map defaultView is set to "location"
+    if (!this._container || !this._container.parentNode) return
+    return L.Control.Locate.prototype.remove.call(this)
+  },
+
 })
 
 U.Search = L.PhotonSearch.extend({
@@ -1255,7 +1187,7 @@ U.SearchControl = L.Control.extend({
       this.map.fire('dataload', { id: id })
     })
     this.search.resultsContainer = resultsContainer
-    this.map.panel.open({ content: container }).then(input.focus)
+    this.map.panel.open({ content: container }).then(input.focus())
   },
 })
 
@@ -1316,16 +1248,14 @@ U.ContextMenu = L.Map.ContextMenu.extend({
 U.Editable = L.Editable.extend({
   initialize: function (map, options) {
     L.Editable.prototype.initialize.call(this, map, options)
-    this.on(
-      'editable:drawing:start editable:drawing:click editable:drawing:move',
-      this.drawingTooltip
-    )
+    this.on('editable:drawing:click editable:drawing:move', this.drawingTooltip)
     this.on('editable:drawing:end', (e) => {
       this.closeTooltip()
       // Leaflet.Editable will delete the drawn shape if invalid
       // (eg. line has only one drawn point)
       // So let's check if the layer has no more shape
       if (!e.layer.hasGeom()) e.layer.del()
+      else e.layer.edit()
     })
     // Layer for items added by users
     this.on('editable:drawing:cancel', (e) => {

umap/static/umap/js/umap.core.js

@@ -81,24 +81,26 @@ L.DomUtil.add = (tagName, className, container, content) => {
 
 L.DomUtil.createFieldset = (container, legend, options) => {
   options = options || {}
-  const fieldset = L.DomUtil.create('div', 'fieldset toggle', container)
-  const legendEl = L.DomUtil.add('h5', 'legend style_options_toggle', fieldset, legend)
-  const fieldsEl = L.DomUtil.add('div', 'fields with-transition', fieldset)
-  L.DomEvent.on(legendEl, 'click', function () {
-    if (L.DomUtil.hasClass(fieldset, 'on')) {
-      L.DomUtil.removeClass(fieldset, 'on')
-    } else {
-      L.DomUtil.addClass(fieldset, 'on')
-      if (options.callback) options.callback.call(options.context || this)
-    }
-  })
-  return fieldsEl
+  const details = L.DomUtil.create('details', options.className || '', container)
+  const summary = L.DomUtil.add('summary', '', details)
+  if (options.icon) L.DomUtil.createIcon(summary, options.icon)
+  L.DomUtil.add('span', '', summary, legend)
+  const fieldset = L.DomUtil.add('fieldset', '', details)
+  details.open = options.on === true
+  if (options.callback) {
+    L.DomEvent.on(details, 'toggle', () => {
+      if (details.open) options.callback.call(options.context || this)
+    })
+  }
+  return fieldset
 }
 
 L.DomUtil.createButton = (className, container, content, callback, context) => {
   const el = L.DomUtil.add('button', className, container, content)
   el.type = 'button'
-  el.title = content
+  if (!content.nodeType) {
+    el.title = content
+  }
   if (callback) {
     L.DomEvent.on(el, 'click', L.DomEvent.stop).on(el, 'click', callback, context)
   }
@@ -160,11 +162,6 @@ L.DomUtil.createCopiableInput = (parent, label, value) => {
   return input
 }
 
-L.DomUtil.classIf = (el, className, bool) => {
-  if (bool) L.DomUtil.addClass(el, className)
-  else L.DomUtil.removeClass(el, className)
-}
-
 L.DomUtil.element = ({ tagName, parent, ...attrs }) => {
   const el = document.createElement(tagName)
   if (attrs.innerHTML) {
@@ -554,9 +551,11 @@ U.Help = L.Class.extend({
     'Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.'
   ),
   slugKey: L._('The name of the property to use as feature unique identifier.'),
-  filterKey: L._('Comma separated list of properties to use when filtering features'),
+  filterKey: L._(
+    'Comma separated list of properties to use when filtering features by text input'
+  ),
   facetKey: L._(
-    'Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.'
+    'Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.'
   ),
   interactive: L._(
     'If false, the polygon or line will act as a part of the underlying map.'

umap/static/umap/js/umap.features.js

@@ -494,6 +494,14 @@ U.FeatureMixin = {
       this.bindTooltip(U.Utils.escapeHTML(displayName), options)
   },
 
+  isFiltered: function () {
+    const filterKeys = this.map.getFilterKeys()
+    const filter = this.map.browser.options.filter
+    if (filter && !this.matchFilter(filter, filterKeys)) return true
+    if (!this.matchFacets()) return true
+    return false
+  },
+
   matchFilter: function (filter, keys) {
     filter = filter.toLowerCase()
     for (let i = 0, value; i < keys.length; i++) {
@@ -513,8 +521,6 @@ U.FeatureMixin = {
         case 'date':
         case 'datetime':
         case 'number':
-          min = parser(min)
-          max = parser(max)
           if (!isNaN(min) && !isNaN(value) && min > value) return false
           if (!isNaN(max) && !isNaN(value) && max < value) return false
           break