umap-project 1.4.4__py3-none-any.whl → 1.5.0__py3-none-any.whl

umap/static/umap/js/umap.forms.js

@@ -417,12 +417,21 @@ L.FormBuilder.DataLayerSwitcher = L.FormBuilder.Select.extend({
   },
 })
 
-L.FormBuilder.onLoadPanel = L.FormBuilder.Select.extend({
+L.FormBuilder.DefaultView = L.FormBuilder.Select.extend({
+  selectOptions: [
+    ['center', L._('Saved center and zoom')],
+    ['bounds', L._('Layers bounds')],
+    ['latest', L._('Latest feature')],
+    ['locate', L._('User location')],
+  ],
+})
+
+L.FormBuilder.OnLoadPanel = L.FormBuilder.Select.extend({
   selectOptions: [
     ['none', L._('None')],
     ['caption', L._('Caption')],
     ['databrowser', L._('Data browser')],
-    ['datafilters', L._('Data filters')],
+    ['facet', L._('Facet search')],
   ],
 })
 
@@ -533,7 +542,7 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
   },
 
   udpatePreview: function () {
-    if (this.value() && this.value().indexOf('{') === -1) {
+    if (L.Util.hasVar(this.value())) {
       // Do not try to render URL with variables
       if (this.isUrl()) {
         const img = L.DomUtil.create(
@@ -675,6 +684,37 @@ L.FormBuilder.Switch = L.FormBuilder.CheckBox.extend({
   },
 })
 
+L.FormBuilder.FacetSearch = L.FormBuilder.Element.extend({
+  build: function () {
+    this.container = L.DomUtil.create('div', 'umap-facet', this.parentNode)
+    this.ul = L.DomUtil.create('ul', '', this.container)
+    const choices = this.options.choices
+    choices.sort()
+    choices.forEach((value) => this.buildLi(value))
+  },
+
+  buildLabel: function () {
+      this.label = L.DomUtil.add('h5', '', this.parentNode, this.options.label);
+  },
+
+  buildLi: function (value) {
+    const property_li = L.DomUtil.create('li', '', this.ul),
+      input = L.DomUtil.create('input', '', property_li),
+      label = L.DomUtil.create('label', '', property_li)
+    input.type = 'checkbox'
+    input.id = `checkbox_${this.name}_${value}`
+    input.checked = this.get().includes(value)
+    input.dataset.value = value
+    label.htmlFor = `checkbox_${this.name}_${value}`
+    label.innerHTML = value
+    L.DomEvent.on(input, 'change', (e) => this.sync())
+  },
+
+  toJS: function () {
+    return [...this.ul.querySelectorAll('input:checked')].map(i => i.dataset.value)
+  },
+})
+
 L.FormBuilder.MultiChoice = L.FormBuilder.Element.extend({
   default: 'null',
   className: 'umap-multiplechoice',
@@ -1008,9 +1048,13 @@ L.U.FormBuilder = L.FormBuilder.extend({
       label: L._('Do you want to display the scale control?'),
     },
     onLoadPanel: {
-      handler: 'onLoadPanel',
+      handler: 'OnLoadPanel',
       label: L._('Do you want to display a panel on load?'),
     },
+    defaultView: {
+      handler: 'DefaultView',
+      label: L._('Default view'),
+    },
     displayPopupFooter: {
       handler: 'Switch',
       label: L._('Do you want to display popup footer?'),
@@ -1096,6 +1140,12 @@ L.U.FormBuilder = L.FormBuilder.extend({
       handler: 'ControlChoice',
       label: L._('Display the star map button'),
     },
+    fromZoom: {
+      handler: 'IntInput',
+      label: L._('From zoom'),
+      helpText: L._('Optional.'),
+    },
+    toZoom: { handler: 'IntInput', label: L._('To zoom'), helpText: L._('Optional.') },
   },
 
   initialize: function (obj, fields, options) {
@@ -1106,7 +1156,7 @@ L.U.FormBuilder = L.FormBuilder.extend({
 
   setter: function (field, value) {
     L.FormBuilder.prototype.setter.call(this, field, value)
-    this.obj.isDirty = true
+    if (this.options.makeDirty !== false) this.obj.isDirty = true
   },
 
   finish: function () {

umap/static/umap/js/umap.js

@@ -67,13 +67,11 @@ L.U.Map.include({
   initialize: function (el, geojson) {
     // Locale name (pt_PT, en_US…)
     // To be used for Django localization
-    if (geojson.properties.locale)
-      L.setLocale(geojson.properties.locale)
+    if (geojson.properties.locale) L.setLocale(geojson.properties.locale)
 
     // Language code (pt-pt, en-us…)
     // To be used in javascript APIs
-    if (geojson.properties.lang)
-      L.lang = geojson.properties.lang
+    if (geojson.properties.lang) L.lang = geojson.properties.lang
 
     // Don't let default autocreation of controls
     const zoomControl =
@@ -91,7 +89,7 @@ L.U.Map.include({
 
     this.ui = new L.U.UI(this._container)
     this.xhr = new L.U.Xhr(this.ui)
-    this.xhr.on('dataloading',  (e) => this.fire('dataloading', e))
+    this.xhr.on('dataloading', (e) => this.fire('dataloading', e))
     this.xhr.on('dataload', (e) => this.fire('dataload', e))
 
     this.initLoader()
@@ -144,18 +142,6 @@ L.U.Map.include({
       // Certainly IE8, which has a limited version of defineProperty
     }
 
-    if (this.options.hash) this.addHash()
-    this.initCenter()
-    this.handleLimitBounds()
-
-    this.initTileLayers(this.options.tilelayers)
-
-    // Global storage for retrieving datalayers and features
-    this.datalayers = {}
-    this.datalayers_index = []
-    this.dirty_datalayers = []
-    this.features_index = {}
-
     // Retrocompat
     if (
       this.options.slideshow &&
@@ -163,10 +149,20 @@ L.U.Map.include({
       this.options.slideshow.active === undefined
     )
       this.options.slideshow.active = true
+    if (this.options.advancedFilterKey) this.options.facetKey = this.options.advancedFilterKey
 
-    this.initControls()
+    // Global storage for retrieving datalayers and features
+    this.datalayers = {}
+    this.datalayers_index = []
+    this.dirty_datalayers = []
+    this.features_index = {}
+    this.facets = {}
 
-    // create datalayers
+    if (this.options.hash) this.addHash()
+    this.initControls()
+    this.initCenter()
+    this.handleLimitBounds()
+    this.initTileLayers(this.options.tilelayers)
     this.initDatalayers()
 
     if (this.options.displayCaptionOnLoad) {
@@ -247,14 +243,14 @@ L.U.Map.include({
         },
         this
       )
-      this.initEditBar()
+      this.renderEditToolbar()
     }
     this.initShortcuts()
     this.onceDatalayersLoaded(function () {
       if (L.Util.queryString('share')) this.renderShareBox()
       else if (this.options.onLoadPanel === 'databrowser') this.openBrowser()
       else if (this.options.onLoadPanel === 'caption') this.displayCaption()
-      else if (this.options.onLoadPanel === 'datafilters') this.openFilter()
+      else if (this.options.onLoadPanel === 'facet' || this.options.onLoadPanel === 'datafilters') this.openFacet()
     })
     this.onceDataLoaded(function () {
       const slug = L.Util.queryString('feature')
@@ -636,10 +632,16 @@ L.U.Map.include({
     if (this.options.hash && this._hash.parseHash(location.hash)) {
       // FIXME An invalid hash will cause the load to fail
       this._hash.update()
-    } else if (this.options.locate && this.options.locate.setView) {
-      // Prevent from making two setViews at init
-      // which is not very fluid...
-      this.locate(this.options.locate)
+    } else if (this.options.defaultView === 'locate' && !this.options.noControl) {
+      this._controls.locate.start()
+    } else if (this.options.defaultView === 'bounds') {
+      this.onceDataLoaded(() => this.fitBounds(this.getLayersBounds()))
+    } else if (this.options.defaultView === 'latest') {
+      this.onceDataLoaded(() => {
+        const datalayer = this.defaultDataLayer(),
+          feature = datalayer.getFeatureByIndex(-1)
+        if (feature) feature.zoomTo()
+      })
     } else {
       this.options.center = this.latLng(this.options.center)
       this.setView(this.options.center, this.options.zoom)
@@ -951,9 +953,9 @@ L.U.Map.include({
     })
   },
 
-  openFilter: function () {
+  openFacet: function () {
     this.onceDatalayersLoaded(function () {
-      this._openFilter()
+      this._openFacet()
     })
   },
 
@@ -1036,6 +1038,7 @@ L.U.Map.include({
     'miniMap',
     'displayPopupFooter',
     'onLoadPanel',
+    'defaultView',
     'tilelayersControl',
     'name',
     'description',
@@ -1064,7 +1067,7 @@ L.U.Map.include({
     'sortKey',
     'labelKey',
     'filterKey',
-    'advancedFilterKey',
+    'facetKey',
     'slugKey',
     'showLabel',
     'labelDirection',
@@ -1273,6 +1276,9 @@ L.U.Map.include({
     }
   },
 
+  // TODO: allow to control the default datalayer
+  // (edit and viewing)
+  // cf https://github.com/umap-project/umap/issues/585
   defaultDataLayer: function () {
     let datalayer, fallback
     datalayer = this.lastUsedDataLayer
@@ -1314,6 +1320,7 @@ L.U.Map.include({
       'options.miniMap',
       'options.scaleControl',
       'options.onLoadPanel',
+      'options.defaultView',
       'options.displayPopupFooter',
       'options.captionBar',
       'options.captionMenus',
@@ -1387,13 +1394,12 @@ L.U.Map.include({
         },
       ],
       [
-        'options.advancedFilterKey',
+        'options.facetKey',
         {
           handler: 'Input',
-          helpEntries: 'advancedFilterKey',
+          helpEntries: 'facetKey',
           placeholder: L._('Example: key1,key2,key3'),
-          label: L._('Advanced filter keys'),
-          inheritable: true,
+          label: L._('Facet keys')
         },
       ],
       [
@@ -1710,7 +1716,7 @@ L.U.Map.include({
     if (!this.editEnabled) return
     const container = L.DomUtil.create('div', 'umap-edit-container'),
       metadataFields = ['options.name', 'options.description'],
-      title = L.DomUtil.create('h4', '', container)
+      title = L.DomUtil.create('h3', '', container)
     title.textContent = L._('Edit map properties')
     const builder = new L.U.FormBuilder(this, metadataFields)
     const form = builder.build()
@@ -1778,7 +1784,7 @@ L.U.Map.include({
         this.openBrowser,
         this
       )
-      if (this.options.advancedFilterKey) {
+      if (this.options.facetKey) {
         const filter = L.DomUtil.add(
           'a',
           'umap-open-filter-link',
@@ -1789,7 +1795,7 @@ L.U.Map.include({
         L.DomEvent.on(filter, 'click', L.DomEvent.stop).on(
           filter,
           'click',
-          this.openFilter,
+          this.openFacet,
           this
         )
       }
@@ -1804,66 +1810,6 @@ L.U.Map.include({
     })
   },
 
-  initEditBar: function () {
-    const container = L.DomUtil.create(
-        'div',
-        'umap-main-edit-toolbox with-transition dark',
-        this._controlContainer
-      ),
-      title = L.DomUtil.add('h3', '', container, `${L._('Editing')} `),
-      name = L.DomUtil.create('a', 'umap-click-to-edit', title),
-      setName = function () {
-        name.textContent = this.getDisplayName()
-      }
-    if (this.options.user) {
-      const userLabel = L.DomUtil.add('a', 'umap-user', title, this.options.user.name)
-      userLabel.href = this.options.user.url
-    }
-    L.bind(setName, this)()
-    L.DomEvent.on(name, 'click', this.edit, this)
-    this.on('postsync', L.bind(setName, this))
-    this.help.button(name, 'edit')
-    const save = L.DomUtil.create('a', 'leaflet-control-edit-save button', container)
-    save.href = '#'
-    save.title = `${L._('Save current edits')} (Ctrl+S)`
-    save.textContent = L._('Save')
-    const cancel = L.DomUtil.create(
-      'a',
-      'leaflet-control-edit-cancel button',
-      container
-    )
-    cancel.href = '#'
-    cancel.title = L._('Cancel edits')
-    cancel.textContent = L._('Cancel')
-    const disable = L.DomUtil.create('a', 'leaflet-control-edit-disable', container)
-    disable.href = '#'
-    disable.title = disable.textContent = L._('Disable editing')
-
-    L.DomEvent.addListener(disable, 'click', L.DomEvent.stop).addListener(
-      disable,
-      'click',
-      function (e) {
-        this.disableEdit(e)
-        this.ui.closePanel()
-      },
-      this
-    )
-
-    L.DomEvent.addListener(save, 'click', L.DomEvent.stop).addListener(
-      save,
-      'click',
-      this.save,
-      this
-    )
-
-    L.DomEvent.addListener(cancel, 'click', L.DomEvent.stop).addListener(
-      cancel,
-      'click',
-      this.askForReset,
-      this
-    )
-  },
-
   askForReset: function (e) {
     if (!confirm(L._('Are you sure you want to cancel your changes?'))) return
     this.reset()
@@ -2007,10 +1953,10 @@ L.U.Map.include({
       text: L._('Browse data'),
       callback: this.openBrowser,
     })
-    if (this.options.advancedFilterKey) {
+    if (this.options.facetKey) {
       items.push({
-        text: L._('Select data'),
-        callback: this.openFilter,
+        text: L._('Facet search'),
+        callback: this.openFacet,
       })
     }
     items.push(
@@ -2095,7 +2041,20 @@ L.U.Map.include({
     return (this.options.filterKey || this.options.sortKey || 'name').split(',')
   },
 
-  getAdvancedFilterKeys: function () {
-    return (this.options.advancedFilterKey || '').split(',')
+  getFacetKeys: function () {
+    return (this.options.facetKey || '').split(',').reduce((acc, curr) => {
+      const els = curr.split("|")
+      acc[els[0]] = els[1] || els[0]
+      return acc
+    }, {})
+  },
+
+  getLayersBounds: function () {
+    const bounds = new L.latLngBounds()
+    this.eachBrowsableDataLayer((d) => {
+      if (d.isVisible()) bounds.extend(d.layer.getBounds())
+    })
+    return bounds
   },
+
 })

umap/static/umap/js/umap.layer.js

@@ -10,6 +10,10 @@ L.U.Layer = {
   },
 
   postUpdate: function () {},
+
+  hasDataVisible: function () {
+    return !!Object.keys(this._layers).length
+  },
 }
 
 L.U.Layer.Default = L.FeatureGroup.extend({
@@ -53,6 +57,17 @@ L.U.Layer.Cluster = L.MarkerClusterGroup.extend({
     }
     L.MarkerClusterGroup.prototype.initialize.call(this, options)
     this._markerCluster = L.U.MarkerCluster
+    this._layers = []
+  },
+
+  addLayer: function (layer) {
+    this._layers.push(layer)
+    return L.MarkerClusterGroup.prototype.addLayer.call(this, layer)
+  },
+
+  removeLayer: function (layer) {
+    this._layers.splice(this._layers.indexOf(layer), 1)
+    return L.MarkerClusterGroup.prototype.removeLayer.call(this, layer)
   },
 
   getEditableOptions: function () {
@@ -237,11 +252,31 @@ L.U.DataLayer = L.Evented.extend({
     this.connectToMap()
     if (this.displayedOnLoad()) this.show()
     if (!this.umap_id) this.isDirty = true
+
+    // Retrocompat
+    if (this.options.remoteData && this.options.remoteData.from) {
+      this.options.fromZoom = this.options.remoteData.from
+    }
+    if (this.options.remoteData && this.options.remoteData.to) {
+      this.options.toZoom = this.options.remoteData.to
+    }
+
     this.onceLoaded(function () {
-      this.map.on('moveend', this.fetchRemoteData, this)
+      this.map.on('moveend', this.onMoveEnd, this)
+      this.map.on('zoomend', this.onZoomEnd, this)
     })
   },
 
+  onMoveEnd: function (e) {
+    if (this.isRemoteLayer()) this.fetchRemoteData()
+  },
+
+  onZoomEnd: function (e) {
+    if (this._forcedVisibility) return
+    if (!this.showAtZoom() && this.isVisible()) this.hide()
+    if (this.showAtZoom() && !this.isVisible()) this.show()
+  },
+
   displayedOnLoad: function () {
     return (
       (this.map.datalayersOnLoad &&
@@ -265,6 +300,10 @@ L.U.DataLayer = L.Evented.extend({
     this.parentPane.appendChild(this.pane)
   },
 
+  hasDataVisible: function () {
+    return this.layer.hasDataVisible()
+  },
+
   resetLayer: function (force) {
     if (this.layer && this.options.type === this.layer._type && !force) return
     const visible = this.isVisible()
@@ -273,12 +312,7 @@ L.U.DataLayer = L.Evented.extend({
     if (visible) this.map.removeLayer(this.layer)
     const Class = L.U.Layer[this.options.type] || L.U.Layer.Default
     this.layer = new Class(this)
-    const filterKeys = this.map.getFilterKeys(),
-      filter = this.map.options.filter
-    this.eachLayer(function (layer) {
-      if (filter && !layer.matchFilter(filter, filterKeys)) return
-      this.layer.addLayer(layer)
-    })
+    this.eachLayer((feature) => this.showFeature(feature))
     if (visible) this.map.addLayer(this.layer)
     this.propagateRemote()
   },
@@ -335,6 +369,7 @@ L.U.DataLayer = L.Evented.extend({
       this.backupData()
       this._geojson = null
     }
+    this.fire('datachanged')
   },
 
   backupData: function () {
@@ -351,17 +386,17 @@ L.U.DataLayer = L.Evented.extend({
     }
   },
 
+  showAtZoom: function () {
+    const from = parseInt(this.options.fromZoom, 10),
+      to = parseInt(this.options.toZoom, 10),
+      zoom = this.map.getZoom()
+    if (isNaN(from) || isNaN(to)) return false
+    return (zoom >= from && zoom <= to)
+  },
+
   fetchRemoteData: function () {
     if (!this.isRemoteLayer()) return
-    const from = parseInt(this.options.remoteData.from, 10),
-      to = parseInt(this.options.remoteData.to, 10)
-    if (
-      (!isNaN(from) && this.map.getZoom() < from) ||
-      (!isNaN(to) && this.map.getZoom() > to)
-    ) {
-      this.clear()
-      return
-    }
+    if (!this.showAtZoom()) return
     if (!this.options.remoteData.dynamic && this.hasDataLoaded()) return
     if (!this.isVisible()) return
     let url = this.map.localizeUrl(this.options.remoteData.url)
@@ -457,15 +492,23 @@ L.U.DataLayer = L.Evented.extend({
     return this.options.type === 'Cluster'
   },
 
+  showFeature: function (feature) {
+    const filterKeys = this.map.getFilterKeys(),
+      filter = this.map.options.filter
+    if (filter && !feature.matchFilter(filter, filterKeys)) return
+    if (!feature.matchFacets()) return
+    this.layer.addLayer(feature)
+  },
+
   addLayer: function (feature) {
     const id = L.stamp(feature)
     feature.connectToDataLayer(this)
     this._index.push(id)
     this._layers[id] = feature
-    this.layer.addLayer(feature)
     this.indexProperties(feature)
-    if (this.hasDataLoaded()) this.fire('datachanged')
     this.map.features_index[feature.getSlug()] = feature
+    this.showFeature(feature)
+    if (this.hasDataLoaded()) this.fire('datachanged')
   },
 
   removeLayer: function (feature) {
@@ -840,6 +883,8 @@ L.U.DataLayer = L.Evented.extend({
       'options.smoothFactor',
       'options.dashArray',
       'options.zoomTo',
+      'options.fromZoom',
+      'options.toZoom',
       'options.labelKey',
     ]
 
@@ -880,11 +925,8 @@ L.U.DataLayer = L.Evented.extend({
         { handler: 'Url', label: L._('Url'), helpEntries: 'formatURL' },
       ],
       ['options.remoteData.format', { handler: 'DataFormat', label: L._('Format') }],
-      [
-        'options.remoteData.from',
-        { label: L._('From zoom'), helpText: L._('Optional.') },
-      ],
-      ['options.remoteData.to', { label: L._('To zoom'), helpText: L._('Optional.') }],
+      'options.fromZoom',
+      'options.toZoom',
       [
         'options.remoteData.dynamic',
         { handler: 'Switch', label: L._('Dynamic'), helpEntries: 'dynamicRemoteData' },
@@ -976,9 +1018,7 @@ L.U.DataLayer = L.Evented.extend({
   buildVersionsFieldset: function (container) {
     const appendVersion = function (data) {
       const date = new Date(parseInt(data.at, 10))
-      const content = `${date.toLocaleString(L.lang)} (${
-        parseInt(data.size) / 1000
-      }Kb)`
+      const content = `${date.toLocaleString(L.lang)} (${parseInt(data.size) / 1000}Kb)`
       const el = L.DomUtil.create('div', 'umap-datalayer-version', versionsContainer)
       const a = L.DomUtil.create('a', '', el)
       L.DomUtil.add('span', '', el, content)
@@ -1041,6 +1081,9 @@ L.U.DataLayer = L.Evented.extend({
   },
 
   toggle: function () {
+    // From now on, do not try to how/hide
+    // automatically this layer.
+    this._forcedVisibility = true
     if (!this.isVisible()) this.show()
     else this.hide()
   },

umap/static/umap/js/umap.permissions.js

@@ -160,6 +160,7 @@ L.U.MapPermissions = L.Class.extend({
         this.commit()
         this.isDirty = false
         this.map.continueSaving()
+        this.map.fire('postsync')
       },
     })
   },
@@ -194,4 +195,8 @@ L.U.MapPermissions = L.Class.extend({
   commit: function () {
     L.Util.extend(this.map.options.permissions, this.options)
   },
+
+  getShareStatusDisplay: function () {
+    return Object.fromEntries(this.map.options.share_statuses)[this.options.share_status]
+  }
 })

umap/static/umap/js/umap.popup.js

@@ -63,8 +63,8 @@ L.U.Popup.Panel = L.U.Popup.extend({
     return button
   },
 
-  update: function () {
-    this.feature.map.ui.openPanel({
+  onAdd: function (map) {
+    map.ui.openPanel({
       data: { html: this._content },
       actions: [this.allButton()],
     })
@@ -72,12 +72,9 @@ L.U.Popup.Panel = L.U.Popup.extend({
 
   onRemove: function (map) {
     map.ui.closePanel()
-    L.U.Popup.prototype.onRemove.call(this, map)
   },
 
-  _initLayout: function () {
-    this._container = L.DomUtil.create('span')
-  },
+  update: function () {},
   _updateLayout: function () {},
   _updatePosition: function () {},
   _adjustPan: function () {},

umap/static/umap/js/umap.xhr.js

@@ -95,7 +95,8 @@ L.U.Xhr = L.Evented.extend({
             // 0 === request cut by user or CORS
             self.ui.alert({
               content: L._(
-                'Issue reaching that URL (network problem or CORS protection)'
+                'Issue reaching that URL (network problem or CORS protection): {url}',
+                { url: settings.uri }
               ),
               level: 'error',
             })