From a9d966d53eada73d60ae08880ce5c9e38c5e5797 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Tue, 16 May 2023 14:54:06 +0200 Subject: [PATCH] add "Yacht Berths" preset; allow switching between it and Marina by checkbox * the new preset is for the tag `seamark:harbour:category=marina_no_facilities` * keeps the tag upgrade of the `leisure=marina` preset to add `seamark:harbour:category=marina` (under the assumption that what mappers usually associate with leisure=marina does more commonly have "extra facilities" than not) * adds a checkbox-field to de/select "domestic facilities", allowing to easily switching between Marina and Yacht Berths presets. closes #899 --- .../seamark/harbour/category_marina.json | 11 +++++ data/presets/leisure/marina.json | 1 + .../presets/leisure/marina_no_facilities.json | 41 +++++++++++++++++++ interim/source_strings.yaml | 14 +++++++ 4 files changed, 67 insertions(+) create mode 100644 data/fields/seamark/harbour/category_marina.json create mode 100644 data/presets/leisure/marina_no_facilities.json diff --git a/data/fields/seamark/harbour/category_marina.json b/data/fields/seamark/harbour/category_marina.json new file mode 100644 index 00000000..91ea20bf --- /dev/null +++ b/data/fields/seamark/harbour/category_marina.json @@ -0,0 +1,11 @@ +{ + "key": "seamark:harbour:category", + "type": "check", + "label": "Domestic Facilities", + "strings": { + "options": { + "marina": "Yes", + "marina_no_facilities": "No" + } + } +} diff --git a/data/presets/leisure/marina.json b/data/presets/leisure/marina.json index 8e8e52f2..78902127 100644 --- a/data/presets/leisure/marina.json +++ b/data/presets/leisure/marina.json @@ -15,6 +15,7 @@ "{@templates/contact}", "address", "gnis/feature_id-US", + "seamark/harbour/category_marina", "seamark/type", "vhf" ], diff --git a/data/presets/leisure/marina_no_facilities.json b/data/presets/leisure/marina_no_facilities.json new file mode 100644 index 00000000..70f7d94a --- /dev/null +++ b/data/presets/leisure/marina_no_facilities.json @@ -0,0 +1,41 @@ +{ + "icon": "temaki-sailboat", + "fields": [ + "name", + "operator", + "capacity", + "fee", + "payment_multi_fee", + "charge_fee" + ], + "moreFields": [ + "{@templates/contact}", + "address", + "gnis/feature_id-US", + "seamark/harbour/category_marina", + "seamark/type" + ], + "geometry": [ + "area", + "point", + "vertex" + ], + "terms": [ + "boats", + "docks", + "harbor", + "harbour", + "marina", + "moorings", + "yachts" + ], + "tags": { + "seamark:harbour:category": "marina_no_facilities" + }, + "addTags": { + "leisure": "marina", + "seamark:type": "harbour", + "seamark:harbour:category": "marina_no_facilities" + }, + "name": "Yacht Berths" +} diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 106fea79..eecb5d57 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -4336,6 +4336,15 @@ en: iala-b: IALA B # seamark:buoy_lateral:system=other other: Other + seamark/harbour/category_marina: + # seamark:harbour:category=* + label: Domestic Facilities + options: + # seamark:harbour:category=marina + marina: 'Yes' + # seamark:harbour:category=marina_no_facilities + marina_no_facilities: 'No' + terms: '[translate with synonyms or related terms for ''Domestic Facilities'', separated by commas]' seamark/mooring/category: # seamark:mooring:category=* label: Category @@ -9302,6 +9311,11 @@ en: name: Marina # 'terms: boats,docks,harbor,harbour,moorings,yachts' terms: + leisure/marina_no_facilities: + # seamark:harbour:category=marina_no_facilities | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + name: Yacht Berths + # 'terms: boats,docks,harbor,harbour,marina,moorings,yachts' + terms: leisure/miniature_golf: # leisure=miniature_golf | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Miniature Golf