Changeset 1830

Timestamp:

10/31/08 16:54:48 (2 months ago)

Author:

egj

Message:

fix #328; geometries apparently are no longer wrapped in <georss:where>, so i commented out the thing marked as a hack for that

Files:

• siteapp/trunk/opengeo/almanac/kml.py (modified) (1 diff)

siteapp/trunk/opengeo/almanac/kml.py

@@ -23 +23 @@
 
 #@@ hack - while geometries are stored as gml in 900913 wrapped in georss:where, we need to do some stripping
+# looks like geometries are no longer wrapped in georss:where as of oct 31
 _re_georss = re.compile(r'<georss:where.*?>(.*?)</georss:where>')
 def gml2geom(geometry):
     """Returns a shapely geometry in Geographic/WGS84."""
     # remove georss:where tag to get geometry in gml
-    gml_string = _re_georss.match(geometry).group(1)
+    #gml_string = _re_georss.match(geometry).group(1)
     # convert to shapely geometry
-    geometry = gml.read(gml_string)
+    geometry = gml.read(geometry)
     # transform to geographic/wgs84
     return srs.transform(geometry, "epsg:900913", "epsg:4326")