From 9b657d9e44b6ae0af8153a14b26779d6470450a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Thu, 1 Aug 2019 09:23:35 +0200
Subject: [PATCH] climbing: improvements, link from 'outdoor'
---
climbing.json | 25 +++++++++++++++----------
outdoor.json | 3 +++
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/climbing.json b/climbing.json
index d3b8a02..316652c 100644
--- a/climbing.json
+++ b/climbing.json
@@ -4,31 +4,36 @@
"en": "Climbing"
},
"query": {
- "11": [
+ "12": [
"(",
"nwr[sport~\"^(.*;|)climbing(|;.*)$\"];",
"nwr[highway=via_ferrata];",
"nwr[climbing~\"^(route|crag|boulder)$\"];",
")"
+ ],
+ "16": [
+ "(",
+ "nwr[sport~\"^(.*;|)climbing(|;.*)$\"];",
+ "nwr[highway=via_ferrata];",
+ "nwr[climbing];",
+ ")"
]
},
"feature": {
"description": [
"{% set dash = false %}",
- "{% if tags.leisure == 'sports_centre' %}",
- " {{ tagTrans('leisure', 'sports_centre') }}",
- " {% set dash=true %}",
- "{% endif %}",
- "",
- "{% if tags.highway == 'via_ferrata' %}",
+ "{% if tags.natural %}",
+ " {{ tagTransList('natural', tags.natural) }}",
+ " {% set dash=true %}",
+ "{% elseif tags.leisure %}",
" {% if dash %} - {% endif %}",
- " {{ tagTrans('highway', 'via_ferrata') }}",
+ " {{ tagTransList('leisure', tags.leisure) }}",
" {% set dash=true %}",
"{% endif %}",
"",
- "{% if tags.natural %}",
+ "{% if tags.highway == 'via_ferrata' %}",
" {% if dash %} - {% endif %}",
- " {{ tagTransList('natural', tags.natural) }}",
+ " {{ tagTrans('highway', 'via_ferrata') }}",
" {% set dash=true %}",
"{% endif %}",
"",
diff --git a/outdoor.json b/outdoor.json
index eb3c290..d6b7aa7 100644
--- a/outdoor.json
+++ b/outdoor.json
@@ -10,6 +10,9 @@
"subCategories": [
{
"id": "mtb-routes"
+ },
+ {
+ "id": "climbing"
}
]
}