From 8cd2d7097cfd3406545d2e7fb1c8363768dba1d8 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 31 Oct 2016 17:08:01 -0400 Subject: [PATCH] Add preset for `camp_site=camp_pitch` for individual pitches --- data/presets.yaml | 5 +++++ data/presets/presets.json | 18 ++++++++++++++++++ data/presets/presets/camp_site/camp_pitch.json | 18 ++++++++++++++++++ data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ modules/svg/labels.js | 2 ++ 6 files changed, 51 insertions(+) create mode 100644 data/presets/presets/camp_site/camp_pitch.json diff --git a/data/presets.yaml b/data/presets.yaml index 039536857..71555710e 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1935,6 +1935,11 @@ en: # building=warehouse name: Warehouse terms: '' + camp_site/camp_pitch: + # camp_site=camp_pitch + name: Camp Pitch + # 'terms: tent,rv' + terms: '' craft: # craft=* name: Craft diff --git a/data/presets/presets.json b/data/presets/presets.json index da8f3972b..ed06bbefb 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -3302,6 +3302,24 @@ "matchScore": 0.5, "name": "Warehouse" }, + "camp_site/camp_pitch": { + "icon": "campsite", + "fields": [ + "ref" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "tent", + "rv" + ], + "tags": { + "camp_site": "camp_pitch" + }, + "name": "Camp Pitch" + }, "craft": { "icon": "marker-stroked", "fields": [ diff --git a/data/presets/presets/camp_site/camp_pitch.json b/data/presets/presets/camp_site/camp_pitch.json new file mode 100644 index 000000000..d7d1b1704 --- /dev/null +++ b/data/presets/presets/camp_site/camp_pitch.json @@ -0,0 +1,18 @@ +{ + "icon": "campsite", + "fields": [ + "ref" + ], + "geometry": [ + "point", + "area" + ], + "terms": [ + "tent", + "rv" + ], + "tags": { + "camp_site": "camp_pitch" + }, + "name": "Camp Pitch" +} diff --git a/data/taginfo.json b/data/taginfo.json index 50f37cd09..c412a1158 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -728,6 +728,10 @@ "key": "building", "value": "warehouse" }, + { + "key": "camp_site", + "value": "camp_pitch" + }, { "key": "craft" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index 7573db10d..42fbb1fcb 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2327,6 +2327,10 @@ "name": "Warehouse", "terms": "" }, + "camp_site/camp_pitch": { + "name": "Camp Pitch", + "terms": "tent,rv" + }, "craft": { "name": "Craft", "terms": "" diff --git a/modules/svg/labels.js b/modules/svg/labels.js index e4dc4c046..0abc70992 100644 --- a/modules/svg/labels.js +++ b/modules/svg/labels.js @@ -42,6 +42,7 @@ export function svgLabels(projection, context) { ['area', 'natural', '*', 12], ['area', 'shop', '*', 12], ['area', 'tourism', '*', 12], + ['area', 'camp_site', '*', 12], ['point', 'aeroway', '*', 10], ['point', 'amenity', '*', 10], ['point', 'building', '*', 10], @@ -51,6 +52,7 @@ export function svgLabels(projection, context) { ['point', 'natural', '*', 10], ['point', 'shop', '*', 10], ['point', 'tourism', '*', 10], + ['point', 'camp_site', '*', 10], ['line', 'name', '*', 12], ['area', 'name', '*', 12], ['point', 'name', '*', 10]