almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-28 19:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: use editable-edited event to sync changes (#2478)
Some checks are pending
Test & Docs / tests (postgresql, 3.10) (push) Waiting to run
Details
Test & Docs / tests (postgresql, 3.12) (push) Waiting to run
Details
Test & Docs / lint (push) Waiting to run
Details
Test & Docs / docs (push) Waiting to run
Details

Browse source 
This is more unified between markers and paths, and it allows paths to
be synced as soon as they have been drawn (instead of when closing the
edit panel, which created a race condition when changing its properties
that were then synced to other while the feature itself was not).
This commit is contained in:
Yohan Boniface 2025-02-07 09:12:45 +01:00 committed by GitHub
commit c5ee9fc283
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
umap/static/umap/js/modules/rendering/ui.js
View file

@ -47,6 +47,7 @@ const FeatureMixin = {
addInteractions: function () { addInteractions: function () {
this.on('contextmenu editable:vertex:contextmenu', this.onContextMenu) this.on('contextmenu editable:vertex:contextmenu', this.onContextMenu)
this.on('click', this.onClick) this.on('click', this.onClick)
this.on('editable:edited', this.onCommit)
}, },
onClick: function (event) { onClick: function (event) {
@ -120,7 +121,6 @@ const PointMixin = {
this.feature.edit(event) this.feature.edit(event)
this.feature.pullGeometry() this.feature.pullGeometry()
}) })
this.on('editable:drawing:commit', this.onCommit)
if (!this.feature.isReadOnly()) this.on('mouseover', this._enableDragging) if (!this.feature.isReadOnly()) this.on('mouseover', this._enableDragging)
this.on('mouseout', this._onMouseOut) this.on('mouseout', this._onMouseOut)
}, },
@ -287,7 +287,6 @@ const PathMixin = {
addInteractions: function () { addInteractions: function () {
FeatureMixin.addInteractions.call(this) FeatureMixin.addInteractions.call(this)
this.on('editable:disable', this.onCommit)
this.on('mouseover', this._onMouseOver) this.on('mouseover', this._onMouseOver)
this.on('drag editable:drag', this._onDrag) this.on('drag editable:drag', this._onDrag)
this.on('popupopen', this.highlightPath) this.on('popupopen', this.highlightPath)

6
umap/tests/integration/test_websocket_sync.py
View file

@ -122,11 +122,11 @@ def test_websocket_connection_can_sync_polygons(context, asgi_live_server, tilel
map.click(position={"x": 100, "y": 100}) map.click(position={"x": 100, "y": 100})
map.click(position={"x": 100, "y": 100}) map.click(position={"x": 100, "y": 100})
# It is created on peerA, but not yet synced # It is created on peerA, and should be on peerB
expect(a_polygons).to_have_count(1) expect(a_polygons).to_have_count(1)
expect(b_polygons).to_have_count(0) expect(b_polygons).to_have_count(1)
# Escaping the edition syncs # Escaping the edition should not duplicate
peerA.keyboard.press("Escape") peerA.keyboard.press("Escape")
expect(a_polygons).to_have_count(1) expect(a_polygons).to_have_count(1)
expect(b_polygons).to_have_count(1) expect(b_polygons).to_have_count(1)