umap-project 2.1.2__py3-none-any.whl → 2.2.0__py3-none-any.whl

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

@@ -97,7 +97,7 @@ U.Layer.Cluster = L.MarkerClusterGroup.extend({
   },
 
   getEditableOptions: function () {
-    if (!L.Util.isObject(this.datalayer.options.cluster)) {
+    if (!U.Utils.isObject(this.datalayer.options.cluster)) {
       this.datalayer.options.cluster = {}
     }
     return [
@@ -155,7 +155,7 @@ U.Layer.Choropleth = L.FeatureGroup.extend({
 
   initialize: function (datalayer) {
     this.datalayer = datalayer
-    if (!L.Util.isObject(this.datalayer.options.choropleth)) {
+    if (!U.Utils.isObject(this.datalayer.options.choropleth)) {
       this.datalayer.options.choropleth = {}
     }
     L.FeatureGroup.prototype.initialize.call(
@@ -254,16 +254,18 @@ U.Layer.Choropleth = L.FeatureGroup.extend({
   },
 
   onEdit: function (field, builder) {
+    // Only compute the breaks if we're dealing with choropleth
+    if (!field.startsWith('options.choropleth')) return
     // If user touches the breaks, then force manual mode
     if (field === 'options.choropleth.breaks') {
       this.datalayer.options.choropleth.mode = 'manual'
-      builder.helpers['options.choropleth.mode'].fetch()
+      if (builder) builder.helpers['options.choropleth.mode'].fetch()
     }
     this.computeBreaks()
     // If user changes the mode or the number of classes,
     // then update the breaks input value
     if (field === 'options.choropleth.mode' || field === 'options.choropleth.classes') {
-      builder.helpers['options.choropleth.breaks'].fetch()
+      if (builder) builder.helpers['options.choropleth.breaks'].fetch()
     }
   },
 
@@ -381,7 +383,7 @@ U.Layer.Heat = L.HeatLayer.extend({
   },
 
   getEditableOptions: function () {
-    if (!L.Util.isObject(this.datalayer.options.heat)) {
+    if (!U.Utils.isObject(this.datalayer.options.heat)) {
       this.datalayer.options.heat = {}
     }
     return [
@@ -592,6 +594,32 @@ U.DataLayer = L.Evented.extend({
     // Automatically, others will be shown manually, and thus will
     // be in the "forced visibility" mode
     if (this.autoLoaded()) this.map.on('zoomend', this.onZoomEnd, this)
+    this.on('datachanged', this.map.onDataLayersChanged, this.map)
+  },
+
+  render: function (fields, builder) {
+    let impacts = U.Utils.getImpactsFromSchema(fields)
+
+    for (let impact of impacts) {
+      switch (impact) {
+        case 'ui':
+          this.map.onDataLayersChanged()
+          break
+        case 'data':
+          if (fields.includes('options.type')) {
+            this.resetLayer()
+          }
+          this.hide()
+          fields.forEach((field) => {
+            this.layer.onEdit(field, builder)
+          })
+          this.show()
+          break
+        case 'remote-data':
+          this.fetchRemoteData()
+          break
+      }
+    }
   },
 
   onMoveEnd: function (e) {
@@ -609,12 +637,13 @@ U.DataLayer = L.Evented.extend({
   },
 
   autoLoaded: function () {
-    return (
-      (this.map.datalayersOnLoad &&
-        this.umap_id &&
-        this.map.datalayersOnLoad.indexOf(this.umap_id.toString()) !== -1) ||
-      (!this.map.datalayersOnLoad && this.options.displayOnLoad)
-    )
+    if (!this.map.datalayersFromQueryString) return this.options.displayOnLoad
+    const datalayerIds = this.map.datalayersFromQueryString
+    let loadMe = datalayerIds.includes(this.umap_id.toString())
+    if (this.options.old_id) {
+      loadMe = loadMe || datalayerIds.includes(this.options.old_id.toString())
+    }
+    return loadMe
   },
 
   insertBefore: function (other) {
@@ -723,13 +752,13 @@ U.DataLayer = L.Evented.extend({
   },
 
   backupData: function () {
-    this._geojson_bk = L.Util.CopyJSON(this._geojson)
+    this._geojson_bk = U.Utils.CopyJSON(this._geojson)
   },
 
   reindex: function () {
     const features = []
     this.eachFeature((feature) => features.push(feature))
-    L.Util.sortFeatures(features, this.map.getOption('sortKey'))
+    U.Utils.sortFeatures(features, this.map.getOption('sortKey'), L.lang)
     this._index = []
     for (let i = 0; i < features.length; i++) {
       this._index.push(L.Util.stamp(features[i]))
@@ -792,16 +821,16 @@ U.DataLayer = L.Evented.extend({
   },
 
   backupOptions: function () {
-    this._backupOptions = L.Util.CopyJSON(this.options)
+    this._backupOptions = U.Utils.CopyJSON(this.options)
   },
 
   resetOptions: function () {
-    this.options = L.Util.CopyJSON(this._backupOptions)
+    this.options = U.Utils.CopyJSON(this._backupOptions)
   },
 
   setOptions: function (options) {
     delete options.geojson
-    this.options = L.Util.CopyJSON(U.DataLayer.prototype.options) // Start from fresh.
+    this.options = U.Utils.CopyJSON(U.DataLayer.prototype.options) // Start from fresh.
     this.updateOptions(options)
   },
 
@@ -816,14 +845,14 @@ U.DataLayer = L.Evented.extend({
       this.map.datalayers[id] = this
       if (L.Util.indexOf(this.map.datalayers_index, this) === -1)
         this.map.datalayers_index.push(this)
+      this.map.onDataLayersChanged()
     }
-    this.map.updateDatalayersControl()
   },
 
   _dataUrl: function () {
     const template = this.map.options.urls.datalayer_view
 
-    let url = L.Util.template(template, {
+    let url = U.Utils.template(template, {
       pk: this.umap_id,
       map_id: this.map.options.umap_id,
     })
@@ -918,6 +947,17 @@ U.DataLayer = L.Evented.extend({
           includeLatLon: false,
         },
         (err, result) => {
+          // csv2geojson fallback to null geometries when it cannot determine
+          // lat or lon columns. This is valid geojson, but unwanted from a user
+          // point of view.
+          if (result && result.features.length) {
+            if (result.features[0].geometry === null) {
+              err = {
+                type: 'Error',
+                message: L._('Cannot determine latitude and longitude columns.'),
+              }
+            }
+          }
           if (err) {
             let message
             if (err.type === 'Error') {
@@ -970,7 +1010,7 @@ U.DataLayer = L.Evented.extend({
     let latlngs
 
     if (features) {
-      L.Util.sortFeatures(features, this.map.getOption('sortKey'))
+      U.Utils.sortFeatures(features, this.map.getOption('sortKey'), L.lang)
       for (i = 0, len = features.length; i < len; i++) {
         this.geojsonToFeatures(features[i])
       }
@@ -1060,7 +1100,7 @@ U.DataLayer = L.Evented.extend({
 
   importFromFile: function (f, type) {
     const reader = new FileReader()
-    type = type || L.Util.detectFileType(f)
+    type = type || U.Utils.detectFileType(f)
     reader.readAsText(f)
     reader.onload = (e) => this.importRaw(e.target.result, type)
   },
@@ -1078,21 +1118,21 @@ U.DataLayer = L.Evented.extend({
   },
 
   getDeleteUrl: function () {
-    return L.Util.template(this.map.options.urls.datalayer_delete, {
+    return U.Utils.template(this.map.options.urls.datalayer_delete, {
       pk: this.umap_id,
       map_id: this.map.options.umap_id,
     })
   },
 
   getVersionsUrl: function () {
-    return L.Util.template(this.map.options.urls.datalayer_versions, {
+    return U.Utils.template(this.map.options.urls.datalayer_versions, {
       pk: this.umap_id,
       map_id: this.map.options.umap_id,
     })
   },
 
   getVersionUrl: function (name) {
-    return L.Util.template(this.map.options.urls.datalayer_version, {
+    return U.Utils.template(this.map.options.urls.datalayer_version, {
       pk: this.umap_id,
       map_id: this.map.options.umap_id,
       name: name,
@@ -1111,10 +1151,10 @@ U.DataLayer = L.Evented.extend({
   },
 
   clone: function () {
-    const options = L.Util.CopyJSON(this.options)
+    const options = U.Utils.CopyJSON(this.options)
     options.name = L._('Clone of {name}', { name: this.options.name })
     delete options.id
-    const geojson = L.Util.CopyJSON(this._geojson),
+    const geojson = U.Utils.CopyJSON(this._geojson),
       datalayer = this.map.createDataLayer(options)
     datalayer.fromGeoJSON(geojson)
     return datalayer
@@ -1125,7 +1165,8 @@ U.DataLayer = L.Evented.extend({
     delete this.map.datalayers[L.stamp(this)]
     this.map.datalayers_index.splice(this.getRank(), 1)
     this.parentPane.removeChild(this.pane)
-    this.map.updateDatalayersControl()
+    this.map.onDataLayersChanged()
+    this.off('datachanged', this.map.onDataLayersChanged, this.map)
     this.fire('erase')
     this._leaflet_events_bk = this._leaflet_events
     this.map.off('moveend', this.onMoveEnd, this)
@@ -1185,32 +1226,22 @@ U.DataLayer = L.Evented.extend({
           },
         ],
       ]
-    const title = L.DomUtil.add('h3', '', container, L._('Layer properties'))
+    L.DomUtil.createTitle(container, L._('Layer properties'), 'icon-layers')
     let builder = new U.FormBuilder(this, metadataFields, {
       callback: function (e) {
-        this.map.updateDatalayersControl()
+        this.map.onDataLayersChanged()
         if (e.helper.field === 'options.type') {
-          this.resetLayer()
           this.edit()
         }
       },
     })
     container.appendChild(builder.build())
 
-    const redrawCallback = function (e) {
-      const field = e.helper.field,
-        builder = e.helper.builder
-      this.hide()
-      this.layer.onEdit(field, builder)
-      this.show()
-    }
-
     const layerOptions = this.layer.getEditableOptions()
 
     if (layerOptions.length) {
       builder = new U.FormBuilder(this, layerOptions, {
         id: 'datalayer-layer-properties',
-        callback: redrawCallback,
       })
       const layerProperties = L.DomUtil.createFieldset(
         container,
@@ -1234,7 +1265,6 @@ U.DataLayer = L.Evented.extend({
 
     builder = new U.FormBuilder(this, shapeOptions, {
       id: 'datalayer-advanced-properties',
-      callback: redrawCallback,
     })
     const shapeProperties = L.DomUtil.createFieldset(container, L._('Shape properties'))
     shapeProperties.appendChild(builder.build())
@@ -1250,7 +1280,6 @@ U.DataLayer = L.Evented.extend({
 
     builder = new U.FormBuilder(this, optionsFields, {
       id: 'datalayer-advanced-properties',
-      callback: redrawCallback,
     })
     const advancedProperties = L.DomUtil.createFieldset(
       container,
@@ -1268,14 +1297,14 @@ U.DataLayer = L.Evented.extend({
       'options.outlinkTarget',
       'options.interactive',
     ]
-    builder = new U.FormBuilder(this, popupFields, { callback: redrawCallback })
+    builder = new U.FormBuilder(this, popupFields)
     const popupFieldset = L.DomUtil.createFieldset(
       container,
       L._('Interaction options')
     )
     popupFieldset.appendChild(builder.build())
 
-    if (!L.Util.isObject(this.options.remoteData)) {
+    if (!U.Utils.isObject(this.options.remoteData)) {
       this.options.remoteData = {}
     }
     const remoteDataFields = [
@@ -1334,7 +1363,7 @@ U.DataLayer = L.Evented.extend({
       L._('Delete'),
       function () {
         this._delete()
-        this.map.ui.closePanel()
+        this.map.editPanel.close()
       },
       this
     )
@@ -1366,11 +1395,22 @@ U.DataLayer = L.Evented.extend({
         '_blank'
       )
     }
-    this.map.ui.openPanel({ data: { html: container }, className: 'dark' })
+    const button = L.DomUtil.create('li', '')
+    L.DomUtil.create('i', 'icon icon-16 icon-back', button)
+    button.title = L._('Back to layers')
+    // Fixme: remove me when this is merged and released
+    // https://github.com/Leaflet/Leaflet/pull/9052
+    L.DomEvent.disableClickPropagation(button)
+    L.DomEvent.on(button, 'click', this.map.editDatalayers, this.map)
+
+    this.map.editPanel.open({
+      content: container,
+      actions: [button],
+    })
   },
 
   getOwnOption: function (option) {
-    if (L.Util.usableOption(this.options, option)) return this.options[option]
+    if (U.Utils.usableOption(this.options, option)) return this.options[option]
   },
 
   getOption: function (option, feature) {
@@ -1667,6 +1707,6 @@ L.TileLayer.include({
   },
 
   getAttribution: function () {
-    return L.Util.toHTML(this.options.attribution)
+    return U.Utils.toHTML(this.options.attribution)
   },
 })

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

@@ -57,15 +57,20 @@ U.MapPermissions = L.Class.extend({
         content: L._('Please save the map first'),
         level: 'info',
       })
-    const container = L.DomUtil.create('div', 'permissions-panel'),
-      fields = [],
-      title = L.DomUtil.create('h3', '', container)
+    const container = L.DomUtil.create('div', 'permissions-panel')
+    const fields = []
+    L.DomUtil.createTitle(container, L._('Update permissions'), 'icon-key')
     if (this.isAnonymousMap()) {
       if (this.options.anonymous_edit_url) {
         const helpText = `${L._('Secret edit link:')}<br>${
           this.options.anonymous_edit_url
         }`
-        L.DomUtil.add('p', 'help-text', container, helpText)
+        L.DomUtil.element({
+          tagName: 'p',
+          className: 'help-text',
+          innerHTML: helpText,
+          parent: container,
+        })
         fields.push([
           'options.edit_status',
           {
@@ -104,7 +109,6 @@ U.MapPermissions = L.Class.extend({
         { handler: 'ManageEditors', label: L._("Map's editors") },
       ])
     }
-    title.textContent = L._('Update permissions')
     const builder = new U.FormBuilder(this, fields)
     const form = builder.build()
     container.appendChild(form)
@@ -128,7 +132,7 @@ U.MapPermissions = L.Class.extend({
     this.map.eachDataLayer((datalayer) => {
       datalayer.permissions.edit(container)
     })
-    this.map.ui.openPanel({ data: { html: container }, className: 'dark' })
+    this.map.editPanel.open({ content: container, className: 'dark' })
   },
 
   attach: async function () {
@@ -139,7 +143,7 @@ U.MapPermissions = L.Class.extend({
         content: L._('Map has been attached to your account'),
         level: 'info',
       })
-      this.map.ui.closePanel()
+      this.map.editPanel.close()
     }
   },
 
@@ -171,13 +175,13 @@ U.MapPermissions = L.Class.extend({
   },
 
   getUrl: function () {
-    return L.Util.template(this.map.options.urls.map_update_permissions, {
+    return U.Utils.template(this.map.options.urls.map_update_permissions, {
       map_id: this.map.options.umap_id,
     })
   },
 
   getAttachUrl: function () {
-    return L.Util.template(this.map.options.urls.map_attach_owner, {
+    return U.Utils.template(this.map.options.urls.map_attach_owner, {
       map_id: this.map.options.umap_id,
     })
   },

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

@@ -54,22 +54,10 @@ U.Popup.Panel = U.Popup.extend({
     zoomAnimation: false,
   },
 
-  allButton: function () {
-    const button = L.DomUtil.create('li', '')
-    L.DomUtil.create('i', 'umap-icon-16 umap-list', button)
-    const label = L.DomUtil.create('span', '', button)
-    label.textContent = label.title = L._('See all')
-    // Fixme: remove me when this is merged and released
-    // https://github.com/Leaflet/Leaflet/pull/9052
-    L.DomEvent.disableClickPropagation(button)
-    L.DomEvent.on(button, 'click', this.feature.map.openBrowser, this.feature.map)
-    return button
-  },
-
   onAdd: function (map) {
-    map.ui.openPanel({
-      data: { html: this._content },
-      actions: [this.allButton()],
+    map.panel.open({
+      content: this._content,
+      actions: [U.Browser.backButton(map)],
     })
 
     // fire events as in base class Popup.js:onAdd
@@ -83,7 +71,7 @@ U.Popup.Panel = U.Popup.extend({
   },
 
   onRemove: function (map) {
-    map.ui.closePanel()
+    map.panel.close()
 
     // fire events as in base class Popup.js:onRemove
     map.fire('popupclose', { popup: this })
@@ -124,12 +112,12 @@ U.PopupTemplate.Default = L.Class.extend({
     let center
     properties = this.feature.extendedProperties()
     // Resolve properties inside description
-    properties.description = L.Util.greedyTemplate(
+    properties.description = U.Utils.greedyTemplate(
       this.feature.properties.description || '',
       properties
     )
-    content = L.Util.greedyTemplate(template, properties)
-    content = L.Util.toHTML(content, { target: target })
+    content = U.Utils.greedyTemplate(template, properties)
+    content = U.Utils.toHTML(content, { target: target })
     container.innerHTML = content
     return container
   },
@@ -202,7 +190,11 @@ U.PopupTemplate.Table = U.PopupTemplate.BaseWithTitle.extend({
   addRow: function (container, key, value) {
     const tr = L.DomUtil.create('tr', '', container)
     L.DomUtil.add('th', '', tr, key)
-    L.DomUtil.add('td', '', tr, this.formatRow(key, value))
+    L.DomUtil.element({
+      tagName: 'td',
+      parent: tr,
+      innerHTML: this.formatRow(key, value),
+    })
   },
 
   renderBody: function () {
@@ -211,7 +203,7 @@ U.PopupTemplate.Table = U.PopupTemplate.BaseWithTitle.extend({
     for (const key in this.feature.properties) {
       if (typeof this.feature.properties[key] === 'object' || key === 'name') continue
       // TODO, manage links (url, mailto, wikipedia...)
-      this.addRow(table, key, L.Util.escapeHTML(this.feature.properties[key]).trim())
+      this.addRow(table, key, U.Utils.escapeHTML(this.feature.properties[key]).trim())
     }
     return table
   },
@@ -263,7 +255,8 @@ U.PopupTemplate.OSM = U.PopupTemplate.Default.extend({
 
   getName: function () {
     const props = this.feature.properties
-    if (L.locale && props[`name:${L.locale}`]) return props[`name:${L.locale}`]
+    const locale = L.getLocale()
+    if (locale && props[`name:${locale}`]) return props[`name:${locale}`]
     return props.name
   },
 
@@ -292,11 +285,12 @@ U.PopupTemplate.OSM = U.PopupTemplate.Default.extend({
       }
     }
     if (props.website) {
-      L.DomUtil.element(
-        'a',
-        { href: props.website, textContent: props.website },
-        container
-      )
+      L.DomUtil.element({
+        tagName: 'a',
+        parent: container,
+        href: props.website,
+        textContent: props.website,
+      })
     }
     const phone = props.phone || props['contact:phone']
     if (phone) {
@@ -304,7 +298,7 @@ U.PopupTemplate.OSM = U.PopupTemplate.Default.extend({
         'div',
         '',
         container,
-        L.DomUtil.element('a', { href: `tel:${phone}`, textContent: phone })
+        L.DomUtil.element({ tagName: 'a', href: `tel:${phone}`, textContent: phone })
       )
     }
     if (props.mobile) {
@@ -312,7 +306,8 @@ U.PopupTemplate.OSM = U.PopupTemplate.Default.extend({
         'div',
         '',
         container,
-        L.DomUtil.element('a', {
+        L.DomUtil.element({
+          tagName: 'a',
           href: `tel:${props.mobile}`,
           textContent: props.mobile,
         })
@@ -333,7 +328,8 @@ U.PopupTemplate.OSM = U.PopupTemplate.Default.extend({
         'div',
         'osm-link',
         container,
-        L.DomUtil.element('a', {
+        L.DomUtil.element({
+          tagName: 'a',
           href: `https://www.openstreetmap.org/${id}`,
           textContent: L._('See on OpenStreetMap'),
         })

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

@@ -44,14 +44,17 @@ U.Share = L.Class.extend({
   },
 
   build: function () {
-    this.container = L.DomUtil.create('div', 'umap-share')
-    this.title = L.DomUtil.create('h3', '', this.container)
-    this.title.textContent = L._('Share and download')
+    this.container = L.DomUtil.create('div', '')
+    this.title = L.DomUtil.createTitle(
+      this.container,
+      L._('Share and download'),
+      'icon-share'
+    )
 
     L.DomUtil.createCopiableInput(
       this.container,
       L._('Link to view the map'),
-      window.location.protocol + L.Util.getBaseUrl()
+      window.location.protocol + U.Utils.getBaseUrl()
     )
 
     if (this.map.options.shortUrl) {
@@ -84,7 +87,7 @@ U.Share = L.Class.extend({
       this.container,
       L._('All data and settings of the map')
     )
-    const downloadUrl = L.Util.template(this.map.options.urls.map_download, {
+    const downloadUrl = U.Utils.template(this.map.options.urls.map_download, {
       map_id: this.map.options.umap_id,
     })
     const link = L.DomUtil.createLink(
@@ -140,7 +143,7 @@ U.Share = L.Class.extend({
     }
     const iframeExporter = new U.IframeExporter(this.map)
     const buildIframeCode = () => {
-      iframe.innerHTML = iframeExporter.build()
+      iframe.textContent = iframeExporter.build()
       exportUrl.value = window.location.protocol + iframeExporter.buildUrl()
     }
     buildIframeCode()
@@ -156,7 +159,7 @@ U.Share = L.Class.extend({
 
   open: function () {
     if (!this.container) this.build()
-    this.map.ui.openPanel({ data: { html: this.container } })
+    this.map.panel.open({ content: this.container })
   },
 
   format: function (mode) {
@@ -213,7 +216,7 @@ U.IframeExporter = L.Evented.extend({
 
   initialize: function (map) {
     this.map = map
-    this.baseUrl = L.Util.getBaseUrl()
+    this.baseUrl = U.Utils.getBaseUrl()
     // Use map default, not generic default
     this.queryString.onLoadPanel = this.map.getOption('onLoadPanel')
   },
@@ -241,7 +244,7 @@ U.IframeExporter = L.Evented.extend({
     }
     const currentView = this.options.currentView ? window.location.hash : ''
     const queryString = L.extend({}, this.queryString, options)
-    return `${this.baseUrl}?${L.Util.buildQueryString(queryString)}${currentView}`
+    return `${this.baseUrl}?${U.Utils.buildQueryString(queryString)}${currentView}`
   },
 
   build: function () {

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

@@ -94,13 +94,12 @@ U.TableEditor = L.Class.extend({
 
   edit: function () {
     const id = 'tableeditor:edit'
-    this.datalayer.map.fire('dataloading', { id: id })
     this.compileProperties()
     this.renderHeaders()
     this.body.innerHTML = ''
     this.datalayer.eachLayer(this.renderRow, this)
     const addButton = L.DomUtil.create('li', 'add-property')
-    L.DomUtil.create('i', 'umap-icon-16 umap-add', addButton)
+    L.DomUtil.createIcon(addButton, 'icon-add')
     const label = L.DomUtil.create('span', '', addButton)
     label.textContent = label.title = L._('Add a new property')
     const addProperty = function () {
@@ -110,11 +109,10 @@ U.TableEditor = L.Class.extend({
       this.edit()
     }
     L.DomEvent.on(addButton, 'click', addProperty, this)
-    this.datalayer.map.ui.openPanel({
-      data: { html: this.table },
-      className: 'umap-table-editor fullwidth dark',
+    this.datalayer.map.fullPanel.open({
+      content: this.table,
+      className: 'umap-table-editor',
       actions: [addButton],
     })
-    this.datalayer.map.fire('dataload', { id: id })
   },
 })