Bring error messages into line with fix for invalid polygons in parser (#316)

git-svn-id: http://svn.osgeo.org/postgis/branches/1.4@4915 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/regress/regress_expected b/regress/regress_expected
index bc3df06f36c05b410fe3af9db51ddaea4d3003fd..2e4964bd7cc17691320f5cd3b4f325aaf3b5a9e6 100644 (file)
--- a/regress/regress_expected
+++ b/regress/regress_expected
@@ -60,9 +60,9 @@ HINT:  "POINT(" <-- parse error at position 6 within geometry
 ERROR:  parse error - invalid geometry
 HINT:  "MULTIPOINT()" <-- parse error at position 12 within geometry
 ERROR:  geometry contains non-closed rings
-HINT:  "POLYGON( (0 0, 10 0, 10 10, 0 10) )" <-- parse error at position 35 within geometry
+HINT:  "POLYGON( (0 0, 10 0, 10 10, 0 10)" <-- parse error at position 33 within geometry
 ERROR:  geometry contains non-closed rings
-HINT:  "...0, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7) )" <-- parse error at position 62 within geometry
+HINT:  "... 10, 0 10, 0 0),(5 5, 7 5, 7 7 , 5 7)" <-- parse error at position 60 within geometry
 ERROR:  parse error - invalid geometry
 HINT:  "...INESTRING((0 0, 1 1),(0 0, 1 1, 2 2,)" <-- parse error at position 43 within geometry
 ERROR:  parse error - invalid geometry

diff --git a/regress/regress_ogc_expected b/regress/regress_ogc_expected
index b1ab7ba48886668ddf179fa7672beeaf7bb13349..37b975a62dd22253d2718cbb4598287368525aae 100644 (file)
--- a/regress/regress_ogc_expected
+++ b/regress/regress_ogc_expected
@@ -75,7 +75,7 @@ polygonize_garray|POLYGON((10 0,0 0,0 10,10 10,10 0))
 linemerge149|LINESTRING(-5 -5,0 0,1 1,4 4)
 intersects|f
 ERROR:  geometry requires more points
-HINT:  "POLYGON((0 0, 1 1, 0 0))" <-- parse error at position 24 within geometry
+HINT:  "POLYGON((0 0, 1 1, 0 0)" <-- parse error at position 23 within geometry
 buffer|POLYGON((1 0,0.707107 -0.707107,0 -1,-0.707107 -0.707107,-1 0,-0.707107 0.707107,0 1,0.707107 0.707107,1 0))
 geomunion|MULTIPOINT(0 0,1 1)
 unite_garray|t

diff --git a/regress/sql-mm-curvepoly_expected b/regress/sql-mm-curvepoly_expected
index 880d47ed9a3b019d45fd4b029cf9f45ab1aca175..dae758d5944beeb9322e2545518032d38577534b 100644 (file)
--- a/regress/sql-mm-curvepoly_expected
+++ b/regress/sql-mm-curvepoly_expected
@@ -149,7 +149,7 @@ HINT:  "...146.1209416055467 -30.19711586270431)" <-- parse error at position 26
 ERROR:  incontinuous compound curve
 HINT:  "...45.55230712890625 -33.49203872680664)" <-- parse error at position 435 within geometry
 ERROR:  geometry contains non-closed rings
-HINT:  "...4.84399355252685 -30.76123924022086))" <-- parse error at position 647 within geometry
+HINT:  "...44.84399355252685 -30.76123924022086)" <-- parse error at position 646 within geometry
 ERROR:  geometry requires more points
 HINT:  "...45.55230712890625 -33.49203872680664)" <-- parse error at position 475 within geometry
 valid ewkb curve polygon 1|CURVEPOLYGON((143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768))
@@ -163,6 +163,6 @@ segmentize/desegmentize 2|9
 segmentize/desegmentize 3|9
 010D0000000200000001090000000200000001080000000500000000000000000000000000000000000000000000000000004000000000000000000000000000000040000000000000F03F00000000000000400000000000000840000000000000104000000000000008400102000000040000000000000000001040000000000000084000000000000010400000000000001440000000000000F03F000000000000104000000000000000000000000000000000010800000003000000333333333333FB3F000000000000F03F666666666666F63F9A9999999999D93F333333333333FB3F000000000000F03F
 ERROR:  geometry requires more points
-HINT:  "...1 4, 0 0)), (1.7 1, 1.4 0.4, 1.7 1) )" <-- parse error at position 114 within geometry
+HINT:  "..., 1 4, 0 0)), (1.7 1, 1.4 0.4, 1.7 1)" <-- parse error at position 112 within geometry
 010D0000000200000001090000000200000001080000000500000000000000000000000000000000000000000000000000004000000000000000000000000000000040000000000000F03F00000000000000400000000000000840000000000000104000000000000008400102000000020000000000000000001040000000000000084000000000000000000000000000000000010800000003000000333333333333FB3F000000000000F03F666666666666F63F9A9999999999D93F333333333333FB3F000000000000F03F
 null response|