Rename template sledrun_wiki to sledrun_wikitext.

diff --git a/wrpylib/templates/sledrun_wiki.txt b/wrpylib/templates/sledrun_wiki.txt
deleted file mode 100644 (file)
index bab2b76..0000000
--- a/wrpylib/templates/sledrun_wiki.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-{% block content %}
-{%- macro weblink(value) -%}
-{% if value.text %}[{{ value.url }} {{ value.text }}]{% else %}{{ value.url }}{% endif %}
-{%- endmacro %}
-{%- macro wr_page(value) -%}
-[[{{ value.title }}{% if value.text %}|{{ value.text }}{% endif %}]]
-{%- endmacro -%}
-== Allgemeines ==
-{{ rodelbahnbox }}
-{{ description | default("''Hier wird die Rodelbahn allgemein beschrieben.''") | trim }}
-{% raw %}
-* {{Position oben}}
-* {{Position unten}}
-* {{Höhenunterschied}}
-* {{Bahnlänge}}
-* {{Gehzeit}}
-{% endraw -%}
-* '''Beleuchtung''': {{ nightlight_description | default( nightlight_possible | default("''Unbekannt''") ) | trim }}
-* '''Rodelverleih''': {{ sled_rental_description | default( sled_rental_direct | german_bool | default("''Unbekannt''") ) | trim }}
-* '''Schneelage - Auskunft''':
-{%- for info in info_phone %}
-** {{ info.phone }} ({{ info.name }})
-{%- endfor %}
-{%- for info in info_web %}
-** {{ weblink(info) }}
-{%- endfor %}
-* '''Betreiber''': {{ operator }}
-* '''Hütten''':
-{%- for info in gastronomy %}
-** {% if info.wr_page %}{{ wr_page(info.wr_page) }}{% endif %}
-   {%- if info.weblink %}{{ weblink(info.weblink) }}{% endif %}
-   {%- if info.note %} ({{ info.note }}){% endif %}
-{%- endfor %}
-* '''Andere Rodelbahnen''':
-{% for info in sledrun_list %}
-** {{ wr_page(info) }}
-{% endfor -%}
-* '''Siehe auch''':
-{%- for info in see_also %}
-** {{ weblink(info) }}
-{%- endfor %}
-
-{% raw %}{{Buttonleiste{% endraw -%}
-|Bericht={{ allow_reports | default(true) | german_bool }}
-{%- if forum_id %}|ForumId={{ forum_id }}{% endif -%}
-{% if impressions_title %}|Impressionen={{ impressions_title }}{% endif -%}
-{%- if position %}|Wetter=Ja{% endif -%}
-{%- if videos %}|Video={{ videos[0].url }}{% endif -%}
-|Korrektur=Seite{% if correction_email %}|Korrektur_To={{ correction_email }}{% endif -%}
-{% if freizeitticket_tyrol %}|Freizeitticket=Ja{% endif -%}
-{% if regio_card_tyrol %}|Regiocard=Ja{% endif -%}}}
-{% raw %}{{Clear}}{% endraw %}
-
-
-== Landkarte ==
-{% if map_json is none -%}
-''leider ist derzeit keine [[Winterrodeln:Landkarte|Landkarte]] zu dieser Rodelbahn vorhanden''
-{%- else -%}
-{{ h.create_wrmap(map_json) }}
-{% raw %}{{Landkarte Legende}}<br/>{{GoogleMaps Hinweis}}{% endraw %}
-{%- endif %}
-
-
-== Anreise mit öffentlichen Verkehrsmitteln ==
-{% if public_transport_description -%}
-{{ public_transport_description | trim }}
-{%- else -%}
-''Hier wird die Anreise mit öffentlichen Verkehrsmitteln beschrieben.''
-{%- 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', {}))]) }}
-{% for template_name in ['monitor_template', 'route_arrival_template', 'route_departure_template'] -%}
-{% if template_name in pt_stop -%}
-** {{ h.json_template(pt_stop[template_name]) }}
-{% endif %}
-{%- endfor %}
-{%- endfor -%}
-{% for pt_line in public_transport_lines -%}
-{% if loop.first -%}
-* '''Fahrplan''':
-{%- endif %}
-** {% if pt_line.timetable_template is defined %}{{ h.json_template(pt_line.timetable_template) }}
-   {%- else %}{{ pt_line.name }}{% endif %}
-{%- endfor %}
-{% for link in public_transport_links -%}
-{% if loop.first -%}
-* '''Fahrplan''':
-{%- endif %}
-** {{ weblink(link) }}
-{%- endfor %}
-
-== Anreise mit dem Auto ==
-{% if car_description -%}
-{{ car_description | trim }}
-{%- else -%}
-''Hier wird die Anreise mit dem Auto beschrieben.''
-{%- endif %}
-
-{% for parking in sledrun_json.car_parking -%}
-* '''Parkplatz''': {{ h.list_template('Parkplatz', [h.json_pos_ele_position(parking.position), h.json_pos_ele_elevation(parking.position)]) }}
-{% endfor -%}
-{% for distance_info in sledrun_json.car_distances -%}
-{% if loop.first -%}
-* '''Entfernung''':
-{% endif -%}
-** {{ distance_info.route }}: {{ distance_info.km }} km
-{% endfor %}
-
-{% raw %}{{Rodelbahnzustand|Forumlink={% endraw %}{{ sledrun_json.forum_id }}}}
-
-[[Kategorie:Rodelbahn]]
-{% endblock %}

diff --git a/wrpylib/templates/sledrun_wikitext.txt b/wrpylib/templates/sledrun_wikitext.txt
new file mode 100644 (file)
index 0000000..bab2b76
--- /dev/null
+++ b/wrpylib/templates/sledrun_wikitext.txt
@@ -0,0 +1,113 @@
+{% block content %}
+{%- macro weblink(value) -%}
+{% if value.text %}[{{ value.url }} {{ value.text }}]{% else %}{{ value.url }}{% endif %}
+{%- endmacro %}
+{%- macro wr_page(value) -%}
+[[{{ value.title }}{% if value.text %}|{{ value.text }}{% endif %}]]
+{%- endmacro -%}
+== Allgemeines ==
+{{ rodelbahnbox }}
+{{ description | default("''Hier wird die Rodelbahn allgemein beschrieben.''") | trim }}
+{% raw %}
+* {{Position oben}}
+* {{Position unten}}
+* {{Höhenunterschied}}
+* {{Bahnlänge}}
+* {{Gehzeit}}
+{% endraw -%}
+* '''Beleuchtung''': {{ nightlight_description | default( nightlight_possible | default("''Unbekannt''") ) | trim }}
+* '''Rodelverleih''': {{ sled_rental_description | default( sled_rental_direct | german_bool | default("''Unbekannt''") ) | trim }}
+* '''Schneelage - Auskunft''':
+{%- for info in info_phone %}
+** {{ info.phone }} ({{ info.name }})
+{%- endfor %}
+{%- for info in info_web %}
+** {{ weblink(info) }}
+{%- endfor %}
+* '''Betreiber''': {{ operator }}
+* '''Hütten''':
+{%- for info in gastronomy %}
+** {% if info.wr_page %}{{ wr_page(info.wr_page) }}{% endif %}
+   {%- if info.weblink %}{{ weblink(info.weblink) }}{% endif %}
+   {%- if info.note %} ({{ info.note }}){% endif %}
+{%- endfor %}
+* '''Andere Rodelbahnen''':
+{% for info in sledrun_list %}
+** {{ wr_page(info) }}
+{% endfor -%}
+* '''Siehe auch''':
+{%- for info in see_also %}
+** {{ weblink(info) }}
+{%- endfor %}
+
+{% raw %}{{Buttonleiste{% endraw -%}
+|Bericht={{ allow_reports | default(true) | german_bool }}
+{%- if forum_id %}|ForumId={{ forum_id }}{% endif -%}
+{% if impressions_title %}|Impressionen={{ impressions_title }}{% endif -%}
+{%- if position %}|Wetter=Ja{% endif -%}
+{%- if videos %}|Video={{ videos[0].url }}{% endif -%}
+|Korrektur=Seite{% if correction_email %}|Korrektur_To={{ correction_email }}{% endif -%}
+{% if freizeitticket_tyrol %}|Freizeitticket=Ja{% endif -%}
+{% if regio_card_tyrol %}|Regiocard=Ja{% endif -%}}}
+{% raw %}{{Clear}}{% endraw %}
+
+
+== Landkarte ==
+{% if map_json is none -%}
+''leider ist derzeit keine [[Winterrodeln:Landkarte|Landkarte]] zu dieser Rodelbahn vorhanden''
+{%- else -%}
+{{ h.create_wrmap(map_json) }}
+{% raw %}{{Landkarte Legende}}<br/>{{GoogleMaps Hinweis}}{% endraw %}
+{%- endif %}
+
+
+== Anreise mit öffentlichen Verkehrsmitteln ==
+{% if public_transport_description -%}
+{{ public_transport_description | trim }}
+{%- else -%}
+''Hier wird die Anreise mit öffentlichen Verkehrsmitteln beschrieben.''
+{%- 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', {}))]) }}
+{% for template_name in ['monitor_template', 'route_arrival_template', 'route_departure_template'] -%}
+{% if template_name in pt_stop -%}
+** {{ h.json_template(pt_stop[template_name]) }}
+{% endif %}
+{%- endfor %}
+{%- endfor -%}
+{% for pt_line in public_transport_lines -%}
+{% if loop.first -%}
+* '''Fahrplan''':
+{%- endif %}
+** {% if pt_line.timetable_template is defined %}{{ h.json_template(pt_line.timetable_template) }}
+   {%- else %}{{ pt_line.name }}{% endif %}
+{%- endfor %}
+{% for link in public_transport_links -%}
+{% if loop.first -%}
+* '''Fahrplan''':
+{%- endif %}
+** {{ weblink(link) }}
+{%- endfor %}
+
+== Anreise mit dem Auto ==
+{% if car_description -%}
+{{ car_description | trim }}
+{%- else -%}
+''Hier wird die Anreise mit dem Auto beschrieben.''
+{%- endif %}
+
+{% for parking in sledrun_json.car_parking -%}
+* '''Parkplatz''': {{ h.list_template('Parkplatz', [h.json_pos_ele_position(parking.position), h.json_pos_ele_elevation(parking.position)]) }}
+{% endfor -%}
+{% for distance_info in sledrun_json.car_distances -%}
+{% if loop.first -%}
+* '''Entfernung''':
+{% endif -%}
+** {{ distance_info.route }}: {{ distance_info.km }} km
+{% endfor %}
+
+{% raw %}{{Rodelbahnzustand|Forumlink={% endraw %}{{ sledrun_json.forum_id }}}}
+
+[[Kategorie:Rodelbahn]]
+{% endblock %}

diff --git a/wrpylib/wrmwmarkup.py b/wrpylib/wrmwmarkup.py
index 16893a2610a15235351640fd1e09e7aae4ddac76..8e843f9aec54bce9440df3ee842b6f4846a129d2 100644 (file)
--- a/wrpylib/wrmwmarkup.py
+++ b/wrpylib/wrmwmarkup.py
@@ -394,7 +394,7 @@ def create_sledrun_wiki(sledrun_json: Dict, map_json: Optional[Dict], impression
         autoescape=jinja2.select_autoescape(),
     )
     env.filters["german_bool"] = german_bool
         autoescape=jinja2.select_autoescape(),
     )
     env.filters["german_bool"] = german_bool

-    template = env.get_template("sledrun_wiki.txt")
+    template = env.get_template("sledrun_wikitext.txt")

 
     def position_to_lon_lat(value: Optional[dict]) -> Optional[LonLat]:
         if value is not None:
 
     def position_to_lon_lat(value: Optional[dict]) -> Optional[LonLat]:
         if value is not None: