From 4721b908677f257ccfe6701958d720e3c90d9e29 Mon Sep 17 00:00:00 2001
From: Tobias <tobias@fixmycity.de>
Date: Sun, 23 Jul 2023 17:31:48 +0200
Subject: [PATCH] Preset/stolperstein: Update address fields

- remove "addr:" field since small usage and discouraged
- add addr_string which is the thing used most often
- update addr_addr to only show if at least "memorial:addr:street" is present
---
 data/fields/memorial/{addr.json => addr_addr.json}  | 7 +++++--
 data/fields/memorial/addr_string.json               | 5 +++++
 data/presets/historic/memorial/stolperstein-EU.json | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)
 rename data/fields/memorial/{addr.json => addr_addr.json} (56%)
 create mode 100644 data/fields/memorial/addr_string.json

diff --git a/data/fields/memorial/addr.json b/data/fields/memorial/addr_addr.json
similarity index 56%
rename from data/fields/memorial/addr.json
rename to data/fields/memorial/addr_addr.json
index 3aea8592..238c70c2 100644
--- a/data/fields/memorial/addr.json
+++ b/data/fields/memorial/addr_addr.json
@@ -1,11 +1,14 @@
 {
     "type": "address",
-    "key": "addr",
+    "key": "memorial:addr",
     "keys": [
         "memorial:addr:city",
         "memorial:addr:street",
         "memorial:addr:postcode",
         "memorial:addr:housenumber"
     ],
-    "label": "Nearest building address"
+    "label": "Nearest Building Address",
+    "prerequisiteTag": {
+        "key": "memorial:addr:street"
+    }
 }
diff --git a/data/fields/memorial/addr_string.json b/data/fields/memorial/addr_string.json
new file mode 100644
index 00000000..2b432cee
--- /dev/null
+++ b/data/fields/memorial/addr_string.json
@@ -0,0 +1,5 @@
+{
+    "type": "text",
+    "key": "memorial:addr",
+    "label": "Nearest Building Address"
+}
diff --git a/data/presets/historic/memorial/stolperstein-EU.json b/data/presets/historic/memorial/stolperstein-EU.json
index fbdbe58f..6b883c05 100644
--- a/data/presets/historic/memorial/stolperstein-EU.json
+++ b/data/presets/historic/memorial/stolperstein-EU.json
@@ -6,8 +6,8 @@
         "wikidata"
     ],
     "moreFields": [
-        "memorial/addr",
-        "address",
+        "memorial/addr_string",
+        "memorial/addr_addr",
         "subject/wikidata",
         "image",
         "wikimedia_commons",