cleanup wkb descriptions to be proper wkt

mapnik · Jul 20, 2012 · cccb916 · cccb916
1 parent 537ce09
commit cccb916
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/tests/python_tests/geometry_io_test.py b/tests/python_tests/geometry_io_test.py
@@ -29,31 +29,31 @@ def setup():
 ]
 
 wkbs = [
-    [ 0, "select 'Point EMPTY'::geometry;", '010400000000000000'],
-    [ 0, "select 'MULTIPOINT EMPTY'::geometry;", '010400000000000000'],
-    [ 0, "select 'LINESTRING EMPTY'::geometry;", '010200000000000000'],
-    [ 0, "select 'MULTILINESTRING EMPTY'::geometry;", '010500000000000000'],
-    [ 0, "select 'Polygon EMPTY'::geometry;", '010300000000000000'],
-    [ 0, "select 'MULTIPOLYGON EMPTY'::geometry;", '010600000000000000'],
-    [ 0, "select 'TRIANGLE EMPTY'::geometry;", '011100000000000000'],
-
-    [ 0, "select 'CircularString EMPTY'::geometry;", '010800000000000000'],
-    [ 0, "select 'CurvePolygon EMPTY'::geometry;", '010A00000000000000'],
-    [ 0, "select 'CompoundCurve EMPTY'::geometry;", '010900000000000000'],
-    [ 0, "select 'MultiCurve EMPTY'::geometry;", '010B00000000000000'],
-
-    [ 0, "select 'MultiSurface EMPTY'::geometry;", '010C00000000000000'],
-    [ 0, "select 'PolyhedralSurface EMPTY'::geometry;", '010F00000000000000'],
-    [ 0, "select 'TIM EMPTY'::geometry;", '011000000000000000'],
-    [ 0, "select 'GEOMETRYCOLLECTION EMPTY'::geometry;", '010700000000000000'],
-    [ 2,"GEOMETRYCOLLECTION(MULTILINESTRING((10 10,20 20,10 40),(40 40,30 30,40 20,30 10)),LINESTRING EMPTY)", '010700000002000000010500000002000000010200000003000000000000000000244000000000000024400000000000003440000000000000344000000000000024400000000000004440010200000004000000000000000000444000000000000044400000000000003e400000000000003e40000000000000444000000000000034400000000000003e400000000000002440010200000000000000'
+    [ 0, "Point EMPTY", '010400000000000000'],
+    [ 0, "MULTIPOINT EMPTY", '010400000000000000'],
+    [ 0, "LINESTRING EMPTY", '010200000000000000'],
+    [ 0, "MULTILINESTRING EMPTY", '010500000000000000'],
+    [ 0, "Polygon EMPTY", '010300000000000000'],
+    [ 0, "MULTIPOLYGON EMPTY", '010600000000000000'],
+    [ 0, "TRIANGLE EMPTY", '011100000000000000'],
+
+    [ 0, "CircularString EMPTY", '010800000000000000'],
+    [ 0, "CurvePolygon EMPTY", '010A00000000000000'],
+    [ 0, "CompoundCurve EMPTY", '010900000000000000'],
+    [ 0, "MultiCurve EMPTY", '010B00000000000000'],
+
+    [ 0, "MultiSurface EMPTY", '010C00000000000000'],
+    [ 0, "PolyhedralSurface EMPTY", '010F00000000000000'],
+    [ 0, "TIM EMPTY", '011000000000000000'],
+    [ 0, "GEOMETRYCOLLECTION EMPTY", '010700000000000000'],
+    [ 2, "GEOMETRYCOLLECTION(MULTILINESTRING((10 10,20 20,10 40),(40 40,30 30,40 20,30 10)),LINESTRING EMPTY)", '010700000002000000010500000002000000010200000003000000000000000000244000000000000024400000000000003440000000000000344000000000000024400000000000004440010200000004000000000000000000444000000000000044400000000000003e400000000000003e40000000000000444000000000000034400000000000003e400000000000002440010200000000000000'
     ],
     [ 0, "GEOMETRYCOLLECTION(LINESTRING EMPTY,LINESTRING EMPTY)", '010700000000000000'],
     [ 0, "GEOMETRYCOLLECTION(POINT EMPTY,POINT EMPTY)", '010700000000000000'],
     [ 1, "GEOMETRYCOLLECTION(POINT EMPTY,POINT(0 0))", '010700000002000000010400000000000000010100000000000000000000000000000000000000'],
     [ 1, "GEOMETRYCOLLECTION(POINT EMPTY,MULTIPOINT(0 0))", '010700000002000000010400000000000000010400000001000000010100000000000000000000000000000000000000'],
-    [ 0, "select 'LINESTRING EMPTY'::geometry;", '010200000000000000' ],
-    [ 1, "select 'Point(0 0)'::geometry;", '010100000000000000000000000000000000000000' ],
+    [ 0, "LINESTRING EMPTY", '010200000000000000' ],
+    [ 1, "Point(0 0)", '010100000000000000000000000000000000000000' ],
 ]
 
 def test_wkb_parsing():