From e0b2a67fae2a45fc50fff91df6812f96cec46d74 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Sun, 11 Sep 2022 00:55:15 +0200
Subject: [PATCH 1/4] Add images and delete option to barriers

---
 assets/layers/barrier/barrier.json | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index 3034f5fc7..7f4c6664c 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -132,6 +132,7 @@
     }
   ],
   "tagRenderings": [
+    "images",
     {
       "question": {
         "en": "Can a bicycle go past this barrier?",
@@ -507,5 +508,21 @@
     {
       "width": "5"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "deletion": {
+    "softDeletionTags": {
+      "and": [
+      "barrier=",
+        "bicycle=",
+        "bollard=",
+        "cycle_barrier=",
+        "maxwidth:physical=",
+        "width:separation=",
+        "width:opening=",
+        "overlap="
+        
+      ]
+    }
+    
+  }
+}

From 4e346c282081db2ba60378eaa39cb13b5bb78df6 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Sun, 11 Sep 2022 01:05:53 +0200
Subject: [PATCH 2/4] More vehicle type restrictions to remove

---
 assets/layers/barrier/barrier.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index 7f4c6664c..58c771443 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -514,6 +514,13 @@
       "and": [
       "barrier=",
         "bicycle=",
+        "foot=",
+        "motor_vehicle=",
+        "vehicle=",
+        "inline_skate=",
+        "moped=",
+        "moped_a=",
+        "moped_b=",
         "bollard=",
         "cycle_barrier=",
         "maxwidth:physical=",

From 6c3f9bae2571378eae273fa7392ea418d486557d Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Sun, 11 Sep 2022 01:25:56 +0200
Subject: [PATCH 3/4] Make fixme optional if stated in the softDeletionTags

---
 Logic/Osm/Actions/DeleteAction.ts  | 32 +++++++++++++++++-------------
 assets/layers/barrier/barrier.json |  6 ++++--
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/Logic/Osm/Actions/DeleteAction.ts b/Logic/Osm/Actions/DeleteAction.ts
index 70fa949dd..def0ca5bb 100644
--- a/Logic/Osm/Actions/DeleteAction.ts
+++ b/Logic/Osm/Actions/DeleteAction.ts
@@ -1,11 +1,11 @@
-import { OsmObject } from "../OsmObject"
+import {OsmObject} from "../OsmObject"
 import OsmChangeAction from "./OsmChangeAction"
-import { Changes } from "../Changes"
-import { ChangeDescription } from "./ChangeDescription"
+import {Changes} from "../Changes"
+import {ChangeDescription} from "./ChangeDescription"
 import ChangeTagAction from "./ChangeTagAction"
-import { TagsFilter } from "../../Tags/TagsFilter"
-import { And } from "../../Tags/And"
-import { Tag } from "../../Tags/Tag"
+import {TagsFilter} from "../../Tags/TagsFilter"
+import {And} from "../../Tags/And"
+import {Tag} from "../../Tags/Tag"
 
 export default class DeleteAction extends OsmChangeAction {
     private readonly _softDeletionTags: TagsFilter
@@ -29,14 +29,18 @@ export default class DeleteAction extends OsmChangeAction {
         super(id, true)
         this._id = id
         this._hardDelete = hardDelete
-        this.meta = { ...meta, changeType: "deletion" }
-        this._softDeletionTags = new And([
-            softDeletionTags,
-            new Tag(
-                "fixme",
-                `A mapcomplete user marked this feature to be deleted (${meta.specialMotivation})`
-            ),
-        ])
+        this.meta = {...meta, changeType: "deletion"}
+        if (softDeletionTags.usedKeys().indexOf("fixme") >= 0) {
+            this._softDeletionTags = softDeletionTags
+        } else {
+            this._softDeletionTags = new And([
+                softDeletionTags,
+                new Tag(
+                    "fixme",
+                    `A mapcomplete user marked this feature to be deleted (${meta.specialMotivation})`
+                ),
+            ])
+        }
     }
 
     public async CreateChangeDescriptions(changes: Changes): Promise<ChangeDescription[]> {
diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index 58c771443..157b4e113 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -518,6 +518,8 @@
         "motor_vehicle=",
         "vehicle=",
         "inline_skate=",
+        "inline_skates=",
+        "mofa=",
         "moped=",
         "moped_a=",
         "moped_b=",
@@ -526,8 +528,8 @@
         "maxwidth:physical=",
         "width:separation=",
         "width:opening=",
-        "overlap="
-        
+        "overlap=",
+        "fixme="
       ]
     }
     

From b1a07cd84139825acde4b76f18796919194f5211 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 12 Sep 2022 19:17:41 +0200
Subject: [PATCH 4/4] Add delete option for doctors

---
 assets/layers/doctors/doctors.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json
index 8e45b9852..5f5f47b06 100644
--- a/assets/layers/doctors/doctors.json
+++ b/assets/layers/doctors/doctors.json
@@ -188,5 +188,6 @@
         "centroid"
       ]
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "deletion":true
+}