From 188a1a1d9f6d149aee05fa4ff2ce28ecce5ed4eb Mon Sep 17 00:00:00 2001
From: Cedric <cedric@busacker.dev>
Date: Sun, 14 Sep 2025 17:23:22 +0200
Subject: [PATCH 1/2] Add `groundwater` option to `water_source` field (#1561)

---
 data/fields/water_source.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/fields/water_source.json b/data/fields/water_source.json
index cea55812..b0da623c 100644
--- a/data/fields/water_source.json
+++ b/data/fields/water_source.json
@@ -8,7 +8,8 @@
             "water_tank": "Water Tank",
             "pond": "Pond",
             "river": "River",
-            "stream": "Stream"
+            "stream": "Stream",
+            "groundwater": "Groundwater"
         }
     }
 }

From 4402ffa9b2a97d26c83f2b4e4531d4e4ae4be0b8 Mon Sep 17 00:00:00 2001
From: Dimitar <19364673+Dimitar5555@users.noreply.github.com>
Date: Sun, 14 Sep 2025 18:58:31 +0300
Subject: [PATCH 2/2] Add option strings for `house=*` field and disable
 Taginfo suggestions (#1412)

---
 data/fields/house.json                        | 35 ++++++++++++++++++-
 data/presets/building/house.json              |  4 +--
 data/presets/building/house/_detached.json    |  4 +++
 .../building/house/_semi-detached.json        |  4 +++
 data/presets/building/house/_terrace.json     |  4 +++
 data/presets/building/house/terraced.json     |  4 +++
 6 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/data/fields/house.json b/data/fields/house.json
index 4507d5e2..e7fc4f6b 100644
--- a/data/fields/house.json
+++ b/data/fields/house.json
@@ -1,5 +1,38 @@
 {
     "key": "house",
     "type": "combo",
-    "label": "House Type"
+    "label": "House Type",
+    "strings": {
+        "options": {
+            "bungalow": {
+                "title": "Bungalow",
+                "description": "A small house with a single storey"
+            },
+            "detached": {
+                "title": "Detached House",
+                "description": "A house that is not connected to any other houses"
+            },
+            "link-detached": {
+                "title": "Link-Detached House",
+                "description": "A house that is connected to another house by a garage or other non-living area"
+            },
+            "maisonette": {
+                "title": "Maisonette",
+                "description": "A residential dwelling, split over two floors with private external entrances rather than a communal entrance"
+            },
+            "semi-detached": {
+                "title": "Semi-Detached House",
+                "description": "A house that is attached to another house on one side"
+            },
+            "terrace": {
+                "title": "Row of Townhouses",
+                "description": "A row of houses that are attached to each other in a line (mapping each house as a separate area is preferred)"
+            },
+            "terraced": {
+                "title": "Single Townhouse",
+                "description": "Individual house in a row of townhouses"
+            }
+        }
+    },
+    "autoSuggestions": false
 }
diff --git a/data/presets/building/house.json b/data/presets/building/house.json
index 87c937de..d2a05461 100644
--- a/data/presets/building/house.json
+++ b/data/presets/building/house.json
@@ -4,8 +4,8 @@
         "area"
     ],
     "fields": [
-        "{building}",
-        "house"
+        "house",
+        "{building}"
     ],
     "tags": {
         "building": "house"
diff --git a/data/presets/building/house/_detached.json b/data/presets/building/house/_detached.json
index b20361cb..9f751ef9 100644
--- a/data/presets/building/house/_detached.json
+++ b/data/presets/building/house/_detached.json
@@ -3,6 +3,10 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "house",
+        "{building}"
+    ],
     "tags": {
         "building": "house",
         "house": "detached"
diff --git a/data/presets/building/house/_semi-detached.json b/data/presets/building/house/_semi-detached.json
index 57ada385..4bd07c02 100644
--- a/data/presets/building/house/_semi-detached.json
+++ b/data/presets/building/house/_semi-detached.json
@@ -3,6 +3,10 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "house",
+        "{building}"
+    ],
     "tags": {
         "building": "house",
         "house": "semi-detached"
diff --git a/data/presets/building/house/_terrace.json b/data/presets/building/house/_terrace.json
index 753c8714..53fb7947 100644
--- a/data/presets/building/house/_terrace.json
+++ b/data/presets/building/house/_terrace.json
@@ -3,6 +3,10 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "house",
+        "{building}"
+    ],
     "tags": {
         "building": "house",
         "house": "terrace"
diff --git a/data/presets/building/house/terraced.json b/data/presets/building/house/terraced.json
index e99640b4..6627f68e 100644
--- a/data/presets/building/house/terraced.json
+++ b/data/presets/building/house/terraced.json
@@ -3,6 +3,10 @@
     "geometry": [
         "area"
     ],
+    "fields": [
+        "house",
+        "{building}"
+    ],
     "tags": {
         "building": "house",
         "house": "terraced"