Changeset 5805

Timestamp:

08/05/07 20:13:49 (1 year ago)

Author:

jbronn

Message:

gis: geos: added support for KML; added coords property to Point.

Files:

• django/branches/gis/django/contrib/gis/geos/base.py (modified) (2 diffs)
• django/branches/gis/django/contrib/gis/geos/collections.py (modified) (2 diffs)
• django/branches/gis/django/contrib/gis/geos/coordseq.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/geos/geometries.py (modified) (3 diffs)
• django/branches/gis/django/contrib/gis/tests/geometries.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/tests/test_geos.py (modified) (4 diffs)

django/branches/gis/django/contrib/gis/geos/base.py

@@ -205 +205 @@
-    def getquoted(self):
-        "Returns a properly quoted string for use in PostgresSQL/PostGIS."
-
-
+
+
+
-    
-    #### Coordinate Sequence Routines ####
@@ -385 +386 @@
-        h = lgeos.GEOSGeomToHEX_buf(self._ptr(), byref(sz))
-        return string_at(h, sz.value)
+
+    @property
+    def kml(self):
+        "Returns the KML representation of this Geometry."
+        gtype = self.geom_type
+        return '<%s>%s</%s>' % (gtype, self.coord_seq.kml, gtype)
-
-    #### Topology Routines ####

django/branches/gis/django/contrib/gis/geos/collections.py

@@ -86 +86 @@
-        # Creating a new geometry collection from the list, and
-        #  re-assigning the pointers.
-
+, **{'srid':self.srid}
-        self._reassign(new_collection)
-        
@@ -115 +115 @@
-            self._geoms[i] = GEOSPointer(lgeos.GEOSGetGeometryN(self._ptr(), c_int(i)))
-
+    @property
+    def kml(self):
+        "Returns the KML for this Geometry Collection."
+        kml = '<MultiGeometry>'
+        for g in self: kml += g.kml
+        return kml + '</MultiGeometry>'
+
-# MultiPoint, MultiLineString, and MultiPolygon class definitions.
-class MultiPoint(GeometryCollection): 

django/branches/gis/django/contrib/gis/geos/coordseq.py

@@ -163 +163 @@
-
-    @property
+    def kml(self):
+        "Returns the KML representation for the coordinates."
+        # Getting the substitution string depending on whether the coordinates have
+        #  a Z dimension.
+        if self.hasz: substr = '%s,%s,%s '
+        else: substr = '%s,%s,0 '
+        kml = '<coordinates>'
+        for i in xrange(len(self)):
+            kml += substr % self[i]
+        return kml.strip() + '</coordinates>'
+
+    @property
-    def tuple(self):
-        "Returns a tuple version of this coordinate sequence."

django/branches/gis/django/contrib/gis/geos/geometries.py

@@ -110 +110 @@
-
-    ### Tuple setting and retrieval routines. ###
-tuple
+coords
-        "Returns a tuple of the point."
-        return self._cs.tuple
-
-tuple
+coords
-        "Sets the coordinates of the point with the given tuple."
-        self._cs[0] = tup
-    
-
-
+
+
+
-
-class LineString(GEOSGeometry):
@@ -333 +334 @@
-
-        # Constructing the new Polygon with the ring parameters, and reassigning the internals.
-
+, **{'srid':self.srid}
-        self._reassign(new_poly)
-
@@ -402 +403 @@
-        return tuple(self.__getitem__(i).tuple for i in xrange(self.__len__()))
-
+    @property
+    def kml(self):
+        "Returns the KML representation of this Polygon."
+        inner_kml = ''
+        if self.num_interior_rings > 0: 
+            for i in xrange(self.num_interior_rings):
+                inner_kml += "<innerBoundaryIs>%s</innerBoundaryIs>" % self[i+1].kml
+        return "<Polygon><outerBoundaryIs>%s</outerBoundaryIs>%s</Polygon>" % (self[0].kml, inner_kml)

django/branches/gis/django/contrib/gis/tests/geometries.py

@@ -35 +35 @@
-
-# WKT Output
-
-
-
-
-
-
-
+, kml='<Point><coordinates>110.0,130.0,0</coordinates></Point>'
+, kml='<LineString><coordinates>40.0,40.0,0 50.0,130.0,0 130.0,130.0,0</coordinates></LineString>'
+, kml='<Polygon><outerBoundaryIs><LinearRing><coordinates>150.0,150.0,0 410.0,150.0,0 280.0,20.0,0 20.0,20.0,0 150.0,150.0,0</coordinates></LinearRing></outerBoundaryIs><innerBoundaryIs><LinearRing><coordinates>170.0,120.0,0 330.0,120.0,0 260.0,50.0,0 100.0,50.0,0 170.0,120.0,0</coordinates></LinearRing></innerBoundaryIs></Polygon>'
+, kml='<MultiGeometry><Point><coordinates>10.0,80.0,0</coordinates></Point><Point><coordinates>110.0,170.0,0</coordinates></Point><Point><coordinates>110.0,120.0,0</coordinates></Point></MultiGeometry>'
+, kml='<MultiGeometry><LineString><coordinates>110.0,100.0,0 40.0,30.0,0 180.0,30.0,0</coordinates></LineString><LineString><coordinates>170.0,30.0,0 110.0,90.0,0 50.0,30.0,0</coordinates></LineString></MultiGeometry>'
+, kml='<MultiGeometry><Polygon><outerBoundaryIs><LinearRing><coordinates>110.0,110.0,0 70.0,200.0,0 150.0,200.0,0 110.0,110.0,0</coordinates></LinearRing></outerBoundaryIs><innerBoundaryIs><LinearRing><coordinates>110.0,110.0,0 100.0,180.0,0 120.0,180.0,0 110.0,110.0,0</coordinates></LinearRing></innerBoundaryIs></Polygon><Polygon><outerBoundaryIs><LinearRing><coordinates>110.0,110.0,0 150.0,20.0,0 70.0,20.0,0 110.0,110.0,0</coordinates></LinearRing></outerBoundaryIs><innerBoundaryIs><LinearRing><coordinates>110.0,110.0,0 120.0,40.0,0 100.0,40.0,0 110.0,110.0,0</coordinates></LinearRing></innerBoundaryIs></Polygon></MultiGeometry>'
+, kml='<MultiGeometry><Point><coordinates>110.0,260.0,0</coordinates></Point><LineString><coordinates>110.0,0.0,0 110.0,60.0,0</coordinates></LineString></MultiGeometry>'
-           )
-

django/branches/gis/django/contrib/gis/tests/test_geos.py

@@ -23 +23 @@
-            self.assertEqual(g.hex, geom.hex)
-
-
+
+
+
+
+
+
+
+
-        "Testing the Error handlers."
-        print "\nBEGIN - expecting GEOS_ERROR; safe to ignore.\n"
@@ -56 +63 @@
-                self.assertEqual(p.z, pnt.tuple[2], 9)
-                tup_args = (p.x, p.y, p.z)
-
+
+
-            else:
-                self.assertEqual(False, pnt.hasz)
-                self.assertEqual(None, pnt.z)
-                tup_args = (p.x, p.y)
-
+
+
-
-            # Centroid operation on point should be point itself
@@ -78 +87 @@
-            self.assertEqual(2.71, pnt.x)
-
-
-
-
-
+
+
+
+
+
+
-            prev = pnt # setting the previous geometry
-
@@ -308 +319 @@
-        for p in pts:
-            self.assertRaises(GEOSException, str, p) # tests p's geometry pointer
-tuple
+coords
-
-        # Now doing this with a GeometryCollection