From d64ec8f3ce218a69c665195991693691b6a543f5 Mon Sep 17 00:00:00 2001
From: archpdx <archpdx@pm.me>
Date: Fri, 23 Jun 2023 05:25:40 -0700
Subject: [PATCH] Add support for `building=house` + `house=*` (#921)

---
 data/fields/house.json                        |  5 ++++
 data/presets/building/house.json              |  4 +++
 data/presets/building/house/_detached.json    | 17 +++++++++++
 .../building/house/_semi-detached.json        | 17 +++++++++++
 data/presets/building/house/_terrace.json     | 17 +++++++++++
 data/presets/building/house/terraced.json     | 29 +++++++++++++++++++
 data/presets/building/terrace.json            | 11 ++++---
 interim/source_strings.yaml                   | 21 ++++++++++++--
 8 files changed, 115 insertions(+), 6 deletions(-)
 create mode 100644 data/fields/house.json
 create mode 100644 data/presets/building/house/_detached.json
 create mode 100644 data/presets/building/house/_semi-detached.json
 create mode 100644 data/presets/building/house/_terrace.json
 create mode 100644 data/presets/building/house/terraced.json

diff --git a/data/fields/house.json b/data/fields/house.json
new file mode 100644
index 00000000..4507d5e2
--- /dev/null
+++ b/data/fields/house.json
@@ -0,0 +1,5 @@
+{
+    "key": "house",
+    "type": "combo",
+    "label": "House Type"
+}
diff --git a/data/presets/building/house.json b/data/presets/building/house.json
index 1c4636ab..87c937de 100644
--- a/data/presets/building/house.json
+++ b/data/presets/building/house.json
@@ -3,6 +3,10 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "{building}",
+        "house"
+    ],
     "tags": {
         "building": "house"
     },
diff --git a/data/presets/building/house/_detached.json b/data/presets/building/house/_detached.json
new file mode 100644
index 00000000..b20361cb
--- /dev/null
+++ b/data/presets/building/house/_detached.json
@@ -0,0 +1,17 @@
+{
+    "icon": "maki-home",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "house",
+        "house": "detached"
+    },
+    "reference": {
+        "key": "house",
+        "value": "detached"
+    },
+    "matchScore": 0.5,
+    "name": "{building/detached}",
+    "searchable": false
+}
diff --git a/data/presets/building/house/_semi-detached.json b/data/presets/building/house/_semi-detached.json
new file mode 100644
index 00000000..57ada385
--- /dev/null
+++ b/data/presets/building/house/_semi-detached.json
@@ -0,0 +1,17 @@
+{
+    "icon": "maki-home",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "house",
+        "house": "semi-detached"
+    },
+    "reference": {
+        "key": "house",
+        "value": "semi-detached"
+    },
+    "matchScore": 0.5,
+    "name": "{building/semidetached_house}",
+    "searchable": false
+}
diff --git a/data/presets/building/house/_terrace.json b/data/presets/building/house/_terrace.json
new file mode 100644
index 00000000..753c8714
--- /dev/null
+++ b/data/presets/building/house/_terrace.json
@@ -0,0 +1,17 @@
+{
+    "icon": "temaki-row_houses",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "house",
+        "house": "terrace"
+    },
+    "reference": {
+        "key": "house",
+        "value": "terrace"
+    },
+    "matchScore": 0.5,
+    "name": "{building/terrace}",
+    "searchable": false
+}
diff --git a/data/presets/building/house/terraced.json b/data/presets/building/house/terraced.json
new file mode 100644
index 00000000..e99640b4
--- /dev/null
+++ b/data/presets/building/house/terraced.json
@@ -0,0 +1,29 @@
+{
+    "icon": "temaki-row_houses",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "house",
+        "house": "terraced"
+    },
+    "reference": {
+        "key": "house",
+        "value": "terraced"
+    },
+    "terms": [
+        "brownstone",
+        "dwelling",
+        "family",
+        "home",
+        "residence",
+        "row home",
+        "terrace",
+        "townhome"
+    ],
+    "matchScore": 0.5,
+    "name": "Townhouse",
+    "aliases": [
+        "Row House"
+    ]
+}
diff --git a/data/presets/building/terrace.json b/data/presets/building/terrace.json
index 0de9a9f7..fbd8b410 100644
--- a/data/presets/building/terrace.json
+++ b/data/presets/building/terrace.json
@@ -7,13 +7,16 @@
         "building": "terrace"
     },
     "terms": [
-        "home",
-        "terrace",
         "brownstone",
+        "dwelling",
         "family",
+        "home",
         "residence",
-        "dwelling"
+        "row home",
+        "row house",
+        "terrace",
+        "townhome"
     ],
     "matchScore": 0.5,
-    "name": "Row Houses"
+    "name": "Row of Townhouses"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 14e38861..7fe02b17 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -2652,6 +2652,9 @@ en:
       hot_water:
         # hot_water=*
         label: Hot Water
+      house:
+        # house=*
+        label: House
       iata:
         # iata=*
         label: IATA Airport Code
@@ -7591,6 +7594,20 @@ en:
         name: House
         # 'terms: home,family,residence,dwelling'
         terms: <translate with synonyms or related terms for 'House', separated by commas>
+      building/house/detached:
+        # building=house + house=detached | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Detached House
+      building/house/semi-detached:
+        # building=house + house=semi-detached | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Semi-Detached House
+      building/house/terrace:
+        # building=terrace | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Row Houses (Whole Building)
+      building/house/terraced:
+        # building=house + house=terraced | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Row House (Individual Unit)
+        # 'terms: home,terrace,brownstone,family,residence,dwelling'
+        terms: <translate with synonyms or related terms for 'Row House (Individual Unit)', separated by commas>
       building/houseboat:
         # building=houseboat | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Houseboat
@@ -7698,9 +7715,9 @@ en:
         terms: <translate with synonyms or related terms for 'Temple Building', separated by commas>
       building/terrace:
         # building=terrace | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Row Houses
+        name: Row Houses (Whole Building)
         # 'terms: home,terrace,brownstone,family,residence,dwelling'
-        terms: <translate with synonyms or related terms for 'Row Houses', separated by commas>
+        terms: <translate with synonyms or related terms for 'Row Houses (Whole Building)', separated by commas>
       building/train_station:
         # building=train_station | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Train Station Building