almet/umap
1
0
Fork 0
mirror of https://github.com/umap-project/umap.git synced 2025-04-29 11:52:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1933 from umap-project/fix-change-datalayer

Browse source 
fix: fix path disappearing when changing its datalayer
This commit is contained in:
Yohan Boniface 2024-06-24 08:32:32 +02:00 committed by GitHub
commit e4af031ca1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
umap/static/umap/js/umap.layer.js
View file

@ -913,10 +913,10 @@ U.DataLayer = L.Evented.extend({
removeLayer: function (feature) { removeLayer: function (feature) {
const id = L.stamp(feature) const id = L.stamp(feature)
this.layer.removeLayer(feature)
feature.disconnectFromDataLayer(this) feature.disconnectFromDataLayer(this)
this._index.splice(this._index.indexOf(id), 1) this._index.splice(this._index.indexOf(id), 1)
delete this._layers[id] delete this._layers[id]
this.layer.removeLayer(feature)
delete this.map.features_index[feature.getSlug()] delete this.map.features_index[feature.getSlug()]
if (this.hasDataLoaded()) this.fire('datachanged') if (this.hasDataLoaded()) this.fire('datachanged')
}, },

11
umap/tests/integration/test_edit_polygon.py
View file

@ -120,3 +120,14 @@ def test_should_reset_style_on_cancel(live_server, openmap, page, bootstrap):
page.once("dialog", lambda dialog: dialog.accept()) page.once("dialog", lambda dialog: dialog.accept())
page.get_by_role("button", name="Cancel edits").click() page.get_by_role("button", name="Cancel edits").click()
expect(page.locator(".leaflet-overlay-pane path[fill='DarkBlue']")).to_have_count(1) expect(page.locator(".leaflet-overlay-pane path[fill='DarkBlue']")).to_have_count(1)
def test_can_change_datalayer(live_server, openmap, page, bootstrap):
other = DataLayerFactory(
name="Layer 2", map=openmap, settings={"color": "GoldenRod"}
)
page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
expect(page.locator("path[fill='DarkBlue']")).to_have_count(1)
page.locator("path").click(modifiers=["Shift"])
page.get_by_role("combobox").select_option(other.name)
expect(page.locator("path[fill='GoldenRod']")).to_have_count(1)