From 315ae1ce6ea6ff5d8f6f69e57d6a92719dd69fd6 Mon Sep 17 00:00:00 2001
From: Justin Bronn <jbronn@gmail.com>
Date: Mon, 1 Nov 2010 21:56:48 +0000
Subject: [PATCH] Fixed regression introduced in r13755 that prevented the
 running of the GEOS/GDAL test suites without configuring Django settings;
 moved reference geometry data from Python module to compressed JSON fixture;
 put in workaround in tests for GDAL bug #3783.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/gis/gdal/tests/test_ds.py      |  49 ++---
 django/contrib/gis/gdal/tests/test_geom.py    |  86 ++++-----
 django/contrib/gis/geometry/test_data.py      | 100 ++++++++++
 django/contrib/gis/geos/tests/test_geos.py    | 144 +++++++-------
 .../contrib/gis/tests/data/geometries.json.gz | Bin 0 -> 9100 bytes
 django/contrib/gis/tests/geometries.py        | 180 ------------------
 6 files changed, 232 insertions(+), 327 deletions(-)
 create mode 100644 django/contrib/gis/geometry/test_data.py
 create mode 100644 django/contrib/gis/tests/data/geometries.json.gz
 delete mode 100644 django/contrib/gis/tests/geometries.py

diff --git a/django/contrib/gis/gdal/tests/test_ds.py b/django/contrib/gis/gdal/tests/test_ds.py
index 1abea785ca..e1083b2a35 100644
--- a/django/contrib/gis/gdal/tests/test_ds.py
+++ b/django/contrib/gis/gdal/tests/test_ds.py
@@ -1,20 +1,7 @@
 import os, os.path, unittest
-from django.contrib.gis.gdal import DataSource, Envelope, OGRGeometry, OGRException, OGRIndexError
+from django.contrib.gis.gdal import DataSource, Envelope, OGRGeometry, OGRException, OGRIndexError, GDAL_VERSION
 from django.contrib.gis.gdal.field import OFTReal, OFTInteger, OFTString
