From 0b295db7df8009d93abaa47494bfb2de5830034b Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Tue, 15 Jan 2019 14:39:36 -0500
Subject: [PATCH] Converted buoy presets to use field inheritance

---
 data/presets/presets.json                            | 4 ++--
 data/presets/presets/seamark/buoy_lateral/green.json | 9 ---------
 data/presets/presets/seamark/buoy_lateral/red.json   | 9 ---------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index dc85169e3..2c65c1bf5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -832,8 +832,8 @@
     "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
     "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"},
     "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"},
-    "seamark/buoy_lateral/green": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"},
-    "seamark/buoy_lateral/red": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"},
+    "seamark/buoy_lateral/green": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"},
+    "seamark/buoy_lateral/red": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"},
     "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"},
     "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "brand"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
     "shop/fishmonger": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false},
diff --git a/data/presets/presets/seamark/buoy_lateral/green.json b/data/presets/presets/seamark/buoy_lateral/green.json
index 03f936b01..362b83714 100644
--- a/data/presets/presets/seamark/buoy_lateral/green.json
+++ b/data/presets/presets/seamark/buoy_lateral/green.json
@@ -1,13 +1,4 @@
 {
-    "fields": [
-        "ref",
-        "operator",
-        "seamark/buoy_lateral/colour",
-        "seamark/buoy_lateral/category",
-        "seamark/buoy_lateral/shape",
-        "seamark/buoy_lateral/system",
-        "seamark/type"
-    ],
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/seamark/buoy_lateral/red.json b/data/presets/presets/seamark/buoy_lateral/red.json
index 3892950cf..851cf7e85 100644
--- a/data/presets/presets/seamark/buoy_lateral/red.json
+++ b/data/presets/presets/seamark/buoy_lateral/red.json
@@ -1,13 +1,4 @@
 {
-    "fields": [
-        "ref",
-        "operator",
-        "seamark/buoy_lateral/colour",
-        "seamark/buoy_lateral/category",
-        "seamark/buoy_lateral/shape",
-        "seamark/buoy_lateral/system",
-        "seamark/type"
-    ],
     "geometry": [
         "point",
         "vertex"