Update climbing tags and icons.

assets/questions/questions.json

@@ -1,8 +1,31 @@
 {
+  "email": {
+    "render": "<a href='mailto:{email}' target='_blank'>{email}</a>",
+    "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": "<h3>Öffnungszeiten</h3>{opening_hours_table(opening_hours)}",
+      "en": "<h3>Opening hours</h3>{opening_hours_table(opening_hours)}"
+    },
+    "freeform": {
+      "key": "opening_hours",
+      "type": "opening_hours"
+    }
+  },
+
   "osmlink": {
     "render": "<a href='https://openstreetmap.org/{id}' target='_blank'><img src='./assets/svg/osm-logo-us.svg'/></a>",
     "mappings":[{
@@ -11,6 +34,18 @@
     }]
   },
 
+  "phone": {
+    "question": {
+      "en": "What is the phone number of {name}?",
+      "de": "Was ist die Telefonnummer von {name}?"
+    },
+    "render": "<a href='tel:{phone}'>{phone}</a>",
+    "freeform": {
+      "key": "phone",
+      "type": "phone"
+    }
+  },
+
   "wikipedialink": {
     "render": "<a href='https://wikipedia.org/wiki/{wikipedia}' target='_blank'><img src='./assets/wikipedia.svg' alt='WP'/></a>",
     "condition":  "wikipedia~*"
@@ -18,10 +53,11 @@
   
   "website": {
     "question": {
-      "en": "What is the website of {name}?",
+      "en": "What is the officical website of {name}?",
-      "nl": "Wat is de website van {name}?",
+      "de": "Was ist die offizielle Website von {name}?",
-      "fr": "Quel est le site internet de {name}?",
+      "nl": "Wat is de officiële website van {name}?",
-      "gl": "Cal é a páxina web de {name}?"
+      "fr": "Quel est le site internet officiel de {name}?",
+      "gl": "Cal é a páxina web official de {name}?"
     },
     "render": "<a href='{website}' target='_blank'>{website}</a>",
     "freeform": {
@@ -29,4 +65,4 @@
       "type": "url"
     }
   }
-}
+}

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": "<a href='{website}' target='_blank'>{website}</a>",
+          "render": {
-          "freeform": {
+            "en": "<strong>{name}</strong>",
-            "key": "website"
+            "nl": "<strong>{name}</strong>",
-          }
+            "de": "<strong>{name}</strong>"
-        },
+          },
-        {
+          "question": {
-          "render": "<a href='tel:{phone}'>{phone}</a>",
+            "en": "What is the name of this climbing opportunity?",
-          "freeform": {
+            "nl": "Wat is de naam van dit Klimgelegenheid?",
-            "key": "phone"
+            "de": "Wie heißt diese Klettergelegenheit?"
-          }
+          },
-        },
+          "freeform": {
-        {
+            "key": "name"
-          "render": "<a href='mailto:{email}' target='_blank'>{email}</a>",
-          "freeform": {
-            "key": "email"
-          }
-        },
-        {
-          "render": "{opening_hours_table(opening_hours)}",
-          "freeform": {
-            "key": "opening_hours"
-          }
-        },
-        {
-          "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
-            }
-          ]
-        },
-        {
           "mappings": [
             {
               "if": {
                 "and": [
-                  "climbing:toprope=yes"
+                  "noname=yes",
+                  "name="
                 ]
               },
               "then": {
-                "nl": "Toprope klimmen kan hier",
+                "en": "This climbing opportunity doesn't have a name",
-                "de": "Toprope ist hier möglich",
+                "nl": "Dit Klimgelegenheid heeft geen naam",
-                "en": "Toprope is possible here"
+                "de": "Diese Klettergelegenheit hat keinen Namen"
               }
             }
           ]
@@ -154,25 +101,79 @@
             "sport=climbing"
           ],
           "title": {
-            "de": "Klettermöglichkeit",
+            "en": "Climbing opportunity",
-            "en": "",
+            "nl": "Klimgelegenheid",
-            "nl": "Kletterkarte"
+            "de": "Klettermöglichkeit"
           },
           "description": {
-            "de": "",
+            "nl": "Een klimgelegenheid",
-            "en": "",
+            "de": "Eine Klettergelegenheit",
-            "nl": "Een klimroute op rots"
+            "en": "A climbing opportunity"
           }
         }
       ],
