umap-project 2.7.2__py3-none-any.whl → 2.8.0__py3-none-any.whl

umap/static/umap/js/components/fragment.js

@@ -1,6 +1,8 @@
+import Umap from '../modules/umap.js'
+
 class UmapFragment extends HTMLElement {
   connectedCallback() {
-    new U.Map(this.firstElementChild.id, JSON.parse(this.dataset.settings))
+    new Umap(this.firstElementChild.id, JSON.parse(this.dataset.settings))
   }
 }
 

umap/static/umap/js/modules/browser.js

@@ -6,9 +6,10 @@ import { EXPORT_FORMATS } from './formatter.js'
 import ContextMenu from './ui/contextmenu.js'
 
 export default class Browser {
-  constructor(map) {
-    this.map = map
-    this.map.on('moveend', this.onMoveEnd, this)
+  constructor(umap, leafletMap) {
+    this._umap = umap
+    this._leafletMap = leafletMap
+    this._leafletMap.on('moveend', this.onMoveEnd, this)
     this.options = {
       filter: '',
       inBbox: false,
@@ -82,7 +83,7 @@ export default class Browser {
 
   updateDatalayer(datalayer) {
     // Compute once, but use it for each feature later.
-    this.bounds = this.map.getBounds()
+    this.bounds = this._leafletMap.getBounds()
     const parent = DomUtil.get(this.datalayerId(datalayer))
     // Panel is not open
     if (!parent) return
@@ -115,10 +116,10 @@ export default class Browser {
   }
 
   onFormChange() {
-    this.map.eachBrowsableDataLayer((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       datalayer.resetLayer(true)
       this.updateDatalayer(datalayer)
-      if (this.map.fullPanel?.isOpen()) datalayer.tableEdit()
+      if (this._umap.fullPanel?.isOpen()) datalayer.tableEdit()
     })
     this.toggleBadge()
   }
@@ -132,13 +133,13 @@ export default class Browser {
   }
 
   hasFilters() {
-    return !!this.options.filter || this.map.facets.isActive()
+    return !!this.options.filter || this._umap.facets.isActive()
   }
 
   onMoveEnd() {
     if (!this.isOpen()) return
     const isListDynamic = this.options.inBbox
-    this.map.eachBrowsableDataLayer((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       if (!isListDynamic && !datalayer.hasDynamicData()) return
       this.updateDatalayer(datalayer)
     })
@@ -147,7 +148,7 @@ export default class Browser {
   update() {
     if (!this.isOpen()) return
     this.dataContainer.innerHTML = ''
-    this.map.eachBrowsableDataLayer((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       this.addDataLayer(datalayer, this.dataContainer)
     })
   }
@@ -186,9 +187,9 @@ export default class Browser {
     DomEvent.on(builder.form, 'reset', () => {
       window.setTimeout(builder.syncAll.bind(builder))
     })
-    if (this.map.options.facetKey) {
-      fields = this.map.facets.build()
-      filtersBuilder = new L.FormBuilder(this.map.facets, fields, {
+    if (this._umap.properties.facetKey) {
+      fields = this._umap.facets.build()
+      filtersBuilder = new L.FormBuilder(this._umap.facets, fields, {
         callback: () => this.onFormChange(),
       })
       DomEvent.on(filtersBuilder.form, 'reset', () => {
@@ -206,7 +207,7 @@ export default class Browser {
       textContent: translate('Reset all'),
     })
 
-    this.map.panel.open({
+    this._umap.panel.open({
       content: container,
       className: 'umap-browser',
     })
@@ -230,7 +231,7 @@ export default class Browser {
     `)
     container.appendChild(toolbox)
     toggle.addEventListener('click', () => this.toggleLayers())
-    fitBounds.addEventListener('click', () => this.map.fitDataBounds())
+    fitBounds.addEventListener('click', () => this._umap.fitDataBounds())
     download.addEventListener('click', () => this.downloadVisible(download))
   }
 
@@ -240,7 +241,7 @@ export default class Browser {
     for (const format of Object.keys(EXPORT_FORMATS)) {
       items.push({
         label: format,
-        action: () => this.map.share.download(format),
+        action: () => this._umap.share.download(format),
       })
     }
     menu.openBelow(element, items)
@@ -250,10 +251,10 @@ export default class Browser {
     // If at least one layer is shown, hide it
     // otherwise show all
     let allHidden = true
-    this.map.eachBrowsableDataLayer((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       if (datalayer.isVisible()) allHidden = false
     })
-    this.map.eachBrowsableDataLayer((datalayer) => {
+    this._umap.eachBrowsableDataLayer((datalayer) => {
       if (allHidden) {
         datalayer.show()
       } else {
@@ -262,7 +263,7 @@ export default class Browser {
     })
   }
 
-  static backButton(map) {
+  static backButton(umap) {
     const button = DomUtil.createButtonIcon(
       DomUtil.create('li', '', undefined),
       'icon-back',
@@ -271,7 +272,7 @@ export default class Browser {
     // Fixme: remove me when this is merged and released
     // https://github.com/Leaflet/Leaflet/pull/9052
     DomEvent.disableClickPropagation(button)
-    DomEvent.on(button, 'click', map.openBrowser, map)
+    DomEvent.on(button, 'click', () => umap.openBrowser())
     return button
   }
 }

umap/static/umap/js/modules/caption.js

@@ -3,8 +3,9 @@ import { translate } from './i18n.js'
 import * as Utils from './utils.js'
 
 export default class Caption {
-  constructor(map) {
-    this.map = map
+  constructor(umap, leafletMap) {
+    this._umap = umap
+    this._leafletMap = leafletMap
   }
 
   isOpen() {
@@ -21,38 +22,36 @@ export default class Caption {
     const hgroup = DomUtil.element({ tagName: 'hgroup', parent: container })
     DomUtil.createTitle(
       hgroup,
-      this.map.getDisplayName(),
+      this._umap.getDisplayName(),
       'icon-caption icon-block',
       'map-name'
     )
-    this.map.addAuthorLink('h4', hgroup)
-    if (this.map.options.description) {
+    const title = Utils.loadTemplate('<h4></h4>')
+    hgroup.appendChild(title)
+    this._umap.addAuthorLink(title)
+    if (this._umap.properties.description) {
       const description = DomUtil.element({
         tagName: 'div',
         className: 'umap-map-description text',
-        safeHTML: Utils.toHTML(this.map.options.description),
+        safeHTML: Utils.toHTML(this._umap.properties.description),
         parent: container,
       })
     }
     const datalayerContainer = DomUtil.create('div', 'datalayer-container', container)
-    this.map.eachDataLayerReverse((datalayer) =>
+    this._umap.eachDataLayerReverse((datalayer) =>
       this.addDataLayer(datalayer, datalayerContainer)
     )
     const creditsContainer = DomUtil.create('div', 'credits-container', container)
     this.addCredits(creditsContainer)
-    this.map.panel.open({ content: container }).then(() => {
+    this._umap.panel.open({ content: container }).then(() => {
       // Create the legend when the panel is actually on the DOM
-      this.map.eachDataLayerReverse((datalayer) => datalayer.renderLegend())
+      this._umap.eachDataLayerReverse((datalayer) => datalayer.renderLegend())
     })
   }
 
   addDataLayer(datalayer, container) {
     if (!datalayer.options.inCaption) return
-    const p = DomUtil.create(
-      'p',
-      `caption-item ${datalayer.cssId}`,
-      container
-    )
+    const p = DomUtil.create('p', `caption-item ${datalayer.cssId}`, container)
     const legend = DomUtil.create('span', 'datalayer-legend', p)
     const headline = DomUtil.create('strong', '', p)
     if (datalayer.options.description) {
@@ -69,16 +68,16 @@ export default class Caption {
   addCredits(container) {
     const credits = DomUtil.createFieldset(container, translate('Credits'))
     let title = DomUtil.add('h5', '', credits, translate('User content credits'))
-    if (this.map.options.shortCredit || this.map.options.longCredit) {
+    if (this._umap.properties.shortCredit || this._umap.properties.longCredit) {
       DomUtil.element({
         tagName: 'p',
         parent: credits,
         safeHTML: Utils.toHTML(
-          this.map.options.longCredit || this.map.options.shortCredit
+          this._umap.properties.longCredit || this._umap.properties.shortCredit
         ),
       })
     }
-    if (this.map.options.licence) {
+    if (this._umap.properties.licence) {
       const licence = DomUtil.add(
         'p',
         '',
@@ -88,8 +87,8 @@ export default class Caption {
       DomUtil.createLink(
         '',
         licence,
-        this.map.options.licence.name,
-        this.map.options.licence.url
+        this._umap.properties.licence.name,
+        this._umap.properties.licence.url
       )
     } else {
       DomUtil.add('p', '', credits, translate('No licence has been set'))
@@ -100,19 +99,19 @@ export default class Caption {
     DomUtil.element({
       tagName: 'strong',
       parent: tilelayerCredit,
-      textContent: `${this.map.selected_tilelayer.options.name} `,
+      textContent: `${this._leafletMap.selectedTilelayer.options.name} `,
     })
     DomUtil.element({
       tagName: 'span',
       parent: tilelayerCredit,
-      safeHTML: this.map.selected_tilelayer.getAttribution(),
+      safeHTML: this._leafletMap.selectedTilelayer.getAttribution(),
     })
     const urls = {
       leaflet: 'http://leafletjs.com',
       django: 'https://www.djangoproject.com',
       umap: 'https://umap-project.org/',
       changelog: 'https://docs.umap-project.org/en/master/changelog/',
-      version: this.map.options.umap_version,
+      version: this._umap.properties.umap_version,
     }
     const creditHTML = translate(
       `