From: David Blasby Date: Thu, 29 Apr 2004 18:20:21 +0000 (+0000) Subject: WKT parser changes required this change X-Git-Tag: pgis_0_8_2~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af532b3ea57f7c01079c509dcc60012c69b6e5b1;p=postgis WKT parser changes required this change git-svn-id: http://svn.osgeo.org/postgis/trunk@539 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/lwgeom/regress/lwgeom_regress2.sql b/lwgeom/regress/lwgeom_regress2.sql index 81c2d162d..98eb48894 100644 --- a/lwgeom/regress/lwgeom_regress2.sql +++ b/lwgeom/regress/lwgeom_regress2.sql @@ -64,7 +64,7 @@ select astext('GEOMETRYCOLLECTION(MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4) ) select astext('GEOMETRYCOLLECTION(POINT( 1 2 3), MULTIPOLYGON( ((0 0 7, 10 0 7, 10 10 7, 0 10 7, 0 0 7)),( (0 0 7, 10 0 7, 10 10 7, 0 10 7, 0 0 7),(5 5 7, 7 5 7, 7 7 7, 5 7 7, 5 5 7) ) ,( (0 0 1, 10 0 1, 10 10 1, 0 10 1, 0 0 1),(5 5 1, 7 5 1, 7 7 1, 5 7 1, 5 5 1),(1 1 1,2 1 1, 2 2 1, 1 2 1, 1 1 1) ) ))'::LWGEOM) as geom; select astext('GEOMETRYCOLLECTION(MULTIPOLYGON( ((0 0 7, 10 0 7, 10 10 7, 0 10 7, 0 0 7)),( (0 0 7, 10 0 7, 10 10 7, 0 10 7, 0 0 7),(5 5 7, 7 5 7, 7 7 7, 5 7 7, 5 5 7) ) ,( (0 0 1, 10 0 1, 10 10 1, 0 10 1, 0 0 1),(5 5 1, 7 5 1, 7 7 1, 5 7 1, 5 5 1),(1 1 1,2 1 1, 2 2 1, 1 2 1, 1 1 1) ) ),MULTILINESTRING( (0 0 7, 1 1 7, 2 2 7, 3 3 7, 4 4 7),(0 0 7, 1 1 7, 2 2 7, 3 3 7 , 4 4 7),(1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15) ),MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13))'::LWGEOM) as geom; -select astext('MULTIPOINT( -1 -2 -3, 5.4 6.6 7.77, -5.4 -6.6 -7.77, 1e6 1e-6 -1e6, -1.3e-6 -1.4e-5)'::LWGEOM) as geom; +select astext('MULTIPOINT( -1 -2 -3, 5.4 6.6 7.77, -5.4 -6.6 -7.77, 1e6 1e-6 -1e6, -1.3e-6 -1.4e-5 1)'::LWGEOM) as geom; --- basic datatype (incorrect) diff --git a/lwgeom/regress/lwgeom_regress2_expected b/lwgeom/regress/lwgeom_regress2_expected index ef5f41993..60855f83e 100644 --- a/lwgeom/regress/lwgeom_regress2_expected +++ b/lwgeom/regress/lwgeom_regress2_expected @@ -131,39 +131,39 @@ select astext('GEOMETRYCOLLECTION(POINT( 1 2 4),POINT( 1 2 3),POLYGON( (0 0 1, (1 row) select astext('MULTIPOINT( 1 2)'::LWGEOM) as geom; - geom -------------------- - MULTIPOINT((1 2)) + geom +----------------- + MULTIPOINT(1 2) (1 row) select astext('MULTIPOINT( 1 2 3)'::LWGEOM) as geom; - geom ---------------------- - MULTIPOINT((1 2 3)) + geom +------------------- + MULTIPOINT(1 2 3) (1 row) select astext('MULTIPOINT( 1 2, 3 4, 5 6)'::LWGEOM) as geom; - geom -------------------------------- - MULTIPOINT((1 2),(3 4),(5 6)) + geom +------------------------- + MULTIPOINT(1 2,3 4,5 6) (1 row) select astext('MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13)'::LWGEOM) as geom; - geom -------------------------------------------------- - MULTIPOINT((1 2 3),(5 6 7),(8 9 10),(11 12 13)) + geom +----------------------------------------- + MULTIPOINT(1 2 3,5 6 7,8 9 10,11 12 13) (1 row) select astext('MULTIPOINT( 1 2 7, 1 2 3, 4 5 9, 6 7 8)'::LWGEOM) as geom; - geom ---------------------------------------------- - MULTIPOINT((1 2 7),(1 2 3),(4 5 9),(6 7 8)) + geom +------------------------------------- + MULTIPOINT(1 2 7,1 2 3,4 5 9,6 7 8) (1 row) select astext('MULTIPOINT( 1 2 3,4 5 7)'::LWGEOM) as geom; - geom ------------------------------ - MULTIPOINT((1 2 3),(4 5 7)) + geom +------------------------- + MULTIPOINT(1 2 3,4 5 7) (1 row) select astext('MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4) )'::LWGEOM) as geom; @@ -209,21 +209,21 @@ select astext('MULTIPOLYGON( ((0 0 7, 10 0 7, 10 10 7, 0 10 7, 0 0 7)),( (0 0 (1 row) select astext('GEOMETRYCOLLECTION(MULTIPOINT( 1 2))'::LWGEOM) as geom; - geom ---------------------------------------- - GEOMETRYCOLLECTION(MULTIPOINT((1 2))) + geom +------------------------------------- + GEOMETRYCOLLECTION(MULTIPOINT(1 2)) (1 row) select astext('GEOMETRYCOLLECTION(MULTIPOINT( 1 2 3))'::LWGEOM) as geom; - geom ------------------------------------------ - GEOMETRYCOLLECTION(MULTIPOINT((1 2 3))) + geom +--------------------------------------- + GEOMETRYCOLLECTION(MULTIPOINT(1 2 3)) (1 row) select astext('GEOMETRYCOLLECTION(MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13))'::LWGEOM) as geom; - geom ---------------------------------------------------------------------- - GEOMETRYCOLLECTION(MULTIPOINT((1 2 3),(5 6 7),(8 9 10),(11 12 13))) + geom +------------------------------------------------------------- + GEOMETRYCOLLECTION(MULTIPOINT(1 2 3,5 6 7,8 9 10,11 12 13)) (1 row) select astext('GEOMETRYCOLLECTION(MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4) ))'::LWGEOM) as geom; @@ -245,15 +245,15 @@ select astext('GEOMETRYCOLLECTION(MULTIPOLYGON( ((0 0 7, 10 0 7, 10 10 7, 0 10 (1 row) select astext('GEOMETRYCOLLECTION(POINT( 1 2 7),MULTIPOINT( 1 2 3))'::LWGEOM) as geom; - geom ------------------------------------------------------- - GEOMETRYCOLLECTION(POINT(1 2 7),MULTIPOINT((1 2 3))) + geom +---------------------------------------------------- + GEOMETRYCOLLECTION(POINT(1 2 7),MULTIPOINT(1 2 3)) (1 row) select astext('GEOMETRYCOLLECTION(MULTIPOINT( 1 2 3, 3 4 3, 5 6 3),POINT( 1 2 3))'::LWGEOM) as geom; - geom ----------------------------------------------------------------------- - GEOMETRYCOLLECTION(MULTIPOINT((1 2 3),(3 4 3),(5 6 3)),POINT(1 2 3)) + geom +---------------------------------------------------------------- + GEOMETRYCOLLECTION(MULTIPOINT(1 2 3,3 4 3,5 6 3),POINT(1 2 3)) (1 row) select astext('GEOMETRYCOLLECTION(POINT( 1 2),MULTILINESTRING( (0 0, 1 1, 2 2, 3 3 , 4 4) ))'::LWGEOM) as geom; @@ -275,13 +275,17 @@ select astext('GEOMETRYCOLLECTION(POINT( 1 2 3), MULTIPOLYGON( ((0 0 7, 10 0 7 (1 row) select astext('GEOMETRYCOLLECTION(MULTIPOLYGON( ((0 0 7, 10 0 7, 10 10 7, 0 10 7, 0 0 7)),( (0 0 7, 10 0 7, 10 10 7, 0 10 7, 0 0 7),(5 5 7, 7 5 7, 7 7 7, 5 7 7, 5 5 7) ) ,( (0 0 1, 10 0 1, 10 10 1, 0 10 1, 0 0 1),(5 5 1, 7 5 1, 7 7 1, 5 7 1, 5 5 1),(1 1 1,2 1 1, 2 2 1, 1 2 1, 1 1 1) ) ),MULTILINESTRING( (0 0 7, 1 1 7, 2 2 7, 3 3 7, 4 4 7),(0 0 7, 1 1 7, 2 2 7, 3 3 7 , 4 4 7),(1 2 3 , 4 5 6 , 7 8 9 , 10 11 12, 13 14 15) ),MULTIPOINT( 1 2 3, 5 6 7, 8 9 10, 11 12 13))'::LWGEOM) as geom; - geom ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0 7,10 0 7,10 10 7,0 10 7,0 0 7)),((0 0 7,10 0 7,10 10 7,0 10 7,0 0 7),(5 5 7,7 5 7,7 7 7,5 7 7,5 5 7)),((0 0 1,10 0 1,10 10 1,0 10 1,0 0 1),(5 5 1,7 5 1,7 7 1,5 7 1,5 5 1),(1 1 1,2 1 1,2 2 1,1 2 1,1 1 1))),MULTILINESTRING((0 0 7,1 1 7,2 2 7,3 3 7,4 4 7),(0 0 7,1 1 7,2 2 7,3 3 7,4 4 7),(1 2 3,4 5 6,7 8 9,10 11 12,13 14 15)),MULTIPOINT((1 2 3),(5 6 7),(8 9 10),(11 12 13))) + geom +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + GEOMETRYCOLLECTION(MULTIPOLYGON(((0 0 7,10 0 7,10 10 7,0 10 7,0 0 7)),((0 0 7,10 0 7,10 10 7,0 10 7,0 0 7),(5 5 7,7 5 7,7 7 7,5 7 7,5 5 7)),((0 0 1,10 0 1,10 10 1,0 10 1,0 0 1),(5 5 1,7 5 1,7 7 1,5 7 1,5 5 1),(1 1 1,2 1 1,2 2 1,1 2 1,1 1 1))),MULTILINESTRING((0 0 7,1 1 7,2 2 7,3 3 7,4 4 7),(0 0 7,1 1 7,2 2 7,3 3 7,4 4 7),(1 2 3,4 5 6,7 8 9,10 11 12,13 14 15)),MULTIPOINT(1 2 3,5 6 7,8 9 10,11 12 13)) +(1 row) + +select astext('MULTIPOINT( -1 -2 -3, 5.4 6.6 7.77, -5.4 -6.6 -7.77, 1e6 1e-6 -1e6, -1.3e-6 -1.4e-5 1)'::LWGEOM) as geom; + geom +---------------------------------------------------------------------------------------------- + MULTIPOINT(-1 -2 -3,5.4 6.6 7.77,-5.4 -6.6 -7.77,1000000 1e-06 -1000000,-1.3e-06 -1.4e-05 1) (1 row) -select astext('MULTIPOINT( -1 -2 -3, 5.4 6.6 7.77, -5.4 -6.6 -7.77, 1e6 1e-6 -1e6, -1.3e-6 -1.4e-5)'::LWGEOM) as geom; -ERROR: parse error - invalid geometry begin; BEGIN select astext('POINT()'::LWGEOM) as geom; @@ -361,9 +365,17 @@ ERROR: parse error - invalid geometry select astext('LINESTRING(1 1)'::LWGEOM) as geom; ERROR: geometry requires more points select astext('POINT( 1e700 0)'::LWGEOM) as geom; -ERROR: parse error - invalid geometry + geom +-------------- + POINT(inf 0) +(1 row) + select astext('POINT( -1e700 0)'::LWGEOM) as geom; -ERROR: parse error - invalid geometry + geom +--------------- + POINT(-inf 0) +(1 row) + select astext('MULTIPOINT(1 1, 2 2'::LWGEOM) as geom; ERROR: parse error - invalid geometry select 'POINT(1 1)'::LWGEOM ~= 'POINT(1 1)'::LWGEOM as bool;