-      "wayHandling": 2
+      "wayHandling": 1
     },
     {
-      "id": "routes",
+      "id": "climbing_gym",
       "name": {
-        "en": "",
+        "de": "Kletterhallen",
-        "nl": "",
+        "en": "Climbing gyms"
-        "de": ""
+      },
+      "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": "<strong>{name}</strong>",
+            "nl": "<strong>{name}</strong>",
+            "de": "<strong>{name}</strong>"
+          },
+          "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": "Kleterroute",
-          "de": "Kletterroute",
           "en": "Climbing route"
-        },
+        }
-        "mappings": [
-          {
-            "if": {
-              "and": [
-                "name~*"
-              ]
-            },
-            "then": {
-              "nl": "Klimroute <i>{name}</i>",
-              "de": "Kletterroute <i>{name}</i>",
-              "en": "Climbing route <i>{name}</i>"
-            }
-          }
-        ]
-      },
-      "description": {
-        "nl": "Individuele klimroutes",
-        "de": "Kletterrouten",
-        "en": "Climbing routes"
       },
       "tagRenderings": [
         {
           "render": {
-            "nl": "Moeilijkheidsgraad <b>{climbing:grade:french}</b>",
+            "en": "<strong>{name}</strong>",
-            "en": "Difficulty level <b>{climbing:grade:french}</b>",
+            "nl": "<strong>{name}</strong>",
-            "de": "Schwierigkeitsgrad <b>{climbing:grade:french}</b>"
+            "de": "<strong>{name}</strong>"
           },
           "question": {
-            "nl": "Wat is de moelijkheidsgraad van dit parcour?",
+            "en": "What is the name of this climbing route?",
-            "en": "What is the difficulty of this route?",
+            "de": "Wie heißt diese Kletterroute?"
-            "de": "Was ist die Schwierigkeit dieser Route?"
           },
           "freeform": {
-            "key": "climbing:grade:french"
+            "key": "name"
-          }
-        },
-        {
-          "freeform": {
-            "key": "climbing:bolted",
-            "type": "nat"
-          },
-          "render": {
-            "de": "",
-            "en": "",
-            "nl": "Aantal tussenhaken <b>{climbing:bolted}</b>"
-          },
-          "question": {
-            "de": "",
-            "en": "",
-            "nl": "Hoeveel tussenhaken zijn er hier?"
-          }
-        },
-        {
-          "render": {
-            "de": "",
-            "en": "",
-            "nl": "Deze route heet <b>{name}</b>"
-          },
-          "question": {
-            "de": "",
-            "en": "",
-            "nl": "Wat is de naam van deze route?"
-          },
-          "freeform": {
-            "key": "name",
-            "addExtraTags": [
-              "noname="
-            ]
           },
           "mappings": [
             {
@@ -264,9 +210,8 @@
                 ]
               },
               "then": {
-                "de": "",
+                "en": "This climbing route doesn't have a name",
-                "en": "",
+                "de": "Diese Kletterroute hat keinen Namen"
-                "nl": "Deze route heeft geen naam"
               }
             }
           ]
@@ -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?",
+        "en": "Is there a (unofficial) website with more informations (e.g. topos)?",
-        "nl": "Wat is de naam van dit Klimgelegenheid?",
+        "de": "Gibt es eine (inoffizielle) Website mit mehr Informationen (z.B. Topos)?"
-        "de": "Wie heißt diese Klettergelegenheit?"
       },
+      "condition": {
+        "and": [
+          "leisure!~sports_centre",
+          "sport=climbing"
+        ]
+      },
+      "render": "<a href='{url}' target='_blank'>{url}</a>",
       "freeform": {
-        "key": "name"
+        "key": "url",
-      },
+        "type": "url"
-      "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"
-          }
-        }
-      ]
     },
     {
       "render": {
         "de": "Die Routen sind durchschnittlich <b>{climbing:length}m</b> lang",
         "en": "The routes are <b>{climbing:length}m</b> 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
+        }
+      ]
     }
   ]
 }

