From 17d03f2639e1d02a3dcf39c563379863abea07d2 Mon Sep 17 00:00:00 2001 From: Christian Neumann Date: Thu, 19 Nov 2020 12:44:35 +0100 Subject: [PATCH] Update climbing tags and icons. --- assets/questions/questions.json | 48 ++- assets/themes/climbing/climbing.json | 468 ++++++++++++++---------- assets/themes/climbing/climbing_gym.svg | 86 +++++ 3 files changed, 403 insertions(+), 199 deletions(-) create mode 100644 assets/themes/climbing/climbing_gym.svg diff --git a/assets/questions/questions.json b/assets/questions/questions.json index 2595eab2cb..557f1add44 100644 --- a/assets/questions/questions.json +++ b/assets/questions/questions.json @@ -1,8 +1,31 @@ { + "email": { + "render": "{email}", + "freeform": { + "key": "email", + "type": "email" + } + }, + "images": { "render": "{image_carousel()}{image_upload()}" }, - + + "opening_hours": { + "question": { + "en": "What are the opening hours of {name}?", + "de": "Was sind die Öffnungszeiten von {name}?" + }, + "render": { + "de": "

Öffnungszeiten

{opening_hours_table(opening_hours)}", + "en": "

Opening hours

{opening_hours_table(opening_hours)}" + }, + "freeform": { + "key": "opening_hours", + "type": "opening_hours" + } + }, + "osmlink": { "render": "", "mappings":[{ @@ -11,6 +34,18 @@ }] }, + "phone": { + "question": { + "en": "What is the phone number of {name}?", + "de": "Was ist die Telefonnummer von {name}?" + }, + "render": "{phone}", + "freeform": { + "key": "phone", + "type": "phone" + } + }, + "wikipedialink": { "render": "WP", "condition": "wikipedia~*" @@ -18,10 +53,11 @@ "website": { "question": { - "en": "What is the website of {name}?", - "nl": "Wat is de website van {name}?", - "fr": "Quel est le site internet de {name}?", - "gl": "Cal é a páxina web de {name}?" + "en": "What is the officical website of {name}?", + "de": "Was ist die offizielle Website von {name}?", + "nl": "Wat is de officiële website van {name}?", + "fr": "Quel est le site internet officiel de {name}?", + "gl": "Cal é a páxina web official de {name}?" }, "render": "{website}", "freeform": { @@ -29,4 +65,4 @@ "type": "url" } } -} \ No newline at end of file +} diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index a3c20d1bc5..2ff41f7d16 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -34,7 +34,8 @@ "overpassTags": { "and": [ "sport=climbing", - "climbing!~route" + "climbing!~route", + "leisure!~sports_centre" ] }, "title": { @@ -42,21 +43,7 @@ "en": "Climbing opportunity", "nl": "Klimgelegenheid", "de": "Klettermöglichkeit" - }, - "mappings": [ - { - "if": { - "and": [ - "leisure=sports_centre" - ] - }, - "then": { - "nl": "Klimzaal", - "de": "Kletterhalle", - "en": "Climbing gym" - } - } - ] + } }, "description": { "nl": "Een klimgelegenheid", @@ -65,71 +52,31 @@ }, "tagRenderings": [ { - "render": "{website}", - "freeform": { - "key": "website" - } - }, - { - "render": "{phone}", - "freeform": { - "key": "phone" - } - }, - { - "render": "{email}", - "freeform": { - "key": "email" - } - }, - { - "render": "{opening_hours_table(opening_hours)}", - "freeform": { - "key": "opening_hours" - } - }, - { - "question": { - "de": "Kann hier gebouldert werden?", - "en": "Is bouldering possible here?" + "render": { + "en": "{name}", + "nl": "{name}", + "de": "{name}" + }, + "question": { + "en": "What is the name of this climbing opportunity?", + "nl": "Wat is de naam van dit Klimgelegenheid?", + "de": "Wie heißt diese Klettergelegenheit?" + }, + "freeform": { + "key": "name" }, - "mappings": [ - { - "if": "climbing:boulder=yes", - "then": { - "de": "Hier kann gebouldert werden", - "en": "Bouldering is possible here" - } - }, - { - "if": "climbing:boulder=no", - "then": { - "de": "Hier kann nicht gebouldert werden", - "en": "Bouldering is not possible here" - } - }, - { - "if": "climbing:boulder~*", - "then": { - "de": "Hier gibt es {climbing:boulder} Boulder-Routen", - "en": "There are {climbing:boulder} boulder routes" - }, - "hideInAnswer": true - } - ] - }, - { "mappings": [ { "if": { "and": [ - "climbing:toprope=yes" + "noname=yes", + "name=" ] }, "then": { - "nl": "Toprope klimmen kan hier", - "de": "Toprope ist hier möglich", - "en": "Toprope is possible here" + "en": "This climbing opportunity doesn't have a name", + "nl": "Dit Klimgelegenheid heeft geen naam", + "de": "Diese Klettergelegenheit hat keinen Namen" } } ] @@ -154,25 +101,79 @@ "sport=climbing" ], "title": { - "de": "Klettermöglichkeit", - "en": "", - "nl": "Kletterkarte" + "en": "Climbing opportunity", + "nl": "Klimgelegenheid", + "de": "Klettermöglichkeit" }, "description": { - "de": "", - "en": "", - "nl": "Een klimroute op rots" + "nl": "Een klimgelegenheid", + "de": "Eine Klettergelegenheit", + "en": "A climbing opportunity" } } ], - "wayHandling": 2 + "wayHandling": 1 }, { - "id": "routes", + "id": "climbing_gym", "name": { - "en": "", - "nl": "", - "de": "" + "de": "Kletterhallen", + "en": "Climbing gyms" + }, + "minzoom": 10, + "overpassTags": { + "and": [ + "sport=climbing", + "leisure=sports_centre" + ] + }, + "title": { + "render": { + "nl": "Klimzaal", + "de": "Kletterhalle", + "en": "Climbing gym" + } + }, + "description": { + "de": "Eine Kletterhalle", + "en": "A climbing gym" + }, + "tagRenderings": [ + { + "render": { + "en": "{name}", + "nl": "{name}", + "de": "{name}" + }, + "question": { + "en": "What is the name of this climbing gym?", + "nl": "Wat is de naam van dit Klimzaal?", + "de": "Wie heißt diese Kletterhalle?" + }, + "freeform": { + "key": "name" + } + }, + "website", + "phone", + "email", + "opening_hours" + ], + "hideUnderlayingFeaturesMinPercentage": 0, + "icon": { + "render": "./assets/themes/climbing/climbing_gym.svg" + }, + "width": "0", + "iconSize": { + "render": "40,40,center" + }, + "wayHandling": 1 + }, + { + "id": "climbing_route", + "name": { + "en": "Climbing routes", + "de": "Kletterrouten" }, "minzoom": 18, "overpassTags": { @@ -182,78 +183,23 @@ }, "title": { "render": { - "nl": "Klimroute", - "de": "Kletterroute", + "de": "Kleterroute", "en": "Climbing route" - }, - "mappings": [ - { - "if": { - "and": [ - "name~*" - ] - }, - "then": { - "nl": "Klimroute {name}", - "de": "Kletterroute {name}", - "en": "Climbing route {name}" - } - } - ] - }, - "description": { - "nl": "Individuele klimroutes", - "de": "Kletterrouten", - "en": "Climbing routes" + } }, "tagRenderings": [ { "render": { - "nl": "Moeilijkheidsgraad {climbing:grade:french}", - "en": "Difficulty level {climbing:grade:french}", - "de": "Schwierigkeitsgrad {climbing:grade:french}" + "en": "{name}", + "nl": "{name}", + "de": "{name}" }, "question": { - "nl": "Wat is de moelijkheidsgraad van dit parcour?", - "en": "What is the difficulty of this route?", - "de": "Was ist die Schwierigkeit dieser Route?" + "en": "What is the name of this climbing route?", + "de": "Wie heißt diese Kletterroute?" }, "freeform": { - "key": "climbing:grade:french" - } - }, - { - "freeform": { - "key": "climbing:bolted", - "type": "nat" - }, - "render": { - "de": "", - "en": "", - "nl": "Aantal tussenhaken {climbing:bolted}" - }, - "question": { - "de": "", - "en": "", - "nl": "Hoeveel tussenhaken zijn er hier?" - } - }, - { - "render": { - "de": "", - "en": "", - "nl": "Deze route heet {name}" - }, - "question": { - "de": "", - "en": "", - "nl": "Wat is de naam van deze route?" - }, - "freeform": { - "key": "name", - "addExtraTags": [ - "noname=" - ] + "key": "name" }, "mappings": [ { @@ -264,9 +210,8 @@ ] }, "then": { - "de": "", - "en": "", - "nl": "Deze route heeft geen naam" + "en": "This climbing route doesn't have a name", + "de": "Diese Kletterroute hat keinen Namen" } } ] @@ -284,62 +229,43 @@ }, "color": { "render": "#0f0" - }, - "presets": [ - { - "tags": [ - "climbing=route" - ], - "title": { - "de": "", - "en": "", - "nl": "Klimroute" - }, - "description": { - "de": "", - "en": "", - "nl": "Een klimroute op rots" - } - } - ] + } } ], "roamingRenderings": [ { - "render": { - "en": "Name: {name}", - "nl": "Naam: {name}", - "de": "Name: {name}" - }, "question": { - "en": "What is the name of this climbing opportunity?", - "nl": "Wat is de naam van dit Klimgelegenheid?", - "de": "Wie heißt diese Klettergelegenheit?" + "en": "Is there a (unofficial) website with more informations (e.g. topos)?", + "de": "Gibt es eine (inoffizielle) Website mit mehr Informationen (z.B. Topos)?" }, + "condition": { + "and": [ + "leisure!~sports_centre", + "sport=climbing" + ] + }, + "render": "{url}", "freeform": { - "key": "name" - }, - "mappings": [ - { - "if": { - "and": [ - "noname=yes", - "name=" - ] - }, - "then": { - "en": "This climbing opportunity doesn't have a name", - "nl": "Dit Klimgelegenheid heeft geen naam", - "de": "Diese Klettergelegenheit hat keinen Namen" - } - } - ] + "key": "url", + "type": "url" + } }, { "render": { "de": "Die Routen sind durchschnittlich {climbing:length}m lang", "en": "The routes are {climbing:length}m long in average" }, + "condition": { + "and": [ + "climbing!~route", + { + "or": [ + "climbing=sport", + "climbing=traditional" + ] + } + ] + }, "question": { "de": "Wie lang sind die Routen (durchschnittlich) in Metern?", "en": "What is the (average) length of the routes in meters?" @@ -348,6 +274,162 @@ "key": "climbing:length", "type": "pnat" } + }, + { + "question": { + "de": "Kann hier gebouldert werden?", + "en": "Is bouldering possible here?" + }, + "mappings": [ + { + "if": "climbing:boulder=yes", + "then": { + "de": "Hier kann gebouldert werden", + "en": "Bouldering is possible here" + } + }, + { + "if": "climbing:boulder=no", + "then": { + "de": "Hier kann nicht gebouldert werden", + "en": "Bouldering is not possible here" + } + }, + { + "if": "climbing:boulder~*", + "then": { + "de": "Hier gibt es {climbing:boulder} Boulder-Routen", + "en": "There are {climbing:boulder} boulder routes" + }, + "hideInAnswer": true + } + ] + }, + { + "question": { + "de": "Ist Toprope-Klettern hier möglich?", + "en": "Is toprope climbing possible here?" + }, + "mappings": [ + { + "if": "climbing:toprope=yes", + "then": { + "de": "Toprope-Klettern ist hier möglich", + "en": "Toprope climbing is possible here" + } + }, + { + "if": "climbing:toprope=no", + "then": { + "de": "Toprope-Climbing ist hier nicht möglich", + "en": "Toprope climbing is not possible here" + } + }, + { + "if": "climbing:toprope~*", + "then": { + "de": "Hier gibt es {climbing:toprope} Toprope-Routen", + "en": "There are {climbing:toprope} toprope routes" + }, + "hideInAnswer": true + } + ] + }, + { + "question": { + "de": "Ist hier Sportklettern möglich (feste Ankerpunkte)?", + "en": "Is sport climbing possible here (fixed anchors)?" + }, + "mappings": [ + { + "if": "climbing:sport=yes", + "then": { + "de": "Sportklettern ist hier möglich", + "en": "Sport climbing is possible here" + } + }, + { + "if": "climbing:sport=no", + "then": { + "de": "Sportklettern ist hier nicht möglich", + "en": "Sport climbing is not possible here" + } + }, + { + "if": "climbing:sport~*", + "then": { + "de": "Hier gibt es {climbing:sport} Sportkletter-Routen", + "en": "There are {climbing:sport} sport climbing routes" + }, + "hideInAnswer": true + } + ] + }, + { + "question": { + "de": "Ist hier traditionelles Klettern möglich (eigene Sicherung z.B. mit Klemmkleilen)?", + "en": "Is traditional climbing possible here (using own gear e.g. chocks)?" + }, + "mappings": [ + { + "if": "climbing:traditional=yes", + "then": { + "de": "Traditionelles Klettern ist hier möglich", + "en": "Traditional climbing is possible here" + } + }, + { + "if": "climbing:traditional=no", + "then": { + "de": "Traditionelles Klettern ist hier nicht möglich", + "en": "Traditional climbing is not possible here" + } + }, + { + "if": "climbing:traditional~*", + "then": { + "de": "Hier gibt es {climbing:traditional} Routen für traditionelles Klettern", + "en": "There are {climbing:traditional} traditional climbing routes" + }, + "hideInAnswer": true + } + ] + }, + { + "question": { + "de": "Gibt es hier eine Speedkletter-Wand?", + "en": "Is there a speed climbing wall?" + }, + "condition": { + "and": [ + "leisure=sports_centre", + "climbing:sport=yes" + ] + }, + "mappings": [ + { + "if": "climbing:speed=yes", + "then": { + "de": "Hier gibt es eine Speedkletter-Wand", + "en": "There is a speed climbing wall" + } + }, + { + "if": "climbing:speed=no", + "then": { + "de": "Hier gibt es keine Speedkletter-Wand", + "en": "There is no speed climbing wall" + } + }, + { + "if": "climbing:speed~*", + "then": { + "de": "Hier gibt es {climbing:speed} Speedkletter-Routen", + "en": "There are {climbing:speed} speed climbing walls" + }, + "hideInAnswer": true + } + ] } ] } diff --git a/assets/themes/climbing/climbing_gym.svg b/assets/themes/climbing/climbing_gym.svg new file mode 100644 index 0000000000..6818a8f19e --- /dev/null +++ b/assets/themes/climbing/climbing_gym.svg @@ -0,0 +1,86 @@ + +image/svg+xml + + + + + +