-from django.contrib import gis
-
-# Path for SHP files
-data_path = os.path.join(os.path.dirname(gis.__file__), 'tests' + os.sep + 'data')
-def get_ds_file(name, ext):
-    return os.sep.join([data_path, name, name + '.%s' % ext])
-
-# Test SHP data source object
-class TestDS:
-    def __init__(self, name, **kwargs):
-        ext = kwargs.pop('ext', 'shp')
-        self.ds = get_ds_file(name, ext)
-        for key, value in kwargs.items():
-            setattr(self, key, value)
+from django.contrib.gis.geometry.test_data import get_ds_file, TestDS
 
 # List of acceptable data sources.
 ds_list = (TestDS('test_point', nfeat=5, nfld=3, geom='POINT', gtype=1, driver='ESRI Shapefile',
@@ -28,7 +15,7 @@ ds_list = (TestDS('test_point', nfeat=5, nfld=3, geom='POINT', gtype=1, driver='
                   extent=(1.0, 2.0, 100.0, 523.5), # Min/Max from CSV
                   field_values={'POINT_X' : ['1.0', '5.0', '100.0'], 'POINT_Y' : ['2.0', '23.0', '523.5'], 'NUM' : ['5', '17', '23']},
                   fids=range(1,4)),
-           TestDS('test_poly', nfeat=3, nfld=3, geom='POLYGON', gtype=3, 
+           TestDS('test_poly', nfeat=3, nfld=3, geom='POLYGON', gtype=3,
                   driver='ESRI Shapefile',
                   fields={'float' : OFTReal, 'int' : OFTInteger, 'str' : OFTString,},
                   extent=(-1.01513,-0.558245,0.161876,0.839637), # Got extent from QGIS
@@ -63,7 +50,7 @@ class DataSourceTest(unittest.TestCase):
                 pass
             else:
                 self.fail('Expected an IndexError!')
-                        
+
     def test02_invalid_shp(self):
         "Testing invalid SHP files for the Data Source."
         for source in bad_ds:
@@ -76,7 +63,7 @@ class DataSourceTest(unittest.TestCase):
             ds = DataSource(source.ds)
 
             # Incrementing through each layer, this tests DataSource.__iter__
-            for layer in ds:                
+            for layer in ds:
                 # Making sure we get the number of features we expect
                 self.assertEqual(len(layer), source.nfeat)
 
@@ -85,16 +72,22 @@ class DataSourceTest(unittest.TestCase):
                 self.assertEqual(source.nfld, len(layer.fields))
 
                 # Testing the layer's extent (an Envelope), and it's properties
-                self.assertEqual(True, isinstance(layer.extent, Envelope))
-                self.assertAlmostEqual(source.extent[0], layer.extent.min_x, 5)
-                self.assertAlmostEqual(source.extent[1], layer.extent.min_y, 5)
-                self.assertAlmostEqual(source.extent[2], layer.extent.max_x, 5)
-                self.assertAlmostEqual(source.extent[3], layer.extent.max_y, 5)
+                if source.driver == 'VRT' and (GDAL_VERSION > (1, 7, 0) and GDAL_VERSION < (1, 7, 3)):
+                    # There's a known GDAL regression with retrieving the extent
+                    # of a VRT layer in versions 1.7.0-1.7.2:
+                    #  http://trac.osgeo.org/gdal/ticket/3783
+                    pass
+                else:
+                    self.assertEqual(True, isinstance(layer.extent, Envelope))
+                    self.assertAlmostEqual(source.extent[0], layer.extent.min_x, 5)
+                    self.assertAlmostEqual(source.extent[1], layer.extent.min_y, 5)
+                    self.assertAlmostEqual(source.extent[2], layer.extent.max_x, 5)
+                    self.assertAlmostEqual(source.extent[3], layer.extent.max_y, 5)
 
                 # Now checking the field names.
                 flds = layer.fields
                 for f in flds: self.assertEqual(True, f in source.fields)
-                
+
                 # Negative FIDs are not allowed.
                 self.assertRaises(OGRIndexError, layer.__getitem__, -1)
                 self.assertRaises(OGRIndexError, layer.__getitem__, 50000)
@@ -115,7 +108,7 @@ class DataSourceTest(unittest.TestCase):
                         for fld_name in fld_names:
                             self.assertEqual(source.field_values[fld_name][i], feat.get(fld_name))
         print "\nEND - expecting out of range feature id error; safe to ignore."
-                        
+
     def test03b_layer_slice(self):
         "Test indexing and slicing on Layers."
         # Using the first data-source because the same slice
@@ -146,7 +139,7 @@ class DataSourceTest(unittest.TestCase):
         # Making sure we can call OGR routines on the Layer returned.
         lyr = get_layer()
         self.assertEqual(source.nfeat, len(lyr))
-        self.assertEqual(source.gtype, lyr.geom_type.num)        
+        self.assertEqual(source.gtype, lyr.geom_type.num)
 
     def test04_features(self):
         "Testing Data Source Features."
@@ -170,7 +163,7 @@ class DataSourceTest(unittest.TestCase):
 
                     # Testing Feature.__iter__
                     for fld in feat: self.assertEqual(True, fld.name in source.fields.keys())
-                        
+
     def test05_geometries(self):
         "Testing Geometries from Data Source Features."
         for source in ds_list:
@@ -223,7 +216,7 @@ class DataSourceTest(unittest.TestCase):
         # should indicate that there are 3 features in the Layer.
         lyr.spatial_filter = None
         self.assertEqual(3, len(lyr))
-        
+
 def suite():
     s = unittest.TestSuite()
     s.addTest(unittest.makeSuite(DataSourceTest))
diff --git a/django/contrib/gis/gdal/tests/test_geom.py b/django/contrib/gis/gdal/tests/test_geom.py
index 5e973e5c5d..1a1f2b9f34 100644
--- a/django/contrib/gis/gdal/tests/test_geom.py
+++ b/django/contrib/gis/gdal/tests/test_geom.py
@@ -1,11 +1,10 @@
 from django.contrib.gis.gdal import OGRGeometry, OGRGeomType, \
     OGRException, OGRIndexError, SpatialReference, CoordTransform, \
     gdal_version
-from django.contrib.gis.tests.geometries import *
 from django.utils import unittest
+from django.contrib.gis.geometry.test_data import TestDataMixin
 
-
-class OGRGeomTest(unittest.TestCase):
+class OGRGeomTest(unittest.TestCase, TestDataMixin):
     "This tests the OGR Geometry."
 
     def test00a_geomtype(self):
@@ -56,7 +55,7 @@ class OGRGeomTest(unittest.TestCase):
 
     def test01a_wkt(self):
         "Testing WKT output."
-        for g in wkt_out:
+        for g in self.geometries.wkt_out:
             geom = OGRGeometry(g.wkt)
             self.assertEqual(g.wkt, geom.wkt)
 
@@ -73,13 +72,13 @@ class OGRGeomTest(unittest.TestCase):
 
     def test01b_gml(self):
         "Testing GML output."
-        for g in wkt_out:
+        for g in self.geometries.wkt_out:
             geom = OGRGeometry(g.wkt)
             self.assertEqual(g.gml, geom.gml)
 
     def test01c_hex(self):
         "Testing HEX input/output."
-        for g in hex_wkt:
+        for g in self.geometries.hex_wkt:
             geom1 = OGRGeometry(g.wkt)
             self.assertEqual(g.hex, geom1.hex)
             # Constructing w/HEX
@@ -89,7 +88,7 @@ class OGRGeomTest(unittest.TestCase):
     def test01d_wkb(self):
         "Testing WKB input/output."
         from binascii import b2a_hex
-        for g in hex_wkt:
+        for g in self.geometries.hex_wkt:
             geom1 = OGRGeometry(g.wkt)
             wkb = geom1.wkb
             self.assertEqual(b2a_hex(wkb).upper(), g.hex)
@@ -101,7 +100,7 @@ class OGRGeomTest(unittest.TestCase):
         "Testing GeoJSON input/output."
         from django.contrib.gis.gdal.prototypes.geom import GEOJSON
         if not GEOJSON: return
-        for g in json_geoms:
+        for g in self.geometries.json_geoms:
             geom = OGRGeometry(g.wkt)
             if not hasattr(g, 'not_equal'):
                 self.assertEqual(g.json, geom.json)
@@ -112,7 +111,7 @@ class OGRGeomTest(unittest.TestCase):
         "Testing Point objects."
 
         prev = OGRGeometry('POINT(0 0)')
-        for p in points:
+        for p in self.geometries.points:
             if not hasattr(p, 'z'): # No 3D
                 pnt = OGRGeometry(p.wkt)
                 self.assertEqual(1, pnt.geom_type)
@@ -123,8 +122,7 @@ class OGRGeomTest(unittest.TestCase):
 
     def test03_multipoints(self):
         "Testing MultiPoint objects."
-
-        for mp in multipoints:
+        for mp in self.geometries.multipoints:
             mgeom1 = OGRGeometry(mp.wkt) # First one from WKT
             self.assertEqual(4, mgeom1.geom_type)
             self.assertEqual('MULTIPOINT', mgeom1.geom_name)
@@ -135,38 +133,38 @@ class OGRGeomTest(unittest.TestCase):
                 mgeom3.add(g.wkt) # should take WKT as well
             self.assertEqual(mgeom1, mgeom2) # they should equal
             self.assertEqual(mgeom1, mgeom3)
-            self.assertEqual(mp.points, mgeom2.tuple)
+            self.assertEqual(mp.coords, mgeom2.coords)
             self.assertEqual(mp.n_p, mgeom2.point_count)
 
     def test04_linestring(self):
         "Testing LineString objects."
         prev = OGRGeometry('POINT(0 0)')
-        for ls in linestrings:
+        for ls in self.geometries.linestrings:
             linestr = OGRGeometry(ls.wkt)
             self.assertEqual(2, linestr.geom_type)
             self.assertEqual('LINESTRING', linestr.geom_name)
             self.assertEqual(ls.n_p, linestr.point_count)
-            self.assertEqual(ls.tup, linestr.tuple)
+            self.assertEqual(ls.coords, linestr.tuple)
             self.assertEqual(True, linestr == OGRGeometry(ls.wkt))
             self.assertEqual(True, linestr != prev)
             self.assertRaises(OGRIndexError, linestr.__getitem__, len(linestr))
             prev = linestr
 
             # Testing the x, y properties.
-            x = [tmpx for tmpx, tmpy in ls.tup]
-            y = [tmpy for tmpx, tmpy in ls.tup]
+            x = [tmpx for tmpx, tmpy in ls.coords]
+            y = [tmpy for tmpx, tmpy in ls.coords]
             self.assertEqual(x, linestr.x)
             self.assertEqual(y, linestr.y)
 
     def test05_multilinestring(self):
         "Testing MultiLineString objects."
         prev = OGRGeometry('POINT(0 0)')
-        for mls in multilinestrings:
+        for mls in self.geometries.multilinestrings:
             mlinestr = OGRGeometry(mls.wkt)
             self.assertEqual(5, mlinestr.geom_type)
             self.assertEqual('MULTILINESTRING', mlinestr.geom_name)
             self.assertEqual(mls.n_p, mlinestr.point_count)
-            self.assertEqual(mls.tup, mlinestr.tuple)
+            self.assertEqual(mls.coords, mlinestr.tuple)
             self.assertEqual(True, mlinestr == OGRGeometry(mls.wkt))
             self.assertEqual(True, mlinestr != prev)
             prev = mlinestr
@@ -178,7 +176,7 @@ class OGRGeomTest(unittest.TestCase):
     def test06_linearring(self):
         "Testing LinearRing objects."
         prev = OGRGeometry('POINT(0 0)')
-        for rr in linearrings:
+        for rr in self.geometries.linearrings:
             lr = OGRGeometry(rr.wkt)
             #self.assertEqual(101, lr.geom_type.num)
             self.assertEqual('LINEARRING', lr.geom_name)
@@ -196,7 +194,7 @@ class OGRGeomTest(unittest.TestCase):
         self.assertEqual(bbox, p.extent)
 
         prev = OGRGeometry('POINT(0 0)')
-        for p in polygons:
+        for p in self.geometries.polygons:
             poly = OGRGeometry(p.wkt)
             self.assertEqual(3, poly.geom_type)
             self.assertEqual('POLYGON', poly.geom_name)
@@ -250,7 +248,7 @@ class OGRGeomTest(unittest.TestCase):
     def test08_multipolygons(self):
         "Testing MultiPolygon objects."
         prev = OGRGeometry('POINT(0 0)')
-        for mp in multipolygons:
+        for mp in self.geometries.multipolygons:
             mpoly = OGRGeometry(mp.wkt)
             self.assertEqual(6, mpoly.geom_type)
             self.assertEqual('MULTIPOLYGON', mpoly.geom_name)
@@ -265,7 +263,7 @@ class OGRGeomTest(unittest.TestCase):
 
     def test09a_srs(self):
         "Testing OGR Geometries with Spatial Reference objects."
-        for mp in multipolygons:
+        for mp in self.geometries.multipolygons:
             # Creating a geometry w/spatial reference
             sr = SpatialReference('WGS84')
             mpoly = OGRGeometry(mp.wkt, sr)
@@ -283,8 +281,8 @@ class OGRGeomTest(unittest.TestCase):
                     self.assertEqual(sr.wkt, ring.srs.wkt)
 
             # Ensuring SRS propagate in topological ops.
-            a, b = topology_geoms[0]
-            a, b = OGRGeometry(a.wkt, sr), OGRGeometry(b.wkt, sr)
+            a = OGRGeometry(self.geometries.topology_geoms[0].wkt_a, sr)
+            b = OGRGeometry(self.geometries.topology_geoms[0].wkt_b, sr)
             diff = a.difference(b)
             union = a.union(b)
             self.assertEqual(sr.wkt, diff.srs.wkt)
@@ -352,11 +350,10 @@ class OGRGeomTest(unittest.TestCase):
 
     def test10_difference(self):
         "Testing difference()."
-        for i in xrange(len(topology_geoms)):
-            g_tup = topology_geoms[i]
-            a = OGRGeometry(g_tup[0].wkt)
-            b = OGRGeometry(g_tup[1].wkt)
-            d1 = OGRGeometry(diff_geoms[i].wkt)
+        for i in xrange(len(self.geometries.topology_geoms)):
+            a = OGRGeometry(self.geometries.topology_geoms[i].wkt_a)
+            b = OGRGeometry(self.geometries.topology_geoms[i].wkt_b)
+            d1 = OGRGeometry(self.geometries.diff_geoms[i].wkt)
             d2 = a.difference(b)
             self.assertEqual(d1, d2)
             self.assertEqual(d1, a - b) # __sub__ is difference operator
@@ -365,11 +362,10 @@ class OGRGeomTest(unittest.TestCase):
 
     def test11_intersection(self):
         "Testing intersects() and intersection()."
-        for i in xrange(len(topology_geoms)):
-            g_tup = topology_geoms[i]
-            a = OGRGeometry(g_tup[0].wkt)
-            b = OGRGeometry(g_tup[1].wkt)
-            i1 = OGRGeometry(intersect_geoms[i].wkt)
+        for i in xrange(len(self.geometries.topology_geoms)):
+            a = OGRGeometry(self.geometries.topology_geoms[i].wkt_a)
+            b = OGRGeometry(self.geometries.topology_geoms[i].wkt_b)
+            i1 = OGRGeometry(self.geometries.intersect_geoms[i].wkt)
             self.assertEqual(True, a.intersects(b))
             i2 = a.intersection(b)
             self.assertEqual(i1, i2)
@@ -379,11 +375,10 @@ class OGRGeomTest(unittest.TestCase):
 
     def test12_symdifference(self):
         "Testing sym_difference()."
-        for i in xrange(len(topology_geoms)):
-            g_tup = topology_geoms[i]
-            a = OGRGeometry(g_tup[0].wkt)
-            b = OGRGeometry(g_tup[1].wkt)
-            d1 = OGRGeometry(sdiff_geoms[i].wkt)
+        for i in xrange(len(self.geometries.topology_geoms)):
+            a = OGRGeometry(self.geometries.topology_geoms[i].wkt_a)
+            b = OGRGeometry(self.geometries.topology_geoms[i].wkt_b)
+            d1 = OGRGeometry(self.geometries.sdiff_geoms[i].wkt)
             d2 = a.sym_difference(b)
             self.assertEqual(d1, d2)
             self.assertEqual(d1, a ^ b) # __xor__ is symmetric difference operator
@@ -392,11 +387,10 @@ class OGRGeomTest(unittest.TestCase):
 
     def test13_union(self):
         "Testing union()."
-        for i in xrange(len(topology_geoms)):
-            g_tup = topology_geoms[i]
-            a = OGRGeometry(g_tup[0].wkt)
-            b = OGRGeometry(g_tup[1].wkt)
-            u1 = OGRGeometry(union_geoms[i].wkt)
+        for i in xrange(len(self.geometries.topology_geoms)):
+            a = OGRGeometry(self.geometries.topology_geoms[i].wkt_a)
+            b = OGRGeometry(self.geometries.topology_geoms[i].wkt_b)
+            u1 = OGRGeometry(self.geometries.union_geoms[i].wkt)
             u2 = a.union(b)
             self.assertEqual(u1, u2)
             self.assertEqual(u1, a | b) # __or__ is union operator
@@ -412,7 +406,7 @@ class OGRGeomTest(unittest.TestCase):
 
         # GeometryCollection.add may take an OGRGeometry (if another collection
         # of the same type all child geoms will be added individually) or WKT.
-        for mp in multipolygons:
+        for mp in self.geometries.multipolygons:
             mpoly = OGRGeometry(mp.wkt)
             mp1 = OGRGeometry('MultiPolygon')
             mp2 = OGRGeometry('MultiPolygon')
@@ -430,7 +424,7 @@ class OGRGeomTest(unittest.TestCase):
         mp = OGRGeometry('MULTIPOINT(5 23, 0 0, 10 50)')
         self.assertEqual((0.0, 0.0, 10.0, 50.0), mp.extent)
         # Testing on the 'real world' Polygon.
-        poly = OGRGeometry(polygons[3].wkt)
+        poly = OGRGeometry(self.geometries.polygons[3].wkt)
         ring = poly.shell
         x, y = ring.x, ring.y
         xmin, ymin = min(x), min(y)
diff --git a/django/contrib/gis/geometry/test_data.py b/django/contrib/gis/geometry/test_data.py
new file mode 100644
index 0000000000..553db471f4
--- /dev/null
+++ b/django/contrib/gis/geometry/test_data.py
@@ -0,0 +1,100 @@
+"""
+This module has the mock object definitions used to hold reference geometry
+for the GEOS and GDAL tests.
+"""
+import gzip
+import os
+
+from django.contrib import gis
+from django.utils import simplejson
+
+
+# This global used to store reference geometry data.
+GEOMETRIES = None
+
+# Path where reference test data is located.
+TEST_DATA = os.path.join(os.path.dirname(gis.__file__), 'tests', 'data')
+
+
+def tuplize(seq):
+    "Turn all nested sequences to tuples in given sequence."
+    if isinstance(seq, (list, tuple)):
+        return tuple([tuplize(i) for i in seq])
+    return seq
+
+
+def get_ds_file(name, ext):
+    return os.path.join(TEST_DATA,
+                        name,
+                        name + '.%s' % ext
+                        )
+
+
+class TestObj(object):
+    """
+    Base testing object, turns keyword args into attributes.
+    """
+    def __init__(self, **kwargs):
+        for key, value in kwargs.items():
+            setattr(self, key, value)
+
+
+class TestDS(TestObj):
+    """
+    Object for testing GDAL data sources.
+    """
+    def __init__(self, name, **kwargs):
+        # Shapefile is default extension, unless specified otherwise.
+        ext = kwargs.pop('ext', 'shp')
+        self.ds = get_ds_file(name, ext)
+        super(TestDS, self).__init__(**kwargs)
+
+
+class TestGeom(TestObj):
+    """
+    Testing object used for wrapping reference geometry data
+    in GEOS/GDAL tests.
+    """
+    def __init__(self, **kwargs):
+        # Converting lists to tuples of certain keyword args
+        # so coordinate test cases will match (JSON has no
+        # concept of tuple).
+        coords = kwargs.pop('coords', None)
+        if coords:
+            self.coords = tuplize(coords)
+
+        centroid = kwargs.pop('centroid', None)
+        if centroid:
+            self.centroid = tuple(centroid)
+
+        ext_ring_cs = kwargs.pop('ext_ring_cs', None)
+        if ext_ring_cs:
+            ext_ring_cs = tuplize(ext_ring_cs)
+        self.ext_ring_cs = ext_ring_cs
+
+        super(TestGeom, self).__init__(**kwargs)
+
+
+class TestGeomSet(object):
+    """
+    Each attribute of this object is a list of `TestGeom` instances.
+    """
+    def __init__(self, **kwargs):
+        for key, value in kwargs.items():
+            setattr(self, key, [TestGeom(**kwargs) for kwargs in value])
+
+
+class TestDataMixin(object):
+    """
+    Mixin used for GEOS/GDAL test cases that defines a `geometries`
+    property, which returns and/or loads the reference geometry data.
+    """
+    @property
+    def geometries(self):
+        global GEOMETRIES
+        if GEOMETRIES is None:
+            # Load up the test geometry data from fixture into global.
+            gzf = gzip.GzipFile(os.path.join(TEST_DATA, 'geometries.json.gz'))
+            geometries = simplejson.loads(gzf.read())
+            GEOMETRIES = TestGeomSet(**geometries)
+        return GEOMETRIES
diff --git a/django/contrib/gis/geos/tests/test_geos.py b/django/contrib/gis/geos/tests/test_geos.py
index 4f2e33f9a0..3cd021e8b8 100644
--- a/django/contrib/gis/geos/tests/test_geos.py
+++ b/django/contrib/gis/geos/tests/test_geos.py
@@ -1,9 +1,9 @@
 import ctypes, random, unittest, sys
 from django.contrib.gis.geos import *
 from django.contrib.gis.geos.base import gdal, numpy, GEOSBase
-from django.contrib.gis.tests.geometries import *
+from django.contrib.gis.geometry.test_data import TestDataMixin
 
-class GEOSTest(unittest.TestCase):
+class GEOSTest(unittest.TestCase, TestDataMixin):
 
     @property
     def null_srid(self):
@@ -61,13 +61,13 @@ class GEOSTest(unittest.TestCase):
 
     def test01a_wkt(self):
         "Testing WKT output."
-        for g in wkt_out:
+        for g in self.geometries.wkt_out:
             geom = fromstr(g.wkt)
             self.assertEqual(g.ewkt, geom.wkt)
 
     def test01b_hex(self):
         "Testing HEX output."
-        for g in hex_wkt:
+        for g in self.geometries.hex_wkt:
             geom = fromstr(g.wkt)
             self.assertEqual(g.hex, geom.hex)
 
@@ -75,9 +75,16 @@ class GEOSTest(unittest.TestCase):
         "Testing (HEX)EWKB output."
         from binascii import a2b_hex
 
+        # For testing HEX(EWKB).
+        ogc_hex = '01010000000000000000000000000000000000F03F'
+        # `SELECT ST_AsHEXEWKB(ST_GeomFromText('POINT(0 1)', 4326));`
+        hexewkb_2d = '0101000020E61000000000000000000000000000000000F03F'
+        # `SELECT ST_AsHEXEWKB(ST_GeomFromEWKT('SRID=4326;POINT(0 1 2)'));`
+        hexewkb_3d = '01010000A0E61000000000000000000000000000000000F03F0000000000000040'
+
         pnt_2d = Point(0, 1, srid=4326)
         pnt_3d = Point(0, 1, 2, srid=4326)
-        
+
         # OGC-compliant HEX will not have SRID nor Z value.
         self.assertEqual(ogc_hex, pnt_2d.hex)
         self.assertEqual(ogc_hex, pnt_3d.hex)
@@ -110,13 +117,13 @@ class GEOSTest(unittest.TestCase):
                 pass
             else:
                 self.fail('Should have raised GEOSException')
-        
+
         # Redundant sanity check.
         self.assertEqual(4326, GEOSGeometry(hexewkb_2d).srid)
 
     def test01c_kml(self):
         "Testing KML output."
-        for tg in wkt_out:
+        for tg in self.geometries.wkt_out:
             geom = fromstr(tg.wkt)
             kml = getattr(tg, 'kml', False)
             if kml: self.assertEqual(kml, geom.kml)
@@ -125,7 +132,7 @@ class GEOSTest(unittest.TestCase):
         "Testing the Error handlers."
         # string-based
         print "\nBEGIN - expecting GEOS_ERROR; safe to ignore.\n"
-        for err in errors:
+        for err in self.geometries.errors:
             try:
                 g = fromstr(err.wkt)
             except (GEOSException, ValueError):
@@ -147,14 +154,14 @@ class GEOSTest(unittest.TestCase):
     def test01e_wkb(self):
         "Testing WKB output."
         from binascii import b2a_hex
-        for g in hex_wkt:
+        for g in self.geometries.hex_wkt:
             geom = fromstr(g.wkt)
             wkb = geom.wkb
             self.assertEqual(b2a_hex(wkb).upper(), g.hex)
 
     def test01f_create_hex(self):
         "Testing creation from HEX."
-        for g in hex_wkt:
+        for g in self.geometries.hex_wkt:
             geom_h = GEOSGeometry(g.hex)
             # we need to do this so decimal places get normalised
             geom_t = fromstr(g.wkt)
@@ -163,7 +170,7 @@ class GEOSTest(unittest.TestCase):
     def test01g_create_wkb(self):
         "Testing creation from WKB."
         from binascii import a2b_hex
-        for g in hex_wkt:
+        for g in self.geometries.hex_wkt:
             wkb = buffer(a2b_hex(g.hex))
             geom_h = GEOSGeometry(wkb)
             # we need to do this so decimal places get normalised
@@ -173,7 +180,7 @@ class GEOSTest(unittest.TestCase):
     def test01h_ewkt(self):
         "Testing EWKT."
         srid = 32140
-        for p in polygons:
+        for p in self.geometries.polygons:
             ewkt = 'SRID=%d;%s' % (srid, p.wkt)
             poly = fromstr(ewkt)
             self.assertEqual(srid, poly.srid)
@@ -183,7 +190,7 @@ class GEOSTest(unittest.TestCase):
     def test01i_json(self):
         "Testing GeoJSON input/output (via GDAL)."
         if not gdal or not gdal.GEOJSON: return
-        for g in json_geoms:
+        for g in self.geometries.json_geoms:
             geom = GEOSGeometry(g.wkt)
             if not hasattr(g, 'not_equal'):
                 self.assertEqual(g.json, geom.json)
@@ -225,7 +232,7 @@ class GEOSTest(unittest.TestCase):
     def test02a_points(self):
         "Testing Point objects."
         prev = fromstr('POINT(0 0)')
-        for p in points:
+        for p in self.geometries.points:
             # Creating the point from the WKT
             pnt = fromstr(p.wkt)
             self.assertEqual(pnt.geom_type, 'Point')
@@ -279,7 +286,7 @@ class GEOSTest(unittest.TestCase):
 
     def test02b_multipoints(self):
         "Testing MultiPoint objects."
-        for mp in multipoints:
+        for mp in self.geometries.multipoints:
             mpnt = fromstr(mp.wkt)
             self.assertEqual(mpnt.geom_type, 'MultiPoint')
             self.assertEqual(mpnt.geom_typeid, 4)
@@ -289,7 +296,7 @@ class GEOSTest(unittest.TestCase):
 
             self.assertRaises(GEOSIndexError, mpnt.__getitem__, len(mpnt))
             self.assertEqual(mp.centroid, mpnt.centroid.tuple)
-            self.assertEqual(mp.points, tuple(m.tuple for m in mpnt))
+            self.assertEqual(mp.coords, tuple(m.tuple for m in mpnt))
             for p in mpnt:
                 self.assertEqual(p.geom_type, 'Point')
                 self.assertEqual(p.geom_typeid, 0)
@@ -299,7 +306,7 @@ class GEOSTest(unittest.TestCase):
     def test03a_linestring(self):
         "Testing LineString objects."
         prev = fromstr('POINT(0 0)')
-        for l in linestrings:
+        for l in self.geometries.linestrings:
             ls = fromstr(l.wkt)
             self.assertEqual(ls.geom_type, 'LineString')
             self.assertEqual(ls.geom_typeid, 1)
@@ -325,7 +332,7 @@ class GEOSTest(unittest.TestCase):
     def test03b_multilinestring(self):
         "Testing MultiLineString objects."
         prev = fromstr('POINT(0 0)')
-        for l in multilinestrings:
+        for l in self.geometries.multilinestrings:
             ml = fromstr(l.wkt)
             self.assertEqual(ml.geom_type, 'MultiLineString')
             self.assertEqual(ml.geom_typeid, 5)
@@ -348,7 +355,7 @@ class GEOSTest(unittest.TestCase):
 
     def test04_linearring(self):
         "Testing LinearRing objects."
-        for rr in linearrings:
+        for rr in self.geometries.linearrings:
             lr = fromstr(rr.wkt)
             self.assertEqual(lr.geom_type, 'LinearRing')
             self.assertEqual(lr.geom_typeid, 2)
@@ -371,7 +378,7 @@ class GEOSTest(unittest.TestCase):
         self.assertEqual(bbox, p.extent)
 
         prev = fromstr('POINT(0 0)')
-        for p in polygons:
+        for p in self.geometries.polygons:
             # Creating the Polygon, testing its properties.
             poly = fromstr(p.wkt)
             self.assertEqual(poly.geom_type, 'Polygon')
@@ -430,7 +437,7 @@ class GEOSTest(unittest.TestCase):
         "Testing MultiPolygon objects."
         print "\nBEGIN - expecting GEOS_NOTICE; safe to ignore.\n"
         prev = fromstr('POINT (0 0)')
-        for mp in multipolygons:
+        for mp in self.geometries.multipolygons:
             mpoly = fromstr(mp.wkt)
             self.assertEqual(mpoly.geom_type, 'MultiPolygon')
             self.assertEqual(mpoly.geom_typeid, 6)
@@ -456,7 +463,7 @@ class GEOSTest(unittest.TestCase):
         # These tests are needed to ensure sanity with writable geometries.
 
         # Getting a polygon with interior rings, and pulling out the interior rings
-        poly = fromstr(polygons[1].wkt)
+        poly = fromstr(self.geometries.polygons[1].wkt)
         ring1 = poly[0]
         ring2 = poly[1]
 
@@ -472,12 +479,9 @@ class GEOSTest(unittest.TestCase):
         # Access to these rings is OK since they are clones.
         s1, s2 = str(ring1), str(ring2)
 
-        # The previous hijinks tests are now moot because only clones are
-        # now used =)
-
     def test08_coord_seq(self):
         "Testing Coordinate Sequence objects."
-        for p in polygons:
+        for p in self.geometries.polygons:
             if p.ext_ring_cs:
                 # Constructing the polygon and getting the coordinate sequence
                 poly = fromstr(p.wkt)
@@ -506,22 +510,18 @@ class GEOSTest(unittest.TestCase):
         "Testing relate() and relate_pattern()."
         g = fromstr('POINT (0 0)')
         self.assertRaises(GEOSException, g.relate_pattern, 0, 'invalid pattern, yo')
-        for i in xrange(len(relate_geoms)):
-            g_tup = relate_geoms[i]
-            a = fromstr(g_tup[0].wkt)
-            b = fromstr(g_tup[1].wkt)
-            pat = g_tup[2]
-            result = g_tup[3]
-            self.assertEqual(result, a.relate_pattern(b, pat))
-            self.assertEqual(pat, a.relate(b))
+        for rg in self.geometries.relate_geoms:
+            a = fromstr(rg.wkt_a)
+            b = fromstr(rg.wkt_b)
+            self.assertEqual(rg.result, a.relate_pattern(b, rg.pattern))
+            self.assertEqual(rg.pattern, a.relate(b))
 
     def test10_intersection(self):
         "Testing intersects() and intersection()."
-        for i in xrange(len(topology_geoms)):
-            g_tup = topology_geoms[i]
-            a = fromstr(g_tup[0].wkt)
-            b = fromstr(g_tup[1].wkt)
-            i1 = fromstr(intersect_geoms[i].wkt)
+        for i in xrange(len(self.geometries.topology_geoms)):
+            a = fromstr(self.geometries.topology_geoms[i].wkt_a)
+            b = fromstr(self.geometries.topology_geoms[i].wkt_b)
+            i1 = fromstr(self.geometries.intersect_geoms[i].wkt)
             self.assertEqual(True, a.intersects(b))
             i2 = a.intersection(b)
             self.assertEqual(i1, i2)
@@ -531,11 +531,10 @@ class GEOSTest(unittest.TestCase):
 
     def test11_union(self):
         "Testing union()."
-        for i in xrange(len(topology_geoms)):
-            g_tup = topology_geoms[i]
-            a = fromstr(g_tup[0].wkt)
-            b = fromstr(g_tup[1].wkt)
-            u1 = fromstr(union_geoms[i].wkt)
+        for i in xrange(len(self.geometries.topology_geoms)):
+            a = fromstr(self.geometries.topology_geoms[i].wkt_a)
+            b = fromstr(self.geometries.topology_geoms[i].wkt_b)
+            u1 = fromstr(self.geometries.union_geoms[i].wkt)
             u2 = a.union(b)
             self.assertEqual(u1, u2)
             self.assertEqual(u1, a | b) # __or__ is union operator
@@ -544,11 +543,10 @@ class GEOSTest(unittest.TestCase):
 
     def test12_difference(self):
         "Testing difference()."
-        for i in xrange(len(topology_geoms)):
-            g_tup = topology_geoms[i]
-            a = fromstr(g_tup[0].wkt)
-            b = fromstr(g_tup[1].wkt)
-            d1 = fromstr(diff_geoms[i].wkt)
+        for i in xrange(len(self.geometries.topology_geoms)):
+            a = fromstr(self.geometries.topology_geoms[i].wkt_a)
+            b = fromstr(self.geometries.topology_geoms[i].wkt_b)
+            d1 = fromstr(self.geometries.diff_geoms[i].wkt)
             d2 = a.difference(b)
             self.assertEqual(d1, d2)
             self.assertEqual(d1, a - b) # __sub__ is difference operator
@@ -557,11 +555,10 @@ class GEOSTest(unittest.TestCase):
 
     def test13_symdifference(self):
         "Testing sym_difference()."
-        for i in xrange(len(topology_geoms)):
-            g_tup = topology_geoms[i]
-            a = fromstr(g_tup[0].wkt)
-            b = fromstr(g_tup[1].wkt)
-            d1 = fromstr(sdiff_geoms[i].wkt)
+        for i in xrange(len(self.geometries.topology_geoms)):
+            a = fromstr(self.geometries.topology_geoms[i].wkt_a)
+            b = fromstr(self.geometries.topology_geoms[i].wkt_b)
+            d1 = fromstr(self.geometries.sdiff_geoms[i].wkt)
             d2 = a.sym_difference(b)
             self.assertEqual(d1, d2)
             self.assertEqual(d1, a ^ b) # __xor__ is symmetric difference operator
@@ -570,18 +567,19 @@ class GEOSTest(unittest.TestCase):
 
     def test14_buffer(self):
         "Testing buffer()."
-        for i in xrange(len(buffer_geoms)):
-            g_tup = buffer_geoms[i]
-            g = fromstr(g_tup[0].wkt)
+        for bg in self.geometries.buffer_geoms:
+            g = fromstr(bg.wkt)
 
             # The buffer we expect
-            exp_buf = fromstr(g_tup[1].wkt)
+            exp_buf = fromstr(bg.buffer_wkt)
+            quadsegs = bg.quadsegs
+            width = bg.width
 
             # Can't use a floating-point for the number of quadsegs.
-            self.assertRaises(ctypes.ArgumentError, g.buffer, g_tup[2], float(g_tup[3]))
+            self.assertRaises(ctypes.ArgumentError, g.buffer, width, float(quadsegs))
 
             # Constructing our buffer
-            buf = g.buffer(g_tup[2], g_tup[3])
+            buf = g.buffer(width, quadsegs)
             self.assertEqual(exp_buf.num_coords, buf.num_coords)
             self.assertEqual(len(exp_buf), len(buf))
 
@@ -605,7 +603,7 @@ class GEOSTest(unittest.TestCase):
         self.assertRaises(ctypes.ArgumentError, pnt.set_srid, '4326')
 
         # Testing SRID keyword on fromstr(), and on Polygon rings.
-        poly = fromstr(polygons[1].wkt, srid=4269)
+        poly = fromstr(self.geometries.polygons[1].wkt, srid=4269)
         self.assertEqual(4269, poly.srid)
         for ring in poly: self.assertEqual(4269, ring.srid)
         poly.srid = 4326
@@ -636,7 +634,7 @@ class GEOSTest(unittest.TestCase):
     def test16_mutable_geometries(self):
         "Testing the mutability of Polygons and Geometry Collections."
         ### Testing the mutability of Polygons ###
-        for p in polygons:
+        for p in self.geometries.polygons:
             poly = fromstr(p.wkt)
 
             # Should only be able to use __setitem__ with LinearRing geometries.
@@ -655,7 +653,7 @@ class GEOSTest(unittest.TestCase):
             self.assertEqual(poly[0], new_shell)
 
         ### Testing the mutability of Geometry Collections
-        for tg in multipoints:
+        for tg in self.geometries.multipoints:
             mp = fromstr(tg.wkt)
             for i in range(len(mp)):
                 # Creating a random point.
@@ -670,7 +668,7 @@ class GEOSTest(unittest.TestCase):
 
         # MultiPolygons involve much more memory management because each
         # Polygon w/in the collection has its own rings.
-        for tg in multipolygons:
+        for tg in self.geometries.multipolygons:
             mpoly = fromstr(tg.wkt)
             for i in xrange(len(mpoly)):
                 poly = mpoly[i]
@@ -791,10 +789,10 @@ class GEOSTest(unittest.TestCase):
         "Testing GeometryCollection handling of other collections."
         # Creating a GeometryCollection WKT string composed of other
         # collections and polygons.
-        coll = [mp.wkt for mp in multipolygons if mp.valid]
-        coll.extend([mls.wkt for mls in multilinestrings])
-        coll.extend([p.wkt for p in polygons])
-        coll.extend([mp.wkt for mp in multipoints])
+        coll = [mp.wkt for mp in self.geometries.multipolygons if mp.valid]
+        coll.extend([mls.wkt for mls in self.geometries.multilinestrings])
+        coll.extend([p.wkt for p in self.geometries.polygons])
+        coll.extend([mp.wkt for mp in self.geometries.multipoints])
         gc_wkt = 'GEOMETRYCOLLECTION(%s)' % ','.join(coll)
 
         # Should construct ok from WKT
@@ -862,7 +860,7 @@ class GEOSTest(unittest.TestCase):
         # Extent of points is just the point itself repeated.
         self.assertEqual((5.23, 17.8, 5.23, 17.8), pnt.extent)
         # Testing on the 'real world' Polygon.
-        poly = fromstr(polygons[3].wkt)
+        poly = fromstr(self.geometries.polygons[3].wkt)
         ring = poly.shell
         x, y = ring.x, ring.y
         xmin, ymin = min(x), min(y)
@@ -878,10 +876,10 @@ class GEOSTest(unittest.TestCase):
         # and setting the SRID on some of them.
         def get_geoms(lst, srid=None):
             return [GEOSGeometry(tg.wkt, srid) for tg in lst]
-        tgeoms = get_geoms(points)
-        tgeoms.extend(get_geoms(multilinestrings, 4326))
-        tgeoms.extend(get_geoms(polygons, 3084))
-        tgeoms.extend(get_geoms(multipolygons, 900913))
+        tgeoms = get_geoms(self.geometries.points)
+        tgeoms.extend(get_geoms(self.geometries.multilinestrings, 4326))
+        tgeoms.extend(get_geoms(self.geometries.polygons, 3084))
+        tgeoms.extend(get_geoms(self.geometries.multipolygons, 900913))
 
         # The SRID won't be exported in GEOS 3.0 release candidates.
         no_srid = self.null_srid == -1
diff --git a/django/contrib/gis/tests/data/geometries.json.gz b/django/contrib/gis/tests/data/geometries.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..683dc83e4d7b8d3805c9836026299ff1c1113d29
GIT binary patch
literal 9100
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
KI>H2xdjJ4KKwRPg

literal 0
HcmV?d00001

diff --git a/django/contrib/gis/tests/geometries.py b/django/contrib/gis/tests/geometries.py
deleted file mode 100644
index 6689cd7103..0000000000
--- a/django/contrib/gis/tests/geometries.py
+++ /dev/null
@@ -1,180 +0,0 @@
-import re
-
-wkt_regex = re.compile(r'^(?P<type>[A-Z]+) ?\(')
-
-class TestGeom:
-    "The Test Geometry class container."
-    def __init__(self, wkt, **kwargs):
-        self.wkt = wkt
-
-        self.bad = kwargs.pop('bad', False)
-
-        if not self.bad:
-            m = wkt_regex.match(wkt)
-            if not m:
-                raise Exception('Improper WKT: "%s"' % wkt)
-            self.geo_type = m.group('type')
-
-        for key, value in kwargs.items():
-            setattr(self, key, value)
-
-# For the old tests
-swig_geoms = (TestGeom('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))', ncoords=5),
-              TestGeom('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0), (10 10, 10 90, 90 90, 90 10, 10 10) ))', ncoords=10),
-              )
-
-# Testing WKT & HEX
-hex_wkt = (TestGeom('POINT(0 1)', hex='01010000000000000000000000000000000000F03F'),
-           TestGeom('LINESTRING(0 1, 2 3, 4 5)', hex='0102000000030000000000000000000000000000000000F03F0000000000000040000000000000084000000000000010400000000000001440'),
-           TestGeom('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))', hex='010300000001000000050000000000000000000000000000000000000000000000000024400000000000000000000000000000244000000000000024400000000000000000000000000000244000000000000000000000000000000000'),
-           TestGeom('MULTIPOINT(0 0, 10 0, 10 10, 0 10, 0 0)', hex='010400000005000000010100000000000000000000000000000000000000010100000000000000000024400000000000000000010100000000000000000024400000000000002440010100000000000000000000000000000000002440010100000000000000000000000000000000000000'),
-           TestGeom('MULTILINESTRING((0 0, 10 0, 10 10, 0 10),(20 20, 30 20))', hex='01050000000200000001020000000400000000000000000000000000000000000000000000000000244000000000000000000000000000002440000000000000244000000000000000000000000000002440010200000002000000000000000000344000000000000034400000000000003E400000000000003440'),
-           TestGeom('MULTIPOLYGON(((0 0, 10 0, 10 10, 0 10, 0 0)),((20 20, 20 30, 30 30, 30 20, 20 20),(25 25, 25 26, 26 26, 26 25, 25 25)))', hex='010600000002000000010300000001000000050000000000000000000000000000000000000000000000000024400000000000000000000000000000244000000000000024400000000000000000000000000000244000000000000000000000000000000000010300000002000000050000000000000000003440000000000000344000000000000034400000000000003E400000000000003E400000000000003E400000000000003E40000000000000344000000000000034400000000000003440050000000000000000003940000000000000394000000000000039400000000000003A400000000000003A400000000000003A400000000000003A40000000000000394000000000000039400000000000003940'),
-           TestGeom('GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0, 10 0, 10 10, 0 10, 0 0)),((20 20, 20 30, 30 30, 30 20, 20 20),(25 25, 25 26, 26 26, 26 25, 25 25))),MULTILINESTRING((0 0, 10 0, 10 10, 0 10),(20 20, 30 20)),MULTIPOINT(0 0, 10 0, 10 10, 0 10, 0 0))', hex='010700000003000000010600000002000000010300000001000000050000000000000000000000000000000000000000000000000024400000000000000000000000000000244000000000000024400000000000000000000000000000244000000000000000000000000000000000010300000002000000050000000000000000003440000000000000344000000000000034400000000000003E400000000000003E400000000000003E400000000000003E40000000000000344000000000000034400000000000003440050000000000000000003940000000000000394000000000000039400000000000003A400000000000003A400000000000003A400000000000003A4000000000000039400000000000003940000000000000394001050000000200000001020000000400000000000000000000000000000000000000000000000000244000000000000000000000000000002440000000000000244000000000000000000000000000002440010200000002000000000000000000344000000000000034400000000000003E400000000000003440010400000005000000010100000000000000000000000000000000000000010100000000000000000024400000000000000000010100000000000000000024400000000000002440010100000000000000000000000000000000002440010100000000000000000000000000000000000000'),
-           )
-
-# WKT, GML, KML output
-wkt_out = (TestGeom('POINT (110 130)', ewkt='POINT (110.0000000000000000 130.0000000000000000)', kml='<Point><coordinates>110.0,130.0,0</coordinates></Point>', gml='<gml:Point><gml:coordinates>110,130</gml:coordinates></gml:Point>'),
-           TestGeom('LINESTRING (40 40,50 130,130 130)', ewkt='LINESTRING (40.0000000000000000 40.0000000000000000, 50.0000000000000000 130.0000000000000000, 130.0000000000000000 130.0000000000000000)', kml='<LineString><coordinates>40.0,40.0,0 50.0,130.0,0 130.0,130.0,0</coordinates></LineString>', gml='<gml:LineString><gml:coordinates>40,40 50,130 130,130</gml:coordinates></gml:LineString>'),
-           TestGeom('POLYGON ((150 150,410 150,280 20,20 20,150 150),(170 120,330 120,260 50,100 50,170 120))', ewkt='POLYGON ((150.0000000000000000 150.0000000000000000, 410.0000000000000000 150.0000000000000000, 280.0000000000000000 20.0000000000000000, 20.0000000000000000 20.0000000000000000, 150.0000000000000000 150.0000000000000000), (170.0000000000000000 120.0000000000000000, 330.0000000000000000 120.0000000000000000, 260.0000000000000000 50.0000000000000000, 100.0000000000000000 50.0000000000000000, 170.0000000000000000 120.0000000000000000))', 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>', gml='<gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>150,150 410,150 280,20 20,20 150,150</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>170,120 330,120 260,50 100,50 170,120</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon>'),
-           TestGeom('MULTIPOINT (10 80,110 170,110 120)', ewkt='MULTIPOINT (10.0000000000000000 80.0000000000000000, 110.0000000000000000 170.0000000000000000, 110.0000000000000000 120.0000000000000000)', 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>', gml='<gml:MultiPoint><gml:pointMember><gml:Point><gml:coordinates>10,80</gml:coordinates></gml:Point></gml:pointMember><gml:pointMember><gml:Point><gml:coordinates>110,170</gml:coordinates></gml:Point></gml:pointMember><gml:pointMember><gml:Point><gml:coordinates>110,120</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint>'),
-           TestGeom('MULTILINESTRING ((110 100,40 30,180 30),(170 30,110 90,50 30))', ewkt='MULTILINESTRING ((110.0000000000000000 100.0000000000000000, 40.0000000000000000 30.0000000000000000, 180.0000000000000000 30.0000000000000000), (170.0000000000000000 30.0000000000000000, 110.0000000000000000 90.0000000000000000, 50.0000000000000000 30.0000000000000000))', 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>', gml='<gml:MultiLineString><gml:lineStringMember><gml:LineString><gml:coordinates>110,100 40,30 180,30</gml:coordinates></gml:LineString></gml:lineStringMember><gml:lineStringMember><gml:LineString><gml:coordinates>170,30 110,90 50,30</gml:coordinates></gml:LineString></gml:lineStringMember></gml:MultiLineString>'),
-           TestGeom('MULTIPOLYGON (((110 110,70 200,150 200,110 110),(110 110,100 180,120 180,110 110)),((110 110,150 20,70 20,110 110),(110 110,120 40,100 40,110 110)))', ewkt='MULTIPOLYGON (((110.0000000000000000 110.0000000000000000, 70.0000000000000000 200.0000000000000000, 150.0000000000000000 200.0000000000000000, 110.0000000000000000 110.0000000000000000), (110.0000000000000000 110.0000000000000000, 100.0000000000000000 180.0000000000000000, 120.0000000000000000 180.0000000000000000, 110.0000000000000000 110.0000000000000000)), ((110.0000000000000000 110.0000000000000000, 150.0000000000000000 20.0000000000000000, 70.0000000000000000 20.0000000000000000, 110.0000000000000000 110.0000000000000000), (110.0000000000000000 110.0000000000000000, 120.0000000000000000 40.0000000000000000, 100.0000000000000000 40.0000000000000000, 110.0000000000000000 110.0000000000000000)))', 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>', gml='<gml:MultiPolygon><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>110,110 70,200 150,200 110,110</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>110,110 100,180 120,180 110,110</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon></gml:polygonMember><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>110,110 150,20 70,20 110,110</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs><gml:innerBoundaryIs><gml:LinearRing><gml:coordinates>110,110 120,40 100,40 110,110</gml:coordinates></gml:LinearRing></gml:innerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon>'),
-           TestGeom('GEOMETRYCOLLECTION (POINT (110 260),LINESTRING (110 0,110 60))', ewkt='GEOMETRYCOLLECTION (POINT (110.0000000000000000 260.0000000000000000), LINESTRING (110.0000000000000000 0.0000000000000000, 110.0000000000000000 60.0000000000000000))', 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>', gml='<gml:GeometryCollection><gml:geometryMember><gml:Point><gml:coordinates>110,260</gml:coordinates></gml:Point></gml:geometryMember><gml:geometryMember><gml:LineString><gml:coordinates>110,0 110,60</gml:coordinates></gml:LineString></gml:geometryMember></gml:GeometryCollection>'),
-           )
-
-# Errors
-errors = (TestGeom('GEOMETR##!@#%#............a32515', bad=True, hex=False),
-          TestGeom('Foo.Bar', bad=True, hex=False),
-          TestGeom('POINT (5, 23)', bad=True, hex=False),
-          TestGeom('AAABBBDDDAAD##@#1113511111-098111111111111111533333333333333', bad=True, hex=True),
-          TestGeom('FFFFFFFFFFFFFFFFF1355555555555555555565111', bad=True, hex=True),
-          TestGeom('', bad=True, hex=False),
-          )
-
-# Polygons
-polygons = (TestGeom('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0), (10 10, 10 90, 90 90, 90 10, 10 10))',
-                     n_i=1, ext_ring_cs=((0, 0), (0, 100), (100, 100), (100, 0), (0, 0)), n_p=10, area=3600.0, centroid=(50., 50.),
-                     ),
-            TestGeom('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0), (10 10, 10 20, 20 20, 20 10, 10 10), (80 80, 80 90, 90 90, 90 80, 80 80))',
-                     n_i=2, ext_ring_cs=((0, 0), (0, 100), (100, 100), (100, 0), (0, 0)), n_p=15, area=9800.0, centroid=(50., 50.),
-                     ),
-            TestGeom('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))',
-                     n_i=0, ext_ring_cs=((0, 0), (0, 100), (100, 100), (100, 0), (0, 0)), n_p=5, area=10000.0, centroid=(50., 50.),
-                     ),
-            TestGeom('POLYGON ((-95.3848703124799471 29.7056021479768511, -95.3851905195191847 29.7046588196500281, -95.3859356966379011 29.7025053545605502, -95.3860723000647539 29.7020963367038391, -95.3871517697222089 29.6989779021280995, -95.3865578518265522 29.6990856888057202, -95.3862634205175226 29.6999471753441782, -95.3861991779541967 29.6999591988978615, -95.3856773799358137 29.6998323107113578, -95.3856209915427229 29.6998005235473741, -95.3855833545501639 29.6996619391729801, -95.3855776331865002 29.6996232659570047, -95.3850162731712885 29.6997236706530536, -95.3831047357410284 29.7000847603095082, -95.3829800724914776 29.7000676365023502, -95.3828084594470909 29.6999969684031200, -95.3828131504821499 29.6999090511531065, -95.3828022942979601 29.6998152117366025, -95.3827893930918833 29.6997790953076759, -95.3825174668099862 29.6998267772748825, -95.3823521544804862 29.7000451723151606, -95.3820491918785223 29.6999682034582335, -95.3817932841505893 29.6999640407204772, -95.3815438924600443 29.7005983712500630, -95.3807812390843424 29.7007538492921590, -95.3778578936435935 29.7012966201172048, -95.3770817300034679 29.7010555145969093, -95.3772763716395957 29.7004995005932031, -95.3769891024414420 29.7005797730360186, -95.3759855007185990 29.7007754783987821, -95.3759516423090474 29.7007305400669388, -95.3765252155960042 29.6989549173240874, -95.3766842746727832 29.6985134987163164, -95.3768510987262914 29.6980530300744938, -95.3769198676258014 29.6977137204527573, -95.3769616670751930 29.6973351617272172, -95.3770309229297766 29.6969821084304186, -95.3772352596880637 29.6959751305871613, -95.3776232419333354 29.6945439060847463, -95.3776849628727064 29.6943364710766069, -95.3779699491714723 29.6926548349458947, -95.3781945479573494 29.6920088336742545, -95.3785807118394189 29.6908279316076005, -95.3787441368896651 29.6908846275832197, -95.3787903214163890 29.6907152912461640, -95.3791765069353659 29.6893335376821526, -95.3794935959513026 29.6884781789101595, -95.3796592071232112 29.6880066681407619, -95.3799788182090111 29.6873687353035081, -95.3801545516183893 29.6868782380716993, -95.3801258908302145 29.6867756621337762, -95.3801104284899566 29.6867229678809572, -95.3803803523746154 29.6863753372986459, -95.3821028558287622 29.6837392961470421, -95.3827289584682205 29.6828097375216160, -95.3827494698109035 29.6790739156259278, -95.3826022014838486 29.6776502228345507, -95.3825047356438063 29.6765773006280753, -95.3823473035336917 29.6750405250369127, -95.3824540163482055 29.6750076408228587, -95.3838984230304305 29.6745679207378679, -95.3916547074937426 29.6722459226508377, -95.3926154662749468 29.6719609085105489, -95.3967246645118081 29.6707316485589736, -95.3974588054406780 29.6705065336410989, -95.3978523748756828 29.6703795547846845, -95.3988598162279970 29.6700874981900853, -95.3995628600665952 29.6698505300412414, -95.4134721665944170 29.6656841279906232, -95.4143262068232616 29.6654291174019278, -95.4159685142480214 29.6649750989232288, -95.4180067396277565 29.6643253024318021, -95.4185886692196590 29.6641482768691063, -95.4234155309609662 29.6626925393704788, -95.4287785503196346 29.6611023620959706, -95.4310287312749352 29.6604222580752648, -95.4320295629628959 29.6603361318136720, -95.4332899683975739 29.6600560661713608, -95.4342675748811047 29.6598454934599900, -95.4343110414310871 29.6598411486215490, -95.4345576779282538 29.6598147020668499, -95.4348823041721630 29.6597875803673112, -95.4352827715209457 29.6597762346946681, -95.4355290431309982 29.6597827926562374, -95.4359197997999331 29.6598014511782715, -95.4361907884752156 29.6598444333523368, -95.4364608955807228 29.6598901433108217, -95.4367250147512323 29.6599494499910712, -95.4364898759758091 29.6601880616540186, -95.4354501111810691 29.6616378572201107, -95.4381459623171224 29.6631265631655126, -95.4367852490863129 29.6642266600024023, -95.4370040894557263 29.6643425389568769, -95.4367078350812648 29.6645492592343238, -95.4366081749871285 29.6646291473027297, -95.4358539359938192 29.6652308742342932, -95.4350327668927889 29.6658995989314462, -95.4350580905272921 29.6678812477895271, -95.4349710541447536 29.6680054925936965, -95.4349500440473548 29.6671410080890006, -95.4341492724148850 29.6678790545191688, -95.4340248868274728 29.6680353198492135, -95.4333227845797438 29.6689245624945990, -95.4331325652123326 29.6691616138940901, -95.4321314741096955 29.6704473333237253, -95.4320435792664341 29.6702578985411982, -95.4320147929883547 29.6701800936425109, -95.4319764538662980 29.6683246590817085, -95.4317490976340679 29.6684974372577166, -95.4305958185342718 29.6694049049170374, -95.4296600735653016 29.6701723430938493, -95.4284928989940937 29.6710931793380972, -95.4274630532378580 29.6719378813640091, -95.4273056811974811 29.6720684984625791, -95.4260554084574864 29.6730668861566969, -95.4253558063699643 29.6736342467365724, -95.4249278826026028 29.6739557343648919, -95.4248648873821423 29.6745400910786152, -95.4260016131471929 29.6750987014005858, -95.4258567183010911 29.6753452063069929, -95.4260238081486847 29.6754322077221353, -95.4258707374502393 29.6756647377294307, -95.4257951755816691 29.6756407098663360, -95.4257701599566985 29.6761077719536068, -95.4257726684792260 29.6761711204603955, -95.4257980187195614 29.6770219651929423, -95.4252712669032519 29.6770161558853758, -95.4249234392992065 29.6770068683962300, -95.4249574272905789 29.6779707498635759, -95.4244725881033702 29.6779825646764159, -95.4222269476429545 29.6780711474441716, -95.4223032371999267 29.6796029391538809, -95.4239133706588945 29.6795331493690355, -95.4224579084327331 29.6813706893847780, -95.4224290108823965 29.6821953228763924, -95.4230916478977349 29.6822130268724109, -95.4222928279595521 29.6832041816675343, -95.4228763710016352 29.6832087677714505, -95.4223401691637179 29.6838987872753748, -95.4211655906087088 29.6838784024852984, -95.4201984153205558 29.6851319258758082, -95.4206156387716362 29.6851623398125319, -95.4213438084897660 29.6851763011334739, -95.4212071118618752 29.6853679931624974, -95.4202651399651245 29.6865313962980508, -95.4172061157659783 29.6865816431043932, -95.4182217951255183 29.6872251197301544, -95.4178664826439160 29.6876750901471631, -95.4180678442928780 29.6877960336377207, -95.4188763472917572 29.6882826379510938, -95.4185374500596311 29.6887137897831934, -95.4182121713132290 29.6885097429738813, -95.4179857231741551 29.6888118367840086, -95.4183106010563620 29.6890048676118212, -95.4179489865331334 29.6894546700979056, -95.4175581746284820 29.6892323606815438, -95.4173439957341571 29.6894990139807007, -95.4177411199311081 29.6897435034738422, -95.4175789200209721 29.6899207529979208, -95.4170598559864800 29.6896042165807508, -95.4166733682539814 29.6900891174451367, -95.4165941362704331 29.6900347214235047, -95.4163537218065301 29.6903529467753238, -95.4126843270708775 29.6881086357212780, -95.4126604121378392 29.6880942378803496, -95.4126672298953338 29.6885951670109982, -95.4126680884821923 29.6887052446594275, -95.4158080137241882 29.6906382377959339, -95.4152061403821961 29.6910871045531586, -95.4155842583188161 29.6917382915894308, -95.4157426793520358 29.6920726941677096, -95.4154520563662203 29.6922052332446427, -95.4151389936167078 29.6923261661269571, -95.4148649784384872 29.6924343866430256, -95.4144051352401590 29.6925623927348106, -95.4146792019416665 29.6926770338507744, -95.4148824479948985 29.6928117893696388, -95.4149851734360226 29.6929823719519774, -95.4140436551925291 29.6929626643100946, -95.4140465993023241 29.6926545917254892, -95.4137269186733334 29.6927395764256090, -95.4137372859685513 29.6935432485666624, -95.4135702836218655 29.6933186678088283, -95.4133925235973237 29.6930415229852152, -95.4133017035615580 29.6928685062036166, -95.4129588921634593 29.6929391128977862, -95.4125107395559695 29.6930481664661485, -95.4102647423187307 29.6935850183258019, -95.4081931340840157 29.6940907430947760, -95.4078783596459772 29.6941703429951609, -95.4049213975000043 29.6948723732981961, -95.4045944244127071 29.6949626434239207, -95.4045865139788134 29.6954109019001358, -95.4045953345484037 29.6956972800496963, -95.4038879332535146 29.6958296089365490, -95.4040366394459340 29.6964389004769842, -95.4032774779020798 29.6965643341263892, -95.4026066501239853 29.6966646227683881, -95.4024991226393837 29.6961389766619703, -95.4011781398631911 29.6963566063186377, -95.4011524097636112 29.6962596176762190, -95.4018184046368276 29.6961399466727336, -95.4016995838361908 29.6956442609415099, -95.4007100753964608 29.6958900524002978, -95.4008032469935188 29.6962639900781404, -95.3995660267125487 29.6965636449370329, -95.3996140564775601 29.6967877962763644, -95.3996364430014410 29.6968901984825280, -95.3984003269631842 29.6968679634805746, -95.3981442026887265 29.6983660679730335, -95.3980178461957706 29.6990890276252415, -95.3977097967130163 29.7008526152273049, -95.3962347157626027 29.7009697553607630, -95.3951949050136250 29.7004740386619019, -95.3957564950617183 29.6990281830553187, -95.3965927101519924 29.6968771129030706, -95.3957496517238184 29.6970800358387095, -95.3957720559467361 29.6972264611230727, -95.3957391586571788 29.6973548894558732, -95.3956286413405365 29.6974949857280883, -95.3955111053256957 29.6975661086270186, -95.3953215342724121 29.6976022763384790, -95.3951795558443365 29.6975846977491038, -95.3950369632041060 29.6975175779330200, -95.3949401089966500 29.6974269267953304, -95.3948740281415581 29.6972903308506346, -95.3946650813866910 29.6973397326847923, -95.3947654059391112 29.6974882560192022, -95.3949627316619768 29.6980355864961858, -95.3933200807862249 29.6984590863712796, -95.3932606497523494 29.6984464798710839, -95.3932983699113350 29.6983154306484352, -95.3933058014696655 29.6982165816983610, -95.3932946347785133 29.6981089778195759, -95.3931780601756287 29.6977068906794841, -95.3929928222970602 29.6977541771878180, -95.3930873169846478 29.6980676264932946, -95.3932743746374570 29.6981249406449663, -95.3929512584706316 29.6989526513922222, -95.3919850280655197 29.7014358632108646, -95.3918950918929056 29.7014169320765724, -95.3916928317890296 29.7019232352846423, -95.3915424614970959 29.7022988712928289, -95.3901530441668939 29.7058519502930061, -95.3899656322116698 29.7059156823562418, -95.3897628748670883 29.7059900058266777, -95.3896062677805787 29.7060738276384946, -95.3893941800512266 29.7061891695242046, -95.3892150365492455 29.7062641292949436, -95.3890502563035199 29.7063339729630940, -95.3888717930715586 29.7063896908080736, -95.3886925428988945 29.7064453871994978, -95.3885376849411983 29.7064797304524149, -95.3883284158984139 29.7065153575050189, -95.3881046767627794 29.7065368368267357, -95.3878809284696132 29.7065363048447537, -95.3876046356120924 29.7065288525102424, -95.3873060894974714 29.7064822806001452, -95.3869851943158409 29.7063993367575350, -95.3865967896568065 29.7062870572919202, -95.3861785624983156 29.7061492099008184, -95.3857375009733488 29.7059887337478798, -95.3854573290902152 29.7058683664514618, -95.3848703124799471 29.7056021479768511))',
-                     n_i=0, ext_ring_cs=False, n_p=264, area=0.00129917360654, centroid=(-95.403569179437341, 29.681772571690402),
-                     ),
-            )
-
-# MultiPolygons
-multipolygons = (TestGeom('MULTIPOLYGON (((100 20, 180 20, 180 100, 100 100, 100 20)), ((20 100, 100 100, 100 180, 20 180, 20 100)), ((100 180, 180 180, 180 260, 100 260, 100 180)), ((180 100, 260 100, 260 180, 180 180, 180 100)))', valid=True, num_geom=4, n_p=20),
-                 TestGeom('MULTIPOLYGON (((60 300, 320 220, 260 60, 60 100, 60 300)), ((60 300, 320 220, 260 60, 60 100, 60 300)))', valid=False),
-                 TestGeom('MULTIPOLYGON (((180 60, 240 160, 300 60, 180 60)), ((80 80, 180 60, 160 140, 240 160, 360 140, 300 60, 420 100, 320 280, 120 260, 80 80)))', valid=True, num_geom=2, n_p=14),
-                 )
-
-# Points
-points = (TestGeom('POINT (5 23)', x=5.0, y=23.0, centroid=(5.0, 23.0)),
-          TestGeom('POINT (-95.338492 29.723893)', x=-95.338492, y=29.723893, centroid=(-95.338492, 29.723893)),
-          TestGeom('POINT(1.234 5.678)', x=1.234, y=5.678, centroid=(1.234, 5.678)),
-          TestGeom('POINT(4.321 8.765)', x=4.321, y=8.765, centroid=(4.321, 8.765)),
-          TestGeom('POINT(10 10)', x=10, y=10, centroid=(10., 10.)),
-          TestGeom('POINT (5 23 8)', x=5.0, y=23.0, z=8.0, centroid=(5.0, 23.0)),
-          )
-
-# MultiPoints
-multipoints = (TestGeom('MULTIPOINT(10 10, 20 20 )', n_p=2, points=((10., 10.), (20., 20.)), centroid=(15., 15.)),
-               TestGeom('MULTIPOINT(10 10, 20 20, 10 20, 20 10)',
-                        n_p=4, points=((10., 10.), (20., 20.), (10., 20.), (20., 10.)),
-                        centroid=(15., 15.)),
-               )
-
-# LineStrings
-linestrings = (TestGeom('LINESTRING (60 180, 120 100, 180 180)', n_p=3, centroid=(120, 140), tup=((60, 180), (120, 100), (180, 180))),
-               TestGeom('LINESTRING (0 0, 5 5, 10 5, 10 10)', n_p=4, centroid=(6.1611652351681556, 4.6966991411008934), tup=((0, 0), (5, 5), (10, 5), (10, 10)),),
-               )
-
-# Linear Rings
-linearrings = (TestGeom('LINEARRING (649899.3065171393100172 4176512.3807915160432458, 649902.7294133581453934 4176512.7834989596158266, 649906.5550170192727819 4176514.3942507002502680, 649910.5820134161040187 4176516.0050024418160319, 649914.4076170771149918 4176518.0184616246260703, 649917.2264131171396002 4176519.4278986593708396, 649920.0452871860470623 4176521.6427505780011415, 649922.0587463703704998 4176522.8507948759943247, 649924.2735982896992937 4176524.4616246484220028, 649926.2870574744883925 4176525.4683542405255139, 649927.8978092158213258 4176526.8777912775985897, 649929.3072462501004338 4176528.0858355751261115, 649930.1126611357321963 4176529.4952726080082357, 649927.4951798024121672 4176506.9444361114874482, 649899.3065171393100172 4176512.3807915160432458)', n_p=15),
-               )
-
-# MultiLineStrings
-multilinestrings = (TestGeom('MULTILINESTRING ((0 0, 0 100), (100 0, 100 100))', n_p=4, centroid=(50, 50), tup=(((0, 0), (0, 100)), ((100, 0), (100, 100)))),
-                    TestGeom('MULTILINESTRING ((20 20, 60 60), (20 -20, 60 -60), (-20 -20, -60 -60), (-20 20, -60 60), (-80 0, 0 80, 80 0, 0 -80, -80 0), (-40 20, -40 -20), (-20 40, 20 40), (40 20, 40 -20), (20 -40, -20 -40))',
-                             n_p=21, centroid=(0, 0), tup=(((20., 20.), (60., 60.)), ((20., -20.), (60., -60.)), ((-20., -20.), (-60., -60.)), ((-20., 20.), (-60., 60.)), ((-80., 0.), (0., 80.), (80., 0.), (0., -80.), (-80., 0.)), ((-40., 20.), (-40., -20.)), ((-20., 40.), (20., 40.)), ((40., 20.), (40., -20.)), ((20., -40.), (-20., -40.))))
-                    )
-
-# ====================================================
-# Topology Operations
-
-topology_geoms = ( (TestGeom('POLYGON ((-5.0 0.0, -5.0 10.0, 5.0 10.0, 5.0 0.0, -5.0 0.0))'),
-                    TestGeom('POLYGON ((0.0 -5.0, 0.0 5.0, 10.0 5.0, 10.0 -5.0, 0.0 -5.0))')
-                    ),
-                   (TestGeom('POLYGON ((2 0, 18 0, 18 15, 2 15, 2 0))'),
-                    TestGeom('POLYGON ((10 1, 11 3, 13 4, 15 6, 16 8, 16 10, 15 12, 13 13, 11 12, 10 10, 9 12, 7 13, 5 12, 4 10, 4 8, 5 6, 7 4, 9 3, 10 1))'),
-                    ),
-                   )
-
-intersect_geoms = ( TestGeom('POLYGON ((5 5,5 0,0 0,0 5,5 5))'),
-                    TestGeom('POLYGON ((10 1, 9 3, 7 4, 5 6, 4 8, 4 10, 5 12, 7 13, 9 12, 10 10, 11 12, 13 13, 15 12, 16 10, 16 8, 15 6, 13 4, 11 3, 10 1))'),
-                    )
-
-union_geoms = ( TestGeom('POLYGON ((-5 0,-5 10,5 10,5 5,10 5,10 -5,0 -5,0 0,-5 0))'),
-                TestGeom('POLYGON ((2 0, 2 15, 18 15, 18 0, 2 0))'),
-                )
-
-diff_geoms = ( TestGeom('POLYGON ((-5 0,-5 10,5 10,5 5,0 5,0 0,-5 0))'),
-               TestGeom('POLYGON ((2 0, 2 15, 18 15, 18 0, 2 0), (10 1, 11 3, 13 4, 15 6, 16 8, 16 10, 15 12, 13 13, 11 12, 10 10, 9 12, 7 13, 5 12, 4 10, 4 8, 5 6, 7 4, 9 3, 10 1))'),
-               )
-
-sdiff_geoms = ( TestGeom('MULTIPOLYGON (((-5 0,-5 10,5 10,5 5,0 5,0 0,-5 0)),((0 0,5 0,5 5,10 5,10 -5,0 -5,0 0)))'),
-                TestGeom('POLYGON ((2 0, 2 15, 18 15, 18 0, 2 0), (10 1, 11 3, 13 4, 15 6, 16 8, 16 10, 15 12, 13 13, 11 12, 10 10, 9 12, 7 13, 5 12, 4 10, 4 8, 5 6, 7 4, 9 3, 10 1))'),
-                )
-
-relate_geoms = ( (TestGeom('MULTIPOINT(80 70, 20 20, 200 170, 140 120)'),
-                  TestGeom('MULTIPOINT(80 170, 140 120, 200 80, 80 70)'),
-                  '0F0FFF0F2', True,),
-                 (TestGeom('POINT(20 20)'), TestGeom('POINT(40 60)'),
-                  'FF0FFF0F2', True,),
-                 (TestGeom('POINT(110 110)'), TestGeom('LINESTRING(200 200, 110 110, 200 20, 20 20, 110 110, 20 200, 200 200)'),
-                  '0FFFFF1F2', True,),
-                 (TestGeom('MULTILINESTRING((20 20, 90 20, 170 20), (90 20, 90 80, 90 140))'),
-                  TestGeom('MULTILINESTRING((90 20, 170 100, 170 140), (130 140, 130 60, 90 20, 20 90, 90 20))'),
-                  'FF10F0102', True,),
-                 )
-
-buffer_geoms = ( (TestGeom('POINT(0 0)'),
-                  TestGeom('POLYGON ((5 0,4.903926402016153 -0.97545161008064,4.619397662556435 -1.913417161825447,4.157348061512728 -2.777851165098009,3.53553390593274 -3.535533905932735,2.777851165098015 -4.157348061512724,1.913417161825454 -4.619397662556431,0.975451610080648 -4.903926402016151,0.000000000000008 -5.0,-0.975451610080632 -4.903926402016154,-1.913417161825439 -4.619397662556437,-2.777851165098002 -4.157348061512732,-3.53553390593273 -3.535533905932746,-4.157348061512719 -2.777851165098022,-4.619397662556429 -1.913417161825462,-4.903926402016149 -0.975451610080656,-5.0 -0.000000000000016,-4.903926402016156 0.975451610080624,-4.619397662556441 1.913417161825432,-4.157348061512737 2.777851165097995,-3.535533905932752 3.535533905932723,-2.777851165098029 4.157348061512714,-1.913417161825468 4.619397662556426,-0.975451610080661 4.903926402016149,-0.000000000000019 5.0,0.975451610080624 4.903926402016156,1.913417161825434 4.61939766255644,2.777851165097998 4.157348061512735,3.535533905932727 3.535533905932748,4.157348061512719 2.777851165098022,4.619397662556429 1.91341716182546,4.90392640201615 0.975451610080652,5 0))'),
-                  5.0, 8),
-                 (TestGeom('POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))'),
-                  TestGeom('POLYGON ((-2 0,-2 10,-1.961570560806461 10.390180644032258,-1.847759065022573 10.765366864730179,-1.662939224605091 11.111140466039204,-1.414213562373095 11.414213562373096,-1.111140466039204 11.662939224605092,-0.765366864730179 11.847759065022574,-0.390180644032256 11.961570560806461,0 12,10 12,10.390180644032256 11.961570560806461,10.765366864730179 11.847759065022574,11.111140466039204 11.66293922460509,11.414213562373096 11.414213562373096,11.66293922460509 11.111140466039204,11.847759065022574 10.765366864730179,11.961570560806461 10.390180644032256,12 10,12 0,11.961570560806461 -0.390180644032256,11.847759065022574 -0.76536686473018,11.66293922460509 -1.111140466039204,11.414213562373096 -1.414213562373095,11.111140466039204 -1.66293922460509,10.765366864730179 -1.847759065022573,10.390180644032256 -1.961570560806461,10 -2,0.0 -2.0,-0.390180644032255 -1.961570560806461,-0.765366864730177 -1.847759065022575,-1.1111404660392 -1.662939224605093,-1.41421356237309 -1.4142135623731,-1.662939224605086 -1.111140466039211,-1.84775906502257 -0.765366864730189,-1.961570560806459 -0.390180644032268,-2 0))'),
-                  2.0, 8),
-                 )
-
-json_geoms = (TestGeom('POINT(100 0)', json='{ "type": "Point", "coordinates": [ 100.000000, 0.000000 ] }'),
-              TestGeom('POLYGON((0 0, -10 0, -10 -10, 0 -10, 0 0))', json='{ "type": "Polygon", "coordinates": [ [ [ 0.000000, 0.000000 ], [ -10.000000, 0.000000 ], [ -10.000000, -10.000000 ], [ 0.000000, -10.000000 ], [ 0.000000, 0.000000 ] ] ] }'),
-              TestGeom('MULTIPOLYGON(((102 2, 103 2, 103 3, 102 3, 102 2)), ((100.0 0.0, 101.0 0.0, 101.0 1.0, 100.0 1.0, 100.0 0.0), (100.2 0.2, 100.8 0.2, 100.8 0.8, 100.2 0.8, 100.2 0.2)))', json='{ "type": "MultiPolygon", "coordinates": [ [ [ [ 102.000000, 2.000000 ], [ 103.000000, 2.000000 ], [ 103.000000, 3.000000 ], [ 102.000000, 3.000000 ], [ 102.000000, 2.000000 ] ] ], [ [ [ 100.000000, 0.000000 ], [ 101.000000, 0.000000 ], [ 101.000000, 1.000000 ], [ 100.000000, 1.000000 ], [ 100.000000, 0.000000 ] ], [ [ 100.200000, 0.200000 ], [ 100.800000, 0.200000 ], [ 100.800000, 0.800000 ], [ 100.200000, 0.800000 ], [ 100.200000, 0.200000 ] ] ] ] }'),
-              TestGeom('GEOMETRYCOLLECTION(POINT(100 0),LINESTRING(101.0 0.0, 102.0 1.0))',
-                       json='{ "type": "GeometryCollection", "geometries": [ { "type": "Point", "coordinates": [ 100.000000, 0.000000 ] }, { "type": "LineString", "coordinates": [ [ 101.000000, 0.000000 ], [ 102.000000, 1.000000 ] ] } ] }',
-                       ),
-              TestGeom('MULTILINESTRING((100.0 0.0, 101.0 1.0),(102.0 2.0, 103.0 3.0))',
-                       json="""
-
-{ "type": "MultiLineString",
-  "coordinates": [
-      [ [100.0, 0.0], [101.0, 1.0] ],
-      [ [102.0, 2.0], [103.0, 3.0] ]
-    ]
-  }
-
-""",
-                       not_equal=True,
-                       ),
-              )
-
-# For testing HEX(EWKB).
-ogc_hex = '01010000000000000000000000000000000000F03F'
-# `SELECT ST_AsHEXEWKB(ST_GeomFromText('POINT(0 1)', 4326));`
-hexewkb_2d = '0101000020E61000000000000000000000000000000000F03F'
-# `SELECT ST_AsHEXEWKB(ST_GeomFromEWKT('SRID=4326;POINT(0 1 2)'));`
-hexewkb_3d = '01010000A0E61000000000000000000000000000000000F03F0000000000000040'