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 7c63e27de790ecc4815a877807abd24a9f8f85ba..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)
     """
@@ -361,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,7 +386,7 @@ def parse_wrmap_coordinates(coords):
 
 def parse_wrmap(wikitext):
     """Parses the (unicode) u'<wrmap ...>content</wrmap>' of the Winterrodeln wrmap extension.
-    If wikitext does not contain the <wrmap> tax or if the <wrmap> tag contains 
+    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.