Osmwithspace/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix: fix #2278

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-11-26 19:23:41 +01:00
parent afce4cb5ba
commit 540e2c227e
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Logic/Tags/And.ts
View file

@ -18,6 +18,10 @@ export class And extends TagsFilter {
console.error("Assertion failed: invalid subtags:", and) console.error("Assertion failed: invalid subtags:", and)
throw "Assertion failed: invalid subtags found" throw "Assertion failed: invalid subtags found"
} }
if (and.some((p) => p === undefined)) {
console.error("Assertion failed: invalid subtags:", and)
throw "Assertion failed: invalid subtags found (undefined)"
}
} }
public static construct(and: ReadonlyArray<TagsFilter>): TagsFilter public static construct(and: ReadonlyArray<TagsFilter>): TagsFilter

8
src/UI/Popup/DeleteFlow/DeleteWizard.svelte
View file

@ -61,9 +61,13 @@
const changedProperties = TagUtils.changeAsProperties(selectedTags.asChange(tags?.data ?? {})) const changedProperties = TagUtils.changeAsProperties(selectedTags.asChange(tags?.data ?? {}))
const deleteReason = changedProperties[DeleteConfig.deleteReasonKey] const deleteReason = changedProperties[DeleteConfig.deleteReasonKey]
if (deleteReason) { if (deleteReason) {
const softDeletionTags= new And([deleteConfig.softDeletionTags,
...layer.tagRenderings.flatMap(tr => tr.onSoftDelete ?? []) let softDeletionTags: UploadableTag
if(hasSoftDeletion){
softDeletionTags = new And([deleteConfig.softDeletionTags,
...layer.tagRenderings.flatMap(tr => tr.onSoftDelete ?? []),
]) ])
}
// This is a proper, hard deletion // This is a proper, hard deletion
actionToTake = new DeleteAction( actionToTake = new DeleteAction(