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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-09-12 20:34:52 +02:00
commit b888a6da36
8 changed files with 1241 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Logic/Osm/Actions/DeleteAction.ts
View file

@ -6,6 +6,7 @@ import ChangeTagAction from "./ChangeTagAction"
import {TagsFilter} from "../../Tags/TagsFilter"
import {And} from "../../Tags/And"
import {Tag} from "../../Tags/Tag"
import {Utils} from "../../../Utils";
export default class DeleteAction extends OsmChangeAction {
private readonly _softDeletionTags: TagsFilter
@ -30,16 +31,16 @@ export default class DeleteAction extends OsmChangeAction {
this._id = id
this._hardDelete = hardDelete
this.meta = {...meta, changeType: "deletion"}
if (softDeletionTags.usedKeys().indexOf("fixme") >= 0) {
if (softDeletionTags?.usedKeys()?.indexOf("fixme") >= 0) {
this._softDeletionTags = softDeletionTags
} else {
this._softDeletionTags = new And([
this._softDeletionTags = new And(Utils.NoNull([
softDeletionTags,
new Tag(
"fixme",
`A mapcomplete user marked this feature to be deleted (${meta.specialMotivation})`
),
])
]))
}
}