From caebe1a9b444e14963def262711ce92c804d80f7 Mon Sep 17 00:00:00 2001
From: novoLife <mahajana@foxmail.com>
Date: Fri, 23 May 2025 20:56:45 +0800
Subject: [PATCH 1/2] Create "Teahouse" preset (#1555)

---
 data/presets/amenity/cafe/teahouse.json | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 data/presets/amenity/cafe/teahouse.json

diff --git a/data/presets/amenity/cafe/teahouse.json b/data/presets/amenity/cafe/teahouse.json
new file mode 100644
index 00000000..5eec4c69
--- /dev/null
+++ b/data/presets/amenity/cafe/teahouse.json
@@ -0,0 +1,30 @@
+{
+    "icon": "maki-cafe",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "cafe",
+        "cuisine": "tea"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "cafe"
+    },
+    "terms": [
+        "teahouse",
+        "tea house",
+        "tearoom",
+        "tea room",
+        "tea",
+        "tea drink",
+        "black tea",
+        "green tea",
+        "yellow tea",
+        "white tea",
+        "oolong tea",
+        "hot drinks"
+    ],
+    "name": "Teahouse"
+}

From 5b5472308737b73232f023846157d80a52e8d725 Mon Sep 17 00:00:00 2001
From: novoLife <mahajana@foxmail.com>
Date: Fri, 23 May 2025 20:58:09 +0800
Subject: [PATCH 2/2] Add `historic=aircraft` preset (#1556)

---
 data/fields/aircraft/model.json          |  5 +++++
 data/fields/aircraft/model/wikidata.json |  9 ++++++++
 data/fields/aircraft/type.json           | 16 ++++++++++++++
 data/fields/manufacturer/wikidata.json   |  9 ++++++++
 data/presets/historic/aircraft.json      | 27 ++++++++++++++++++++++++
 5 files changed, 66 insertions(+)
 create mode 100644 data/fields/aircraft/model.json
 create mode 100644 data/fields/aircraft/model/wikidata.json
 create mode 100644 data/fields/aircraft/type.json
 create mode 100644 data/fields/manufacturer/wikidata.json
 create mode 100644 data/presets/historic/aircraft.json

diff --git a/data/fields/aircraft/model.json b/data/fields/aircraft/model.json
new file mode 100644
index 00000000..c21e77a9
--- /dev/null
+++ b/data/fields/aircraft/model.json
@@ -0,0 +1,5 @@
+{
+    "key": "aircraft:model",
+    "type": "combo",
+    "label": "Aircraft Model"
+}
diff --git a/data/fields/aircraft/model/wikidata.json b/data/fields/aircraft/model/wikidata.json
new file mode 100644
index 00000000..c1f72760
--- /dev/null
+++ b/data/fields/aircraft/model/wikidata.json
@@ -0,0 +1,9 @@
+{
+    "key": "aircraft:model:wikidata",
+    "keys": [
+        "aircraft:model:wikidata",
+        "aircraft:model:wikipedia"
+    ],
+    "type": "wikidata",
+    "label": "Aircraft Model Wikidata"
+}
diff --git a/data/fields/aircraft/type.json b/data/fields/aircraft/type.json
new file mode 100644
index 00000000..ea2d5226
--- /dev/null
+++ b/data/fields/aircraft/type.json
@@ -0,0 +1,16 @@
+{
+    "key": "aircraft:type",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "military": "Military",
+            "helicopter": "Helicopter",
+            "airliner": "Airliner",
+            "jet": "Jet",
+            "fixed_wing": "Fixed Wing",
+            "cargo": "Cargo",
+            "glider": "Glider"
+        }
+    }
+}
diff --git a/data/fields/manufacturer/wikidata.json b/data/fields/manufacturer/wikidata.json
new file mode 100644
index 00000000..5c42886b
--- /dev/null
+++ b/data/fields/manufacturer/wikidata.json
@@ -0,0 +1,9 @@
+{
+    "key": "manufacturer:wikidata",
+    "keys": [
+        "manufacturer:wikidata",
+        "manufacturer:wikipedia"
+    ],
+    "type": "wikidata",
+    "label": "Manufacturer Wikidata"
+}
diff --git a/data/presets/historic/aircraft.json b/data/presets/historic/aircraft.json
new file mode 100644
index 00000000..426e1732
--- /dev/null
+++ b/data/presets/historic/aircraft.json
@@ -0,0 +1,27 @@
+{
+    "icon": "roentgen-plane",
+    "fields": [
+        "name",
+        "start_date",
+        "aircraft/type",
+        "aircraft/model"
+    ],
+    "moreFields": [
+        "ref",
+        "aircraft/model/wikidata",
+        "manufacturer",
+        "manufacturer/wikidata",
+        "description"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "historic": "aircraft"
+    },
+    "terms": [
+        "gate guardian"
+    ],
+    "name": "Historic Aircraft"
+}