Skip to content

fix: make sure DataLayer rank is always set #2682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2025
Merged

fix: make sure DataLayer rank is always set #2682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion umap/static/umap/js/modules/data/layer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,20 @@ export class DataLayer {
return `datalayer-${stamp(this)}`
}

get rank() {
// Make sure we always have a valid rank. Undefined rank may happen
// after importing an old umap backup, and not touching the layers
// after that.
if (this.options.rank === undefined) {
this.options.rank = this.getDOMOrder()
}
return this.options.rank
}

set rank(value) {
this.options.rank = value
}

getSyncMetadata() {
return {
subject: 'datalayer',
Expand Down Expand Up @@ -1132,7 +1146,7 @@ export class DataLayer {
const formData = new FormData()
formData.append('name', this.options.name)
formData.append('display_on_load', !!this.options.displayOnLoad)
formData.append('rank', this.options.rank)
formData.append('rank', this.rank)
formData.append('settings', this.prepareOptions())
// Filename support is shaky, don't do it for now.
const blob = new Blob([JSON.stringify(geojson)], { type: 'application/json' })
Expand Down
2 changes: 1 addition & 1 deletion umap/static/umap/js/modules/managers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export class DataLayerManager extends Object {
active() {
return Object.values(this)
.filter((datalayer) => !datalayer.isDeleted)
.sort((a, b) => a.options.rank > b.options.rank)
.sort((a, b) => a.rank > b.rank)
}
reverse() {
return this.active().reverse()
Expand Down
8 changes: 3 additions & 5 deletions umap/static/umap/js/modules/umap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,7 @@ export default class Umap {
const parent = this._leafletMap.getPane('overlayPane')
const datalayers = Object.values(this.datalayers)
.filter((datalayer) => !datalayer._isDeleted)
.sort(
(datalayer1, datalayer2) => datalayer1.options.rank > datalayer2.options.rank
)
.sort((datalayer1, datalayer2) => datalayer1.rank > datalayer2.rank)
for (const datalayer of datalayers) {
const child = parent.querySelector(`[data-id="${datalayer.id}"]`)
parent.appendChild(child)
Expand Down Expand Up @@ -1503,8 +1501,8 @@ export default class Umap {
this.datalayers.reverse().map((datalayer) => {
const rank = datalayer.getDOMOrder()
if (rank >= minIndex && rank <= maxIndex) {
const oldRank = datalayer.options.rank
datalayer.options.rank = rank
const oldRank = datalayer.rank
datalayer.rank = rank
datalayer.sync.update('options.rank', rank, oldRank)
}
})
Expand Down