Now the width and height of the map are parsed from <googlemap> as well.

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

diff --git a/wrpylib/wrmwmarkup.py b/wrpylib/wrmwmarkup.py
index 6877f472a67c942c9b180ea293517bd542d0a3b0..bcd230f5eac640642fc7d090abd43e30215d13a0 100644 (file)
--- a/wrpylib/wrmwmarkup.py
+++ b/wrpylib/wrmwmarkup.py
@@ -324,7 +324,7 @@ def find_all_templates(wikitext, find_func):
     return results
 
 
-def googlemap_to_wrmap(center, zoom, coords, paths):
+def googlemap_to_wrmap(attributes, coords, paths):
     """Converts the output of parse_googlemap to the GeoJSON format wrmap uses.
     :returns: (GeoJSON as nested Python datatypes)
     """
@@ -333,8 +333,7 @@ def googlemap_to_wrmap(center, zoom, coords, paths):
     # point
     for point in coords:
         lon, lat, symbol, title = point
-        properties = {}
-        if symbol is not None: properties['type'] = symbol.lower()
+        properties = {'type': 'punkt' if symbol is None else symbol.lower()}
         if title is not None: properties['name'] = title
         json_features.append({
             'type': 'Feature',
@@ -362,7 +361,7 @@ def googlemap_to_wrmap(center, zoom, coords, paths):
     geojson = {
             'type': 'FeatureCollection',
             'features': json_features,
-            'properties': {'lon': center[0], 'lat': center[1], 'zoom': zoom}}
+            'properties': attributes}
     return geojson
 
 
@@ -386,11 +385,13 @@ def parse_wrmap_coordinates(coords):
 
 
 def parse_wrmap(wikitext):
-    """Parses the (unicode) u'<wrmap ...>content</wrmap>' of the Winterrodeln wrmap extension
-    out of a page. If wikitext does not contain the wrmap extension text None is returned.
-    If the wrmap contains invalid formatted lines, a ParseError is raised.
+    """Parses the (unicode) u'<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
+    wikitext before using this function.
 
-    :param wikitext: wikitext containing the template. Example:
+    :param wikitext: wikitext containing only the template. Example:
 
     wikitext = u'''
     <wrmap lat="47.2417134" lon="11.21408895" zoom="14" width="700" height="400">