X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/wrpylib.git/blobdiff_plain/87826f9a71c5f1a1c10d368029074df5f7280192..30451a1ba4c0f5c76cd0977c4fe12b70aa32cd19:/wrpylib/templates/sledrun_wikitext.txt?ds=sidebyside

diff --git a/wrpylib/templates/sledrun_wikitext.txt b/wrpylib/templates/sledrun_wikitext.txt
index e153344..bceb8b4 100644
--- a/wrpylib/templates/sledrun_wikitext.txt
+++ b/wrpylib/templates/sledrun_wikitext.txt
@@ -5,6 +5,15 @@
 {%- macro wr_page(value) -%}
 [[{{ value.title }}{% if value.text %}|{{ value.text }}{% endif %}]]
 {%- endmacro -%}
+{%- macro address(value) -%}
+{% set space = joiner(" ") %}
+{%- if value.street %}{{ space() }}{{ value.street }}{% endif %}
+{%- if value.housenumber %}{{ space() }}{{ value.housenumber }}{% endif %}
+{%- if value.street or value.housenumber %};{% endif %}
+{%- if value.postcode %}{{ space() }}{{ value.postcode }}{% endif %}
+{%- if value.city %}{{ space() }}{{ value.city }}{% endif %}
+{%- if value.country %}{{ space() }}{{ value.country }}{% endif %}
+{%- endmacro -%}
 {% if sledrun_json.entry_under_construction %}{% raw %}{{In Arbeit|Rodelbahn}}{% endraw %}
 
 {% endif -%}
@@ -27,9 +36,27 @@
 * {{Position unten}}
 * {{Höhenunterschied}}
 * {{Bahnlänge}}
-* {{Gehzeit}}
-{% endraw -%}
-* '''Beleuchtung''': {{ nightlight_description | default( nightlight_possible | default("''Unbekannt''") ) | trim }}
+* {{Gehzeit}}{% endraw %}
+  {%- if walkup_time_note %} ({{ walkup_time_note }})
+  {%- else %}
+  {%- if walkup_possible is false %} (ein Aufstieg zu Fuß ist nicht möglich){% endif %}
+  {%- endif %}
+* '''Beleuchtung''': {% if nightlight_description -%}
+  {{ nightlight_description }}
+  {%- else %}
+  {%- if nightlight_possible -%}
+  {{ nightlight_possible }}
+  {%- if nightlight_weekdays %} (
+  {%- if nightlight_weekdays|length == 7 -%}
+  täglich
+  {%- else -%}
+  {{ ', '.join(nightlight_weekdays) }}
+  {%- endif -%}
+  ){% endif %}
+  {%- else -%}
+  ''Unbekannt''
+  {%- endif %}
+  {%- endif %}
 * '''Rodelverleih''': {% if sled_rental_description -%}
 {{ sled_rental_description | trim }}
 {%- else -%}
@@ -40,22 +67,42 @@
 {%- endif %}
 {%- endif -%}
 {% for rental in sled_rental %}
-** {{ rental.name }}{%if rental.note %} ({{ rental.note }}){% endif %}{% if rental.wr_page %}{{ wr_page(info) }}{% endif %}
+** {% set space = joiner("; ") %}
+   {%- if rental.name %}{{ space() }}
+   {%- if rental.weblink and not rental.weblink.text %}{{ weblink({"url": rental.weblink.url, "text": rental.name}) }}
+   {%- else %}{{ rental.name }}
+   {%- endif %}
+   {%- endif %}
+   {%- if rental.wr_page %}{{ space() }}{{ wr_page(rental.wr_page) }}{% endif %}
+   {%- if rental.weblink and not (rental.name and not rental.weblink.text) %}
+   {{- space() }}{{ weblink(rental.weblink) }}{% endif %}
+   {%- if rental.phone %}{{ space() }}Tel. {{ rental.phone }}{% endif %}
+   {%- if rental.address %}{{ space() }}{{ address(rental.address) }}{% endif %}
+   {%- if rental.location %}{{ space() }}{{ rental.location }}{% endif %}
+   {%- if rental.opening_hours %}{{ space() }}{{ rental.opening_hours }}{% endif %}
+   {%- if rental.note %}{{ space() }}{{ rental.note }}{% endif %}
 {%- endfor %}
 * '''Schneelage - Auskunft''':
 {%- for info in info_phone %}
