Changeset 1293

Timestamp:

05/01/08 16:02:17 (7 months ago)

Author:

sgillies

Message:

line strings and polygons

Files:

• pleiades.keytree/trunk/keytree/factory.py (modified) (1 diff)
• pleiades.keytree/trunk/keytree/model.py (modified) (1 diff)
• pleiades.keytree/trunk/keytree/tests/features.txt (modified) (2 diffs)
• pleiades.keytree/trunk/keytree/tests/pleiades-kml.txt (added)

pleiades.keytree/trunk/keytree/factory.py

@@ -6 +6 @@
-from keytree.model import GEOM_TYPES
-
-
-
+
+
+
+
+
-    for geom_type in GEOM_TYPES:
-        tag = '{%s}%s' % (kmlns, geom_type)
-etry_element = placemark_
-etry
-etry
-g
-None
+_element = 
+
+
+kid, g, name=name, description=description
+kid, None, name=name, description=description
-
-geometry_
-geometry_
+
+
-    kmlns = tp[0][1:]
-    geom_type = tp[1]
-geometry_
+
-
-geometry_
-geometry_
+
+
-    tv = t.split(',')
-    return Geometry('Point', tuple([float(v) for v in tv]))
-
+def geometry_LineString(element, kmlns):
+    text = element.findtext('{%s}coordinates' % kmlns)
+    ts = text.split()
+    coords = []
+    for t in ts:
+        tv = t.split(',')
+        coords.append(tuple([float(v) for v in tv]))
+    return Geometry('LineString', tuple(coords))
+
+def geometry_Polygon(element, kmlns):
+    shell = element.find('{%s}outerBoundaryIs' % kmlns)
+    text = shell.findtext('*/{%s}coordinates' % kmlns)
+    ts = text.split()
+    shell_coords = []
+    for t in ts:
+        tv = t.split(',')
+        shell_coords.append(tuple([float(v) for v in tv]))
+    poly_coords = []
+    poly_coords.append(tuple(shell_coords))
+
+    holes = element.findall('{%s}innerBoundaryIs' % kmlns)
+    for hole in holes:
+        text = hole.findtext('*/{%s}coordinates' % kmlns)
+        ts = text.split()
+        hole_coords = []
+        for t in ts:
+            tv = t.split(',')
+            hole_coords.append(tuple([float(v) for v in tv]))
+        poly_coords.append(tuple(hole_coords))
+
+    return Geometry('Polygon', tuple(poly_coords))
+
-geometry_factory = {
-    'Point': geometry_Point,
+    'LineString': geometry_LineString,
+    'Polygon': geometry_Polygon,
-    }

pleiades.keytree/trunk/keytree/model.py

@@ -24 +24 @@
-class Feature(object):
-
-
+
+
-        self.geometry = geometry
+        self.properties = properties or {}
+        self.properties.update(kw)
-
-    @property
-    def __geo_interface__(self):
-
+
+
+
+
+

pleiades.keytree/trunk/keytree/tests/features.txt

@@ -2 +2 @@
-===========================================
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    >>> from elementtree import ElementTree as etree
-
-
-
-
+
+
-
-    >>> from keytree import feature
@@ -14 +63 @@
-    'Point'
-    >>> print f.geometry.coordinates
-21.9725, 32.89629
+-122.36438..., 37.82466
-    >>> gi = f.__geo_interface__
-    >>> gi['geometry']['type']
-    'Point'
-    >>> print gi['geometry']['coordinates']
-
+
+
+
+
+
-
+    >>> f = feature(placemarks[1])
+    >>> f.geometry.type
+    'LineString'
+    >>> print f.geometry.coordinates
+    ((-122.36438..., 37.82466..., 0.0), (-122.36415..., 37.82432..., 0.0))
+    >>> gi = f.__geo_interface__
+    >>> gi['geometry']['type']
+    'LineString'
+    >>> print gi['geometry']['coordinates']
+    ((-122.36438..., 37.82466..., 0.0), (-122.36415..., 37.82432..., 0.0))
+    >>> gi['properties']['name']
+    'line string'
+    >>> gi['properties']['description']
+    'LineString test'
+
+    >>> f = feature(placemarks[2])
+    >>> f.geometry.type
+    'Polygon'
+    >>> shell, hole = f.geometry.coordinates
+    >>> print shell
+    ((-122.36627..., 37.81884..., 30.0), ...)
+    >>> print hole
+    ((-122.366212, 37.81897..., 30.0), ...)