umap-project 2.0.4__py3-none-any.whl → 2.1.0__py3-none-any.whl

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

@@ -677,7 +677,7 @@ U.DataLayer = L.Evented.extend({
     this._loading = true
     const [geojson, response, error] = await this.map.server.get(this._dataUrl())
     if (!error) {
-      this._last_modified = response.headers.get('last-modified')
+      this._reference_version = response.headers.get('X-Datalayer-Version')
       // FIXME: for now this property is set dynamically from backend
       // And thus it's not in the geojson file in the server
       // So do not let all options to be reset
@@ -688,7 +688,7 @@ U.DataLayer = L.Evented.extend({
       }
       // In case of maps pre 1.0 still around
       if (geojson._storage) geojson._storage.editMode = this.options.editMode
-      this.fromUmapGeoJSON(geojson)
+      await this.fromUmapGeoJSON(geojson)
       this.backupOptions()
       this.fire('loaded')
       this._loading = false
@@ -703,10 +703,10 @@ U.DataLayer = L.Evented.extend({
     this.fire('datachanged')
   },
 
-  fromUmapGeoJSON: function (geojson) {
+  fromUmapGeoJSON: async function (geojson) {
     if (geojson._storage) geojson._umap_options = geojson._storage // Retrocompat
     if (geojson._umap_options) this.setOptions(geojson._umap_options)
-    if (this.isRemoteLayer()) this.fetchRemoteData()
+    if (this.isRemoteLayer()) await this.fetchRemoteData()
     else this.fromGeoJSON(geojson)
     this._loaded = true
   },
@@ -1459,7 +1459,7 @@ U.DataLayer = L.Evented.extend({
     if (!this.isVisible()) return
     const bounds = this.layer.getBounds()
     if (bounds.isValid()) {
-      const options = {maxZoom: this.getOption("zoomTo")}
+      const options = { maxZoom: this.getOption('zoomTo') }
       this.map.fitBounds(bounds, options)
     }
   },
@@ -1577,8 +1577,8 @@ U.DataLayer = L.Evented.extend({
       map_id: this.map.options.umap_id,
       pk: this.umap_id,
     })
-    const headers = this._last_modified
-      ? { 'If-Unmodified-Since': this._last_modified }
+    const headers = this._reference_version
+      ? { 'X-Datalayer-Reference': this._reference_version }
       : {}
     await this._trySave(saveUrl, headers, formData)
     this._geojson = geojson
@@ -1596,7 +1596,7 @@ U.DataLayer = L.Evented.extend({
             label: L._('Save anyway'),
             callback: async () => {
               // Save again,
-              // but do not pass If-Unmodified-Since this time
+              // but do not pass the reference version this time
               await this._trySave(url, {}, formData)
             },
           },
@@ -1619,7 +1619,7 @@ U.DataLayer = L.Evented.extend({
         this.fromGeoJSON(data.geojson)
         delete data.geojson
       }
-      this._last_modified = response.headers.get('last-modified')
+      this._reference_version = response.headers.get('X-Datalayer-Version')
       this.setUmapId(data.id)
       this.updateOptions(data)
       this.backupOptions()

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

@@ -59,6 +59,9 @@ U.Popup.Panel = U.Popup.extend({
     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
   },

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

@@ -215,7 +215,7 @@ U.IframeExporter = L.Evented.extend({
     this.map = map
     this.baseUrl = L.Util.getBaseUrl()
     // Use map default, not generic default
-    this.queryString.onLoadPanel = this.map.options.onLoadPanel
+    this.queryString.onLoadPanel = this.map.getOption('onLoadPanel')
   },
 
   getMap: function () {