-** {{ info.phone }} ({{ info.name }})
+** {{ info.phone }} ({{ info.name }}{% if info.note %}; {{ info.note }}{% endif %})
 {%- endfor %}
 {%- for info in info_web %}
 ** {{ weblink(info) }}
 {%- endfor %}
-* '''Betreiber''': {{ operator }}
-* '''Hütten''':
+* '''Betreiber''':
+{%- if has_operator is defined %} {% if has_operator %}{{ operator }}{% else %}''Nein''{% endif %}{% endif %}
+* '''Hütten''': {{ gastronomy_description }}
 {%- for info in gastronomy %}
-** {{ info.name }}
-   {%- if info.wr_page %}{{ wr_page(info.wr_page) }}{% endif %}
-   {%- if info.weblink %}{{ weblink(info.weblink) }}{% endif %}
-   {%- if info.note %} ({{ info.note }}){% endif %}
+** {% set space = joiner(" ") %}
+   {%- if info.name %}{{ space() }}
+   {%- if info.weblink and not info.weblink.text %}{{ weblink({"url": info.weblink.url, "text": info.name}) }}
+   {%- else %}{{ info.name }}
+   {%- endif %}
+   {%- endif %}
+   {%- if info.wr_page %}{{ space() }}{{ wr_page(info.wr_page) }}{% endif %}
+   {%- if info.weblink and not (info.name and not info.weblink.text) %}
+   {{- space() }}{{ weblink(info.weblink) }}{% endif %}
+   {%- if info.note %}{{ space() }}({{ info.note }}){% endif %}
 {%- endfor %}
 * '''Andere Rodelbahnen''':
 {%- for info in sledrun_list %}
@@ -69,6 +116,7 @@
 {{ h.key_value_template('Buttonleiste', {
     'Bericht': allow_reports|german_bool,
     'ForumId': forum_id,
+    'Gütesiegel': tiroler_naturrodelbahn_gütesiegel.thread_id if tiroler_naturrodelbahn_gütesiegel else '',
     'Impressionen': impressions_title,
     'Wetter': 'Ja' if position else '',
     'webcam': webcams[0].url if webcams and webcams|length > 0 else '',
@@ -95,11 +143,16 @@
 {% if public_transport_description -%}
 {{ public_transport_description | trim }}
 {%- else -%}
+{% if public_transport == "Nein" -%}
+Leider ist keine Anreise mit öffentlichen Verkehrsmitteln möglich.
+{%- else -%}
 ''Hier wird die Anreise mit öffentlichen Verkehrsmitteln beschrieben.''
 {%- endif %}
+{%- endif %}
 
 {% for pt_stop in public_transport_stops -%}
-* {{ h.list_template('Haltestelle', [pt_stop.municipality, pt_stop.name_local, h.json_pos_ele_position(pt_stop.get('position', {})), h.json_pos_ele_elevation(pt_stop.get('position', {}))]) }}
+* {{ h.list_template('Haltestelle', [pt_stop.get('municipality', pt_stop.get('name', '')), pt_stop.get('name_local', ''),
+     h.json_pos_ele_position(pt_stop.get('position', {})), h.json_pos_ele_elevation(pt_stop.get('position', {}))]) }}
 {%- if pt_stop.note %} ({{ pt_stop.note }}){% endif %}
 {% for template_name in ['monitor_template', 'route_arrival_template', 'route_departure_template'] -%}
 {% if template_name in pt_stop -%}
@@ -110,8 +163,15 @@
 {% if public_transport_lines|length + public_transport_links|length > 0 -%}
 * '''Fahrplan''':
 {% for pt_line in public_transport_lines -%}
-** {% if pt_line.timetable_template is defined %}{{ h.json_template(pt_line.timetable_template) }}
-   {%- else %}{{ pt_line.name }}{% endif %}
+** {% set space = joiner(" ") %}
+   {%- if pt_line.name %}{{ space() }}{{ pt_line.name }}
+   {%- else %}
+   {%- if pt_line.label %}{{ space() }}{{ pt_line.label }}{% endif %}
+   {%- endif %}
+   {%- if pt_line.timetable_template %}{{ space() }}{{ h.json_template(pt_line.timetable_template) }}{% endif %}
+   {%- if pt_line.route %}{{ space() }}{{ pt_line.route }}{% endif %}
+   {%- if pt_line.note %}{{ space() }}{{ pt_line.note }}{% endif %}
+   {%- for tl in pt_line.timetable_links %}{{ space() }}{{ weblink(tl) }}{% endfor %}
 {% endfor -%}
 {% for link in public_transport_links -%}
 ** {{ weblink(link) }}