We don't need the investigate() function anymore.

[philipp/winterrodeln/wrpylib.git] / wrpylib / wrmwmarkup.py

diff --git a/wrpylib/wrmwmarkup.py b/wrpylib/wrmwmarkup.py
index 66969af09cc6c954c5bec6f6b7a430a48e1ef3fc..b6b55e6c301ff76fc77c9efae34425e708ccf0d3 100644 (file)
--- a/wrpylib/wrmwmarkup.py
+++ b/wrpylib/wrmwmarkup.py
@@ -152,96 +152,6 @@ class ParseError(RuntimeError):
     pass
 
 
-
-def find_template_PositionOben(wikitext):
-    """Same as find_template_latlon_ele with template '{{Position oben|47.076207 N 11.453553 E|1890}}'"""
-    return find_template_latlon_ele(wikitext, 'Position oben')
-
-
-def create_template_PositionOben(lat, lon, ele):
-    return create_template_latlon_ele('Position, oben', lat, lon, ele)
-
-
-def find_template_PositionUnten(wikitext):
-    """Same as find_template_latlon_ele with template '{{Position unten|47.076207 N 11.453553 E|1890}}'"""
-    return find_template_latlon_ele(wikitext, 'Position unten')
-
-
-def find_template_unsigned(wikitext, template_title):
-    """Finds the first occurance of the '{{template_title|1890}}' template
-    and returns the tuple (start, end, unsigned_value) or (None, None, None) if the
-    template was not found. If the template has no valid format, an exception is thrown."""
-    start, end = wrpylib.mwmarkup.find_template(wikitext, template_title)
-    if start is None: return (None,) * 3
-    title, params = wrpylib.mwmarkup.split_template(wikitext[start:end])
-    unsigned_value = wrpylib.wrvalidators.UnsignedNone().to_python(params['1'].strip())
-    return start, end, unsigned_value
-
-
-def create_template_unsigned(template_title, unsigned):
-    unsigned = wrpylib.wrvalidators.UnsignedNone().from_python(unsigned)
-    if len(unsigned) == 0: unsigned = ' '
-    return wrpylib.mwmarkup.create_template(template_title, [unsigned])
-
-
-def find_template_Hoehenunterschied(wikitext):
-    """Same as find_template_unsigned with template '{{Höhenunterschied|350}}'"""
-    return find_template_unsigned(wikitext, 'Höhenunterschied')
-
-
-def create_template_Hoehenunterschied(ele_diff):
-    return create_template_unsigned('Höhenunterschied', ele_diff)
-
-
-def find_template_Bahnlaenge(wikitext):
-    """Same as find_template_unsigned with template '{{Bahnlänge|4500}}'"""
-    return find_template_unsigned(wikitext, 'Bahnlänge')
-
-
-def create_template_Bahnlaenge(length):
-    return create_template_unsigned('Bahnlänge', length)
-
-
-def find_template_Gehzeit(wikitext):
-    """Same as find_template_unsigned with template '{{Gehzeit|60}}'"""
-    return find_template_unsigned(wikitext, 'Gehzeit')
-
-
-def create_template_Gehzeit(walkup_time):
-    return create_template_unsigned('Gehzeit', walkup_time)
-
-
-def find_template_Forumlink(wikitext):
-    """Same as find_template_unsigned with template '{{Forumlink|26}}'"""
-    start, end = wrpylib.mwmarkup.find_template(wikitext, 'Forumlink')
-    if start is None: return (None,) * 3
-    title, params = wrpylib.mwmarkup.split_template(wikitext[start:end])
-    forumid = params['1'].strip()
-    if forumid == '<nummer einfügen>': unsigned_value = None
-    else: unsigned_value = wrpylib.wrvalidators.UnsignedNone().to_python(forumid)
-    return start, end, unsigned_value
-    # return find_template_unsigned(wikitext, u'Forumlink')
-
-
-def find_template_Parkplatz(wikitext):
-    """Same as find_template_latlon_ele with template '{{Parkplatz|47.076207 N 11.453553 E|1890}}'"""
-    return find_template_latlon_ele(wikitext, 'Parkplatz')
-
-
-def find_template_Haltestelle(wikitext):
-    """Finds the first occurance of the '{{Haltestelle|Ortsname|Haltestellenname|47.076207 N 11.453553 E|1890}}' template
-    and returns the tuple (start, end, city, stop, lat, lon, ele) or (None, None, None, None, None, None, None) if the
-    template was not found. If the template has no valid format, an exception is thrown."""
-    start, end = wrpylib.mwmarkup.find_template(wikitext, 'Haltestelle')
-    if start is None: return (None,) * 7
-    title, params = wrpylib.mwmarkup.split_template(wikitext[start:end])
-    city = wrpylib.wrvalidators.UnicodeNone().to_python(params['1'].strip())
-    stop = wrpylib.wrvalidators.UnicodeNone().to_python(params['2'].strip())
-    lat, lon = wrpylib.wrvalidators.GeoNone().to_python(params['3'].strip())
-    ele = wrpylib.wrvalidators.UnsignedNone().to_python(params['4'].strip())
-    return start, end, city, stop, lat, lon, ele
-
-
 def parse_wrmap_coordinates(coords):
     """gets a string coordinates and returns an array of lon/lat coordinate pairs, e.g.
     47.12 N 11.87 E
@@ -266,7 +176,7 @@ WRMAP_LINE_TYPES = ['rodelbahn', 'gehweg', 'alternative', 'lift', 'anfahrt', 'li
 
 
 def parse_wrmap(wikitext):
-    """Parses the (unicode) u'<wrmap ...>content</wrmap>' of the Winterrodeln wrmap extension.
+    """Parses the '<wrmap ...>content</wrmap>' of the Winterrodeln wrmap extension.
     If wikitext does not contain the <wrmap> tag or if the <wrmap> tag contains 
     invalid formatted lines, a ParseError is raised.
     Use wrpylib.mwmarkup.find_tag(wikitext, 'wrmap') to find the wrmap tag within an arbitrary
@@ -274,7 +184,7 @@ def parse_wrmap(wikitext):
 
     :param wikitext: wikitext containing only the template. Example:
 
-    wikitext = u'''
+    wikitext = '''
     <wrmap lat="47.2417134" lon="11.21408895" zoom="14" width="700" height="400">
     <gasthaus name="Rosskogelhütte" wiki="Rosskogelhütte">47.240689 11.190454</gasthaus>
     <parkplatz>47.245789 11.238971</parkplatz>
@@ -290,7 +200,7 @@ def parse_wrmap(wikitext):
     """
     # parse XML
     try:
-        wrmap_xml = xml.etree.ElementTree.fromstring(wikitext.encode('utf-8'))
+        wrmap_xml = xml.etree.ElementTree.fromstring(wikitext)
     except xml.etree.ElementTree.ParseError as e:
         row, column = e.position
         raise ParseError("XML parse error on row {}, column {}: {}".format(row, column, e))