climbing: improvements, link from 'outdoor'

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' %}",
+            "{% if tags.natural %}",
-            "  {{ tagTrans('leisure', 'sports_centre') }}",
+            "  {{ tagTransList('natural', tags.natural) }}",
-            " {% set dash=true %}",
+            "  {% set dash=true %}",
-            "{% endif %}",
+            "{% elseif tags.leisure %}",
-            "",
-            "{% if tags.highway == 'via_ferrata' %}",
             "  {% 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 %}",
             "",

outdoor.json

@@ -10,6 +10,9 @@
     "subCategories": [
         {
             "id": "mtb-routes"
+        },
+        {
+            "id": "climbing"
         }
     ]
 }