assets/themes/climbing/climbing_gym.svg

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_2"
+   x="0px"
+   y="0px"
+   width="400px"
+   height="400px"
+   viewBox="0 0 400 400"
+   enable-background="new 0 0 400 400"
+   xml:space="preserve"
+   sodipodi:docname="climbing_gym.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><metadata
+   id="metadata1042"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs1040" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1916"
+   inkscape:window-height="1062"
+   id="namedview1038"
+   showgrid="false"
+   inkscape:zoom="0.34314014"
+   inkscape:cx="166.29604"
+   inkscape:cy="170.51119"
+   inkscape:window-x="0"
+   inkscape:window-y="16"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_2"
+   inkscape:document-rotation="0" />
+<g
+   id="g6865"
+   transform="matrix(0.77249559,0,0,0.77249559,56.180712,69.276622)"
+   style="stroke-width:1.2945"><path
+     style="fill:#000000;stroke-width:1.2945"
+     id="path4"
+     d="M 386.30622,142.35886 213.03817,-30.774876 c -7.33367,-6.930725 -14.04946,-14.90909 -26.86326,-14.90909 -12.81376,0 -19.5296,7.978365 -26.86328,14.90909 L -13.956364,142.35886 c -8.381366,8.73056 -14.77483,15.09716 -14.77483,26.86325 0,15.12402 11.604945,26.86318 26.8632886,26.86318 H 24.995358 v 161.17952 c 0,14.77488 12.088481,26.86349 26.863241,26.86349 h 80.589811 107.45302 80.58979 c 14.7748,0 26.86326,-12.08861 26.86326,-26.86349 V 196.08529 h 26.86328 c 15.25832,0 26.86323,-11.73916 26.86323,-26.86318 0,-11.76609 -6.39343,-18.13269 -14.77477,-26.86325 z"
+     sodipodi:nodetypes="ccsccsscssccsscssc" /><g
+     id="g1035"
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#d38d5f;fill-opacity:1;stroke-width:1.2945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+     transform="translate(2.2158897,19.017004)">
+	<circle
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   fill="#53C9ED"
+   cx="190.403"
+   cy="92.550003"
+   r="23.049999"
+   id="circle1029"
+   style="font-variation-settings:normal;vector-effect:none;fill:#d38d5f;fill-opacity:1;stroke-width:1.2945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+	<path
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   fill="#53C9ED"
+   d="m 256.594,147.631 31.687,-38.824 c 3.497,-4.285 10.495,-4.362 15.628,-0.171 l 1.643,1.34 c 5.135,4.191 6.461,11.062 2.965,15.346 0,0 -37.64,46.27 -38.512,46.778 -4.412,4.632 -8.461,6.728 -13.859,4.187 L 219.024,158.816 V 186 h -60.72 V 147.316 L 104.147,74.935 C 97.898,66.584 97.135,56.595 102.44,52.627 l 1.697,-1.271 c 5.308,-3.972 14.674,-0.419 20.923,7.934 l 48.777,65.191 h 34.097 z"
+   id="path1031"
+   style="font-variation-settings:normal;vector-effect:none;fill:#d38d5f;fill-opacity:1;stroke-width:1.2945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+	<path
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   fill="#53C9ED"
+   d="m 220.993,219.764 13.847,50.956 37.23,48.658 c 3.849,5.028 1.842,13.032 -4.484,17.874 l -2.023,1.549 c -6.326,4.839 -14.574,4.686 -18.425,-0.347 l -38.7,-50.578 c -0.779,-1.02 -1.307,-2.164 -1.619,-3.376 -0.717,-0.833 -1.25,-1.784 -1.539,-2.848 l -7.947,-29.245 c -3.057,0.421 -6.562,0.693 -10.292,0.765 l -3.824,0.073 c -11.378,0.218 -23.561,-4.499 -24.396,-5.07 l -22.519,-15.411 -6.271,41.158 c -0.878,5.765 -7.974,9.467 -15.849,8.268 l -2.52,-0.384 c -7.874,-1.199 -13.547,-6.845 -12.668,-12.613 l 8.83,-57.962 c 0.224,-1.468 3.203,-9.405 4.99,-12.018 l 1.439,-2.103 c 4.498,-6.573 11.845,-9.371 16.41,-6.246 l 27.638,18.915 V 197.5 h 60.72 z"
+   id="path1033"
+   style="font-variation-settings:normal;vector-effect:none;fill:#d38d5f;fill-opacity:1;stroke-width:1.2945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1" />
+</g></g>
+<rect
+   style="color:#000000;overflow:visible;fill:#ffcc00;stop-color:#000000"
+   id="rect986"
+   width="0"
+   height="0.39620301"
+   x="93.679321"
+   y="136.03252" /></svg>