From 98613d9a3970cf19954d9f9dcfd15f0c6e6a0a15 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 6 Jan 2022 11:14:25 +0100 Subject: [PATCH] upgrade old information values to subtypes of board/map and add an "activity" field for maps and guideposts which indicates the mapped/signposted scope of activities: hiking, biking, etc. closes #45 --- data/deprecated.json | 28 +++++++++++++++++++ data/fields/activity.json | 20 +++++++++++++ .../tourism/information/guidepost.json | 3 +- data/presets/tourism/information/map.json | 3 ++ interim/source_strings.yaml | 10 +++++++ 5 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 data/fields/activity.json diff --git a/data/deprecated.json b/data/deprecated.json index c462f598..8c27763d 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -734,6 +734,34 @@ "old": {"highway": "unsurfaced"}, "replace": {"highway": "road", "surface": "unpaved"} }, + { + "old": {"information": "citymap"}, + "replace": {"tourism": "information", "information": "map", "map_type": "street", "map_size": "city"} + }, + { + "old": {"information": "hikingmap"}, + "replace": {"tourism": "information", "information": "map", "map_type": "topo", "hiking": "yes"} + }, + { + "old": {"information": "bicyclemap"}, + "replace": {"tourism": "information", "information": "map", "map_type": "topo", "bicyle": "yes"} + }, + { + "old": {"information": "nature"}, + "replace": {"tourism": "information", "information": "board", "board_type": "nature"} + }, + { + "old": {"information": "history"}, + "replace": {"tourism": "information", "information": "board", "board_type": "history"} + }, + { + "old": {"information": "wild_life"}, + "replace": {"tourism": "information", "information": "board", "board_type": "wildlife"} + }, + { + "old": {"information": "wildlife"}, + "replace": {"tourism": "information", "information": "board", "board_type": "wildlife"} + }, { "old": {"internet_access": "public"}, "replace": {"internet_access": "yes", "internet_access:fee": "no"} diff --git a/data/fields/activity.json b/data/fields/activity.json new file mode 100644 index 00000000..ed431990 --- /dev/null +++ b/data/fields/activity.json @@ -0,0 +1,20 @@ +{ + "keys": [ + "hiking", + "bicycle", + "mtb", + "horse", + "ski" + ], + "type": "manyCombo", + "label": "Activity", + "strings": { + "options": { + "hiking": "Hiking", + "bicycle": "Cycling", + "mtb": "Mountainbiking", + "horse": "Horseriding", + "Ski": "Skiing" + } + } +} \ No newline at end of file diff --git a/data/presets/tourism/information/guidepost.json b/data/presets/tourism/information/guidepost.json index d392a718..7a451b69 100644 --- a/data/presets/tourism/information/guidepost.json +++ b/data/presets/tourism/information/guidepost.json @@ -7,7 +7,8 @@ "ref" ], "moreFields": [ - "material" + "material", + "activity" ], "geometry": [ "point", diff --git a/data/presets/tourism/information/map.json b/data/presets/tourism/information/map.json index fc6259ce..1c7fa9fb 100644 --- a/data/presets/tourism/information/map.json +++ b/data/presets/tourism/information/map.json @@ -6,6 +6,9 @@ "map_size", "direction" ], + "moreFields": [ + "activity" + ], "geometry": [ "point", "vertex" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index e4997ca4..325398c8 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -97,6 +97,16 @@ en: 'yes': Public # 'terms: permitted,private,public' terms: '[translate with synonyms or related terms for ''Allowed Access'', separated by commas]' + activity: + # 'hiking=*, bicycle=*, mtb=*, horse=*, ski=*' + label: Activity + options: + Ski: Skiing + bicycle: Cycling + hiking: Hiking + horse: Horseriding + mtb: Mountainbiking + terms: '[translate with synonyms or related terms for ''Activity'', separated by commas]' addr/interpolation: # 'addr:interpolation=*' label: Type