From 772233c8b56ec41fb5129edc5348377f79b364f9 Mon Sep 17 00:00:00 2001
From: novoLife <mahajana@foxmail.com>
Date: Tue, 3 Jun 2025 12:55:39 +0800
Subject: [PATCH] Fix fields of `historic=aircraft` (#1566)

---
 data/fields/aircraft/model.json          | 5 -----
 data/fields/aircraft/model/wikidata.json | 9 ---------
 data/fields/aircraft/type.json           | 2 +-
 data/fields/model/wikidata.json          | 9 +++++++++
 data/presets/historic/aircraft.json      | 4 ++--
 5 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 data/fields/aircraft/model.json
 delete mode 100644 data/fields/aircraft/model/wikidata.json
 create mode 100644 data/fields/model/wikidata.json

diff --git a/data/fields/aircraft/model.json b/data/fields/aircraft/model.json
deleted file mode 100644
index c21e77a9..00000000
--- a/data/fields/aircraft/model.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "aircraft:model",
-    "type": "combo",
-    "label": "Aircraft Model"
-}
diff --git a/data/fields/aircraft/model/wikidata.json b/data/fields/aircraft/model/wikidata.json
deleted file mode 100644
index c1f72760..00000000
--- a/data/fields/aircraft/model/wikidata.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "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
index ea2d5226..e5441ede 100644
--- a/data/fields/aircraft/type.json
+++ b/data/fields/aircraft/type.json
@@ -1,6 +1,6 @@
 {
     "key": "aircraft:type",
-    "type": "combo",
+    "type": "semiCombo",
     "label": "Type",
     "strings": {
         "options": {
diff --git a/data/fields/model/wikidata.json b/data/fields/model/wikidata.json
new file mode 100644
index 00000000..57d66503
--- /dev/null
+++ b/data/fields/model/wikidata.json
@@ -0,0 +1,9 @@
+{
+    "key": "model:wikidata",
+    "keys": [
+        "model:wikidata",
+        "model:wikipedia"
+    ],
+    "type": "wikidata",
+    "label": "Model Wikidata"
+}
diff --git a/data/presets/historic/aircraft.json b/data/presets/historic/aircraft.json
index 426e1732..237c38b8 100644
--- a/data/presets/historic/aircraft.json
+++ b/data/presets/historic/aircraft.json
@@ -4,11 +4,11 @@
         "name",
         "start_date",
         "aircraft/type",
-        "aircraft/model"
+        "model"
     ],
     "moreFields": [
         "ref",
-        "aircraft/model/wikidata",
+        "model/wikidata",
         "manufacturer",
         "manufacturer/wikidata",
         "description"