umap-project 3.3.1__py3-none-any.whl → 3.3.2__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "3.3.1"
+VERSION = "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/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/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.dist-info → umap_project-3.3.2.dist-info}/METADATA

@@ -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.1.dist-info → umap_project-3.3.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=P-LYADqNpYK0atH4JUdWBBlQqMSI8J0AD5JUh0pP-UY,18
+umap/__init__.py,sha256=XR5V70-CcKGe7acoBLPVZiecGOP_E2HYEw-TWEmuZ0Q,18
 umap/admin.py,sha256=YlK4CgEWb2eFYRKiklsKouxeiQ8z_b-H2Fv2XCaiGFQ,3014
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/asgi.py,sha256=sJkGqDLgMoPkq2nMRyRE_Hz3ZLJm1X5lgXiQJu6rYt0,660
@@ -264,7 +264,7 @@ umap/static/umap/js/modules/umap.js,sha256=_9A2AjVY4vkeprghMtEmL0J6XmOnMUyeGjU14
 umap/static/umap/js/modules/urls.js,sha256=76cFqycj2O8huuoYYBvxnVt2Fc2UDbgrRsiv6lQmcSY,890
 umap/static/umap/js/modules/utils.js,sha256=rT_RILODFUWAvvgjFpT5TtNbu8A9jzn0mlkpHEB8QqM,16044
 umap/static/umap/js/modules/data/features.js,sha256=FAOZjITU5U9dpezWLF9EMF-pFGtvGva0sckvzwlcT58,38266
-umap/static/umap/js/modules/data/layer.js,sha256=Z1eSIFIvNrTC5RDSryB6ycprj2W4c_GuLEYv8vRmEws,43873
+umap/static/umap/js/modules/data/layer.js,sha256=popFJ6SNeIYQm6h2-poSGIxrMZUbHCkzSeNP1x0GPXg,43665
 umap/static/umap/js/modules/form/builder.js,sha256=akRoO8VpKXqWr3LO4Y_B1zr9gXJL2S5RCJqRDREweq8,6452
 umap/static/umap/js/modules/form/fields.js,sha256=yUEUPDHF3tgnpDv7UdfMXHsabCMaGsUDXQq2-Qe1krg,36152
 umap/static/umap/js/modules/importers/banfr.js,sha256=TBwL3GQJdzYtaDtxeHxyPQ7Ycy5zTaQyvzXa55X7n2I,2932
@@ -280,7 +280,7 @@ umap/static/umap/js/modules/rendering/icon.js,sha256=c4kTghfdjku03Ey825LIp9sZ9MS
 umap/static/umap/js/modules/rendering/map.js,sha256=zdBF7153X_vE-k0pZhcsNJKIc3nvLT3K0g_VHPfaMDE,12796
 umap/static/umap/js/modules/rendering/popup.js,sha256=OtQYpjhWCoW20XBFeeSKCXMqN-szohaX1TKWhPc9eBo,2577
 umap/static/umap/js/modules/rendering/template.js,sha256=n74YzbZOS_4CeK3-Jn7NXbkzqsh4zjCbEX9w15QxKu0,11468
-umap/static/umap/js/modules/rendering/ui.js,sha256=d4CkbXjTcLxKm7eg45t5qZvKWxwFO48ehapzlhUFw3c,16403
+umap/static/umap/js/modules/rendering/ui.js,sha256=GzU3OW2fL5A4IgDk2mPEQ68ZWFUMqUwKJm1zqviSjnA,17559
 umap/static/umap/js/modules/rendering/layers/base.js,sha256=G9H41vTrh-6Yn5H9UhKj5BOx03Xp2jcevpZINTDCtHI,2528
 umap/static/umap/js/modules/rendering/layers/classified.js,sha256=CLktnkjf5_6CzkKVyZcx5wAKvhsRp4pRpCIBauwKeO0,15068
 umap/static/umap/js/modules/rendering/layers/cluster.js,sha256=y0wO6K3CMFxXLA4xub0wTJi5gQ3e9O7ZNf2pfVfx-cE,7789
@@ -570,7 +570,7 @@ umap/tests/integration/test_datalayer.py,sha256=CNxT97ZVB-pPjgXh77i3n3hJKgi4Sm0r
 umap/tests/integration/test_draw_polygon.py,sha256=WNKXcxMqlTmwI0Yro_PbdpTi-M4gZNeIVa-fSXpS6rE,25298
 umap/tests/integration/test_draw_polyline.py,sha256=RgivhjEzjHVE6niPG5uAxJjtmEVD11ftuU4Tb47bXh8,14717
 umap/tests/integration/test_draw_route.py,sha256=hxa_uVqHLLEbbSsEIMsPsq5fMCNoKWY7cRCpMwqudmM,7276
-umap/tests/integration/test_edit_datalayer.py,sha256=Ayp4GbCbGTrNaKXBqKLKBApSm4QdMIT8QMC7zgk0LNw,10015
+umap/tests/integration/test_edit_datalayer.py,sha256=l5DwzpWXsy80HxMKrF7z7HZPZi1RtFluONpjDrUBqb8,10224
 umap/tests/integration/test_edit_map.py,sha256=0TXwrjgSKok7nxa-wy7WjVb8-lG0-zfS8s-f9klmqOQ,8784
 umap/tests/integration/test_edit_marker.py,sha256=hnKsitnSYJdMEPPRGrfODsCxJx3KfFGbD__wfVjiFns,5271
 umap/tests/integration/test_edit_polygon.py,sha256=l2CxnTnblRYUiiBV3ERwPkZ-VQTEWzFSFWhAzTF9BgA,5252
@@ -602,8 +602,8 @@ umap/tests/integration/test_view_marker.py,sha256=NFCwNez__E_WsE1DuW5RuB0HVKDP4C
 umap/tests/integration/test_view_polygon.py,sha256=NMJC6Nt9VpQ8FIU9Pqq2OspHv49xsWlsoXCr8iBa0VA,2060
 umap/tests/integration/test_view_polyline.py,sha256=aJoXKmLhJaN0yhPdDCVskZNGx3q3mLDkjVPhZ30cadA,13959
 umap/tests/integration/test_websocket_sync.py,sha256=n3Nd9cDdYMfJjMIkGUidqeceAW2loM8nx17Bh57m0fo,28341
-umap_project-3.3.1.dist-info/METADATA,sha256=40YRcftApH08jDGwcfbfBunpp4xfqDPQwnIYB5hlC4w,5747
-umap_project-3.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-umap_project-3.3.1.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-3.3.1.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-3.3.1.dist-info/RECORD,,
+umap_project-3.3.2.dist-info/METADATA,sha256=tKowCtiioD6jD3ihntyJxYw8nnHvxdSIXPMe_qZDrn8,5747
+umap_project-3.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+umap_project-3.3.2.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-3.3.2.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-3.3.2.dist-info/RECORD,,