umap-project 3.3.1__tar.gz → 3.3.2__tar.gz

{umap_project-3.3.1 → umap_project-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.3.1
+Version: 3.3.2
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>

umap_project-3.3.2/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "3.3.2"

{umap_project-3.3.1 → umap_project-3.3.2}/umap/static/umap/js/modules/data/layer.js

@@ -43,7 +43,6 @@ export class DataLayer {
     this._umap = umap
     this.sync = umap.syncEngine.proxy(this)
     this.features = new FeatureManager()
-    this._geojson = null
     this._propertiesIndex = []
 
     this._leafletMap = leafletMap
@@ -306,7 +305,6 @@ export class DataLayer {
   fromGeoJSON(geojson, sync = true) {
     if (!geojson) return []
     const features = this.addData(geojson, sync)
-    this._geojson = geojson
     this._needsFetch = false
     this.onDataLoaded()
     this.dataChanged()
@@ -331,12 +329,6 @@ export class DataLayer {
     }
   }
 
-  backupData() {
-    if (this._geojson) {
-      this._geojson_bk = Utils.CopyJSON(this._geojson)
-    }
-  }
-
   showAtZoom() {
     const from = Number.parseInt(this.properties.fromZoom, 10)
     const to = Number.parseInt(this.properties.toZoom, 10)
@@ -751,7 +743,7 @@ export class DataLayer {
     const properties = Utils.CopyJSON(this.properties)
     properties.name = translate('Clone of {name}', { name: this.properties.name })
     delete properties.id
-    const geojson = Utils.CopyJSON(this._geojson)
+    const geojson = Utils.CopyJSON(this.umapGeoJSON())
     const datalayer = this._umap.createDirtyDataLayer(properties)
     datalayer.fromGeoJSON(geojson)
     return datalayer
@@ -1331,7 +1323,6 @@ export class DataLayer {
       ? { 'X-Datalayer-Reference': this._referenceVersion }
       : {}
     const status = await this._trySave(saveURL, headers, formData)
-    this._geojson = geojson
     return status
   }
 
@@ -1371,7 +1362,6 @@ export class DataLayer {
 
       this.setReferenceVersion({ response, sync: true })
 
-      this.backupData()
       this.connectToMap()
       this.redraw() // Needed for reordering features
       return true

{umap_project-3.3.1 → umap_project-3.3.2}/umap/static/umap/js/modules/rendering/ui.js

@@ -29,6 +29,7 @@ const FeatureMixin = {
   },
 
   onRemove: function (map) {
+    this.removeInteractions()
     this.parentClass.prototype.onRemove.call(this, map)
     if (map._umap.editedFeature === this.feature) {
       this.feature.endEdit()
@@ -49,6 +50,13 @@ const FeatureMixin = {
     this.on('mouseover', this.onMouseOver)
   },
 
+  removeInteractions: function () {
+    this.off('contextmenu editable:vertex:contextmenu', this.onContextMenu)
+    this.off('click', this.onClick)
+    this.off('editable:edited', this.onCommit)
+    this.off('mouseover', this.onMouseOver)
+  },
+
   onMouseOver: function () {
     if (this._map._umap.editEnabled && !this._map._umap.editedFeature) {
       this._map._umap.tooltip.open({
@@ -112,17 +120,26 @@ const PointMixin = {
 
   addInteractions() {
     FeatureMixin.addInteractions.call(this)
-    this.on('dragend', (event) => {
-      this.feature.edit(event)
-      if (this._cluster) {
-        delete this._originalLatLng
-        this.feature.datalayer.dataChanged()
-      }
-    })
+    this.on('dragend', this._onDragEnd)
     if (!this.feature.isReadOnly()) this.on('mouseover', this._enableDragging)
     this.on('mouseout', this._onMouseOut)
   },
 
+  removeInteractions() {
+    FeatureMixin.removeInteractions.call(this)
+    this.off('dragend', this._onDragEnd)
+    if (!this.feature.isReadOnly()) this.off('mouseover', this._enableDragging)
+    this.off('mouseout', this._onMouseOut)
+  },
+
+  _onDragEnd(event) {
+    if (this._cluster) {
+      delete this._originalLatLng
+      this.feature.datalayer.dataChanged()
+    }
+    this.feature.edit(event)
+  },
+
   _onMouseOut: function () {
     if (this.dragging?._draggable && !this.dragging._draggable._moving) {
       // Do not disable if the mouse went out while dragging
@@ -180,6 +197,12 @@ export const LeafletMarker = Marker.extend({
     this.on('popupclose', this.resetHighlight)
   },
 
+  removeInteractions() {
+    PointMixin.removeInteractions.call(this)
+    this.off('popupopen', this.highlight)
+    this.off('popupclose', this.resetHighlight)
+  },
+
   onMoveEnd: function () {
     this._initIcon()
     this.update()
@@ -298,6 +321,13 @@ const PathMixin = {
     this.on('popupclose', this._redraw)
   },
 
+  removeInteractions: function () {
+    FeatureMixin.removeInteractions.call(this)
+    this.off('drag editable:drag', this._onDrag)
+    this.off('popupopen', this.highlightPath)
+    this.off('popupclose', this._redraw)
+  },
+
   bindTooltip: function (content, options) {
     options.sticky = !options.permanent
     this.parentClass.prototype.bindTooltip.call(this, content, options)
@@ -489,6 +519,12 @@ export const LeafletRoute = LeafletPolyline.extend({
     this.on('editable:vertex:dragend editable:vertex:deleted', this.onDrawingMoved)
   },
 
+  removeInteractions: function () {
+    PathMixin.removeInteractions.call(this)
+    this.off('editable:drawing:clicked', this.onDrawingClick)
+    this.off('editable:vertex:dragend editable:vertex:deleted', this.onDrawingMoved)
+  },
+
   getEditorClass: (tools) => {
     return RouteEditor
   },

{umap_project-3.3.1 → umap_project-3.3.2}/umap/tests/integration/test_edit_datalayer.py

@@ -69,6 +69,7 @@ def test_cancel_deleting_datalayer_should_restore(
 
 
 def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
+    assert DataLayer.objects.count() == 1
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
@@ -81,6 +82,9 @@ def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
     page.get_by_role("button", name="Clone").click()
     expect(layers).to_have_count(2)
     expect(markers).to_have_count(2)
+    with page.expect_response(re.compile(".*/datalayer/create/.*")):
+        page.get_by_role("button", name="Save").click()
+    assert DataLayer.objects.count() == 2
 
 
 def test_can_change_icon_class(live_server, openmap, page):

umap_project-3.3.1/umap/__init__.py

@@ -1 +0,0 @@
-VERSION = "3.3.1"