Themes(memorial): add filter on type of memorial, remove obsolete 'memorial:type=stolperstein'

assets/layers/memorial/memorial.json

@@ -151,7 +151,6 @@
         },
         {
           "if": "memorial=stolperstein",
-          "alsoShowIf": "memorial:type=stolperstein",
           "then": {
             "en": "This is a stolperstein (stumbing stone)",
             "de": "Dies ist ein Stolperstein",
@@ -270,7 +269,9 @@
       },
       "freeform": {
         "key": "memorial"
-      }
+      },
+      "filter": true
+
     },
     {
       "id": "inscription",

src/Models/ThemeConfig/Conversion/PrepareLayer.ts

@@ -35,6 +35,7 @@ import { ExpandRewrite } from "./ExpandRewrite"
 import { TagUtils } from "../../../Logic/Tags/TagUtils"
 import { Tag } from "../../../Logic/Tags/Tag"
 import { RegexTag } from "../../../Logic/Tags/RegexTag"
+import { Or } from "../../../Logic/Tags/Or"
 
 class AddFiltersFromTagRenderings extends DesugaringStep<LayerConfigJson> {
     constructor() {
@@ -152,6 +153,9 @@ class ExpandFilter extends DesugaringStep<LayerConfigJson> {
             if(qtr.multiAnswer && osmTags instanceof Tag){
                 osmTags = new RegexTag(osmTags.key, new RegExp("^(.+;)?"+osmTags.value+"(;.+)$","is"))
             }
+            if(mapping.alsoShowIf){
+                osmTags= new Or([osmTags, TagUtils.Tag(mapping.alsoShowIf)])
+            }
 
             return <FilterConfigOptionJson>{
                 question: mapping.then,