#3181, harmonize tests to new POINT EMPTY format

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

diff --git a/regress/binary_expected b/regress/binary_expected
index 743ae416dc5e73d9f3d1d83afe403c31556dcd4d..1ea72c289db387bdb5e005b5aad8d582586ea40c 100644 (file)
--- a/regress/binary_expected
+++ b/regress/binary_expected
@@ -1,2 +1,2 @@
-geometry|106
-geometry|48
+geometry|114
+geometry|56

diff --git a/regress/tickets_expected b/regress/tickets_expected
index d919052dafaa452f70fd24823a812ca098f7464d..e85cca4f87857b9836ab13e4e1bf8122b65bd476 100644 (file)
--- a/regress/tickets_expected
+++ b/regress/tickets_expected
@@ -185,7 +185,7 @@ ERROR:  MultiSurface cannot contain MultiPoint element at character 8
 #1453.2|f
 #1454|t
 #1414|CURVEPOLYGON Z EMPTY
-#1478|01040000200100000000000000
+#1478|010100002001000000000000000000f87f000000000000f87f
 #745|GEOMETRYCOLLECTION(POLYGON((-72 42 1,-70 43 1,-71 41 1,-72 42 1)))
 #1450|POINT|POLYGON
 #1482|4326

diff --git a/regress/typmod_expected b/regress/typmod_expected
index ab724b97b7b2908790ecb7579a6c968595ed4d31..2e5716ce753e56366d557163182a5551d5d55d32 100644 (file)
--- a/regress/typmod_expected
+++ b/regress/typmod_expected
@@ -13488,7 +13488,7 @@ multilinestringzm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multilinestringzm4326|4326|Tin|3|KO-BKO-GKO-BGKO
 multilinestringzm4326||COUNT|2|
 multilinestringzm4326||GCOUNT|4|
-multipoint|0|Point|0|OK-BOK-GOK-BGOK
+multipoint|0|Point|0|KO-BKO-GKO-BGKO
 multipoint|0|PointNE|0|KO-BKO-GKO-BGKO
 multipoint|0|LineString|0|KO-BKO-GKO-BGKO
 multipoint|0|Polygon|0|KO-BKO-GKO-BGKO
@@ -13556,7 +13556,7 @@ multipoint|0|MultiSurface|3|KO-BKO-GKO-BGKO
 multipoint|0|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipoint|0|Triangle|3|KO-BKO-GKO-BGKO
 multipoint|0|Tin|3|KO-BKO-GKO-BGKO
-multipoint|4326|Point|0|OK-BOK-GOK-BGOK
+multipoint|4326|Point|0|KO-BKO-GKO-BGKO
 multipoint|4326|PointNE|0|KO-BKO-GKO-BGKO
 multipoint|4326|LineString|0|KO-BKO-GKO-BGKO
 multipoint|4326|Polygon|0|KO-BKO-GKO-BGKO
@@ -13624,9 +13624,9 @@ multipoint|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipoint|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipoint|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipoint|4326|Tin|3|KO-BKO-GKO-BGKO
-multipoint||COUNT|12|
-multipoint||GCOUNT|12|
-multipoint0|0|Point|0|OK-BOK-GOK-BGOK
+multipoint||COUNT|8|
+multipoint||GCOUNT|8|
+multipoint0|0|Point|0|KO-BKO-GKO-BGKO
 multipoint0|0|PointNE|0|KO-BKO-GKO-BGKO
 multipoint0|0|LineString|0|KO-BKO-GKO-BGKO
 multipoint0|0|Polygon|0|KO-BKO-GKO-BGKO
@@ -13694,7 +13694,7 @@ multipoint0|0|MultiSurface|3|KO-BKO-GKO-BGKO
 multipoint0|0|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipoint0|0|Triangle|3|KO-BKO-GKO-BGKO
 multipoint0|0|Tin|3|KO-BKO-GKO-BGKO
-multipoint0|4326|Point|0|OK-BOK-GOK-BGOK
+multipoint0|4326|Point|0|KO-BKO-GKO-BGKO
 multipoint0|4326|PointNE|0|KO-BKO-GKO-BGKO
 multipoint0|4326|LineString|0|KO-BKO-GKO-BGKO
 multipoint0|4326|Polygon|0|KO-BKO-GKO-BGKO
@@ -13762,9 +13762,9 @@ multipoint0|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipoint0|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipoint0|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipoint0|4326|Tin|3|KO-BKO-GKO-BGKO
-multipoint0||COUNT|12|
-multipoint0||GCOUNT|12|
-multipoint4326|0|Point|0|KO-BKO-GOK-BGOK
+multipoint0||COUNT|8|
+multipoint0||GCOUNT|8|
+multipoint4326|0|Point|0|KO-BKO-GKO-BGKO
 multipoint4326|0|PointNE|0|KO-BKO-GKO-BGKO
 multipoint4326|0|LineString|0|KO-BKO-GKO-BGKO
 multipoint4326|0|Polygon|0|KO-BKO-GKO-BGKO
@@ -13832,7 +13832,7 @@ multipoint4326|0|MultiSurface|3|KO-BKO-GKO-BGKO
 multipoint4326|0|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipoint4326|0|Triangle|3|KO-BKO-GKO-BGKO
 multipoint4326|0|Tin|3|KO-BKO-GKO-BGKO
-multipoint4326|4326|Point|0|OK-BOK-GOK-BGOK
+multipoint4326|4326|Point|0|KO-BKO-GKO-BGKO
 multipoint4326|4326|PointNE|0|KO-BKO-GKO-BGKO
 multipoint4326|4326|LineString|0|KO-BKO-GKO-BGKO
 multipoint4326|4326|Polygon|0|KO-BKO-GKO-BGKO
@@ -13900,8 +13900,8 @@ multipoint4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipoint4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipoint4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipoint4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multipoint4326||COUNT|6|
-multipoint4326||GCOUNT|12|
+multipoint4326||COUNT|4|
+multipoint4326||GCOUNT|8|
 multipointm|0|Point|0|KO-BKO-GKO-BGKO
 multipointm|0|PointNE|0|KO-BKO-GKO-BGKO
 multipointm|0|LineString|0|KO-BKO-GKO-BGKO
@@ -13936,7 +13936,7 @@ multipointm|0|MultiSurface|2|KO-BKO-GKO-BGKO
 multipointm|0|PolyhedralSurface|2|KO-BKO-GKO-BGKO
 multipointm|0|Triangle|2|KO-BKO-GKO-BGKO
 multipointm|0|Tin|2|KO-BKO-GKO-BGKO
-multipointm|0|Point|1|OK-BOK-GOK-BGOK
+multipointm|0|Point|1|KO-BKO-GKO-BGKO
 multipointm|0|PointNE|1|KO-BKO-GKO-BGKO
 multipointm|0|LineString|1|KO-BKO-GKO-BGKO
 multipointm|0|Polygon|1|KO-BKO-GKO-BGKO
@@ -14004,7 +14004,7 @@ multipointm|4326|MultiSurface|2|KO-BKO-GKO-BGKO
 multipointm|4326|PolyhedralSurface|2|KO-BKO-GKO-BGKO
 multipointm|4326|Triangle|2|KO-BKO-GKO-BGKO
 multipointm|4326|Tin|2|KO-BKO-GKO-BGKO
-multipointm|4326|Point|1|OK-BOK-GOK-BGOK
+multipointm|4326|Point|1|KO-BKO-GKO-BGKO
 multipointm|4326|PointNE|1|KO-BKO-GKO-BGKO
 multipointm|4326|LineString|1|KO-BKO-GKO-BGKO
 multipointm|4326|Polygon|1|KO-BKO-GKO-BGKO
@@ -14038,8 +14038,8 @@ multipointm|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipointm|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipointm|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipointm|4326|Tin|3|KO-BKO-GKO-BGKO
-multipointm||COUNT|12|
-multipointm||GCOUNT|12|
+multipointm||COUNT|8|
+multipointm||GCOUNT|8|
 multipointm0|0|Point|0|KO-BKO-GKO-BGKO
 multipointm0|0|PointNE|0|KO-BKO-GKO-BGKO
 multipointm0|0|LineString|0|KO-BKO-GKO-BGKO
@@ -14074,7 +14074,7 @@ multipointm0|0|MultiSurface|2|KO-BKO-GKO-BGKO
 multipointm0|0|PolyhedralSurface|2|KO-BKO-GKO-BGKO
 multipointm0|0|Triangle|2|KO-BKO-GKO-BGKO
 multipointm0|0|Tin|2|KO-BKO-GKO-BGKO
-multipointm0|0|Point|1|OK-BOK-GOK-BGOK
+multipointm0|0|Point|1|KO-BKO-GKO-BGKO
 multipointm0|0|PointNE|1|KO-BKO-GKO-BGKO
 multipointm0|0|LineString|1|KO-BKO-GKO-BGKO
 multipointm0|0|Polygon|1|KO-BKO-GKO-BGKO
@@ -14142,7 +14142,7 @@ multipointm0|4326|MultiSurface|2|KO-BKO-GKO-BGKO
 multipointm0|4326|PolyhedralSurface|2|KO-BKO-GKO-BGKO
 multipointm0|4326|Triangle|2|KO-BKO-GKO-BGKO
 multipointm0|4326|Tin|2|KO-BKO-GKO-BGKO
-multipointm0|4326|Point|1|OK-BOK-GOK-BGOK
+multipointm0|4326|Point|1|KO-BKO-GKO-BGKO
 multipointm0|4326|PointNE|1|KO-BKO-GKO-BGKO
 multipointm0|4326|LineString|1|KO-BKO-GKO-BGKO
 multipointm0|4326|Polygon|1|KO-BKO-GKO-BGKO
@@ -14176,8 +14176,8 @@ multipointm0|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipointm0|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipointm0|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipointm0|4326|Tin|3|KO-BKO-GKO-BGKO
-multipointm0||COUNT|12|
-multipointm0||GCOUNT|12|
+multipointm0||COUNT|8|
+multipointm0||GCOUNT|8|
 multipointm4326|0|Point|0|KO-BKO-GKO-BGKO
 multipointm4326|0|PointNE|0|KO-BKO-GKO-BGKO
 multipointm4326|0|LineString|0|KO-BKO-GKO-BGKO
@@ -14212,7 +14212,7 @@ multipointm4326|0|MultiSurface|2|KO-BKO-GKO-BGKO
 multipointm4326|0|PolyhedralSurface|2|KO-BKO-GKO-BGKO
 multipointm4326|0|Triangle|2|KO-BKO-GKO-BGKO
 multipointm4326|0|Tin|2|KO-BKO-GKO-BGKO
-multipointm4326|0|Point|1|KO-BKO-GOK-BGOK
+multipointm4326|0|Point|1|KO-BKO-GKO-BGKO
 multipointm4326|0|PointNE|1|KO-BKO-GKO-BGKO
 multipointm4326|0|LineString|1|KO-BKO-GKO-BGKO
 multipointm4326|0|Polygon|1|KO-BKO-GKO-BGKO
@@ -14280,7 +14280,7 @@ multipointm4326|4326|MultiSurface|2|KO-BKO-GKO-BGKO
 multipointm4326|4326|PolyhedralSurface|2|KO-BKO-GKO-BGKO
 multipointm4326|4326|Triangle|2|KO-BKO-GKO-BGKO
 multipointm4326|4326|Tin|2|KO-BKO-GKO-BGKO
-multipointm4326|4326|Point|1|OK-BOK-GOK-BGOK
+multipointm4326|4326|Point|1|KO-BKO-GKO-BGKO
 multipointm4326|4326|PointNE|1|KO-BKO-GKO-BGKO
 multipointm4326|4326|LineString|1|KO-BKO-GKO-BGKO
 multipointm4326|4326|Polygon|1|KO-BKO-GKO-BGKO
@@ -14314,8 +14314,8 @@ multipointm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipointm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipointm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipointm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multipointm4326||COUNT|6|
-multipointm4326||GCOUNT|12|
+multipointm4326||COUNT|4|
+multipointm4326||GCOUNT|8|
 multipointz|0|Point|0|KO-BKO-GKO-BGKO
 multipointz|0|PointNE|0|KO-BKO-GKO-BGKO
 multipointz|0|LineString|0|KO-BKO-GKO-BGKO
@@ -14333,7 +14333,7 @@ multipointz|0|MultiSurface|0|KO-BKO-GKO-BGKO
 multipointz|0|PolyhedralSurface|0|KO-BKO-GKO-BGKO
 multipointz|0|Triangle|0|KO-BKO-GKO-BGKO
 multipointz|0|Tin|0|KO-BKO-GKO-BGKO
-multipointz|0|Point|2|OK-BOK-GOK-BGOK
+multipointz|0|Point|2|KO-BKO-GKO-BGKO
 multipointz|0|PointNE|2|KO-BKO-GKO-BGKO
 multipointz|0|LineString|2|KO-BKO-GKO-BGKO
 multipointz|0|Polygon|2|KO-BKO-GKO-BGKO
@@ -14401,7 +14401,7 @@ multipointz|4326|MultiSurface|0|KO-BKO-GKO-BGKO
 multipointz|4326|PolyhedralSurface|0|KO-BKO-GKO-BGKO
 multipointz|4326|Triangle|0|KO-BKO-GKO-BGKO
 multipointz|4326|Tin|0|KO-BKO-GKO-BGKO
-multipointz|4326|Point|2|OK-BOK-GOK-BGOK
+multipointz|4326|Point|2|KO-BKO-GKO-BGKO
 multipointz|4326|PointNE|2|KO-BKO-GKO-BGKO
 multipointz|4326|LineString|2|KO-BKO-GKO-BGKO
 multipointz|4326|Polygon|2|KO-BKO-GKO-BGKO
@@ -14452,8 +14452,8 @@ multipointz|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipointz|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipointz|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipointz|4326|Tin|3|KO-BKO-GKO-BGKO
-multipointz||COUNT|12|
-multipointz||GCOUNT|12|
+multipointz||COUNT|8|
+multipointz||GCOUNT|8|
 multipointz0|0|Point|0|KO-BKO-GKO-BGKO
 multipointz0|0|PointNE|0|KO-BKO-GKO-BGKO
 multipointz0|0|LineString|0|KO-BKO-GKO-BGKO
@@ -14471,7 +14471,7 @@ multipointz0|0|MultiSurface|0|KO-BKO-GKO-BGKO
 multipointz0|0|PolyhedralSurface|0|KO-BKO-GKO-BGKO
 multipointz0|0|Triangle|0|KO-BKO-GKO-BGKO
 multipointz0|0|Tin|0|KO-BKO-GKO-BGKO
-multipointz0|0|Point|2|OK-BOK-GOK-BGOK
+multipointz0|0|Point|2|KO-BKO-GKO-BGKO
 multipointz0|0|PointNE|2|KO-BKO-GKO-BGKO
 multipointz0|0|LineString|2|KO-BKO-GKO-BGKO
 multipointz0|0|Polygon|2|KO-BKO-GKO-BGKO
@@ -14539,7 +14539,7 @@ multipointz0|4326|MultiSurface|0|KO-BKO-GKO-BGKO
 multipointz0|4326|PolyhedralSurface|0|KO-BKO-GKO-BGKO
 multipointz0|4326|Triangle|0|KO-BKO-GKO-BGKO
 multipointz0|4326|Tin|0|KO-BKO-GKO-BGKO
-multipointz0|4326|Point|2|OK-BOK-GOK-BGOK
+multipointz0|4326|Point|2|KO-BKO-GKO-BGKO
 multipointz0|4326|PointNE|2|KO-BKO-GKO-BGKO
 multipointz0|4326|LineString|2|KO-BKO-GKO-BGKO
 multipointz0|4326|Polygon|2|KO-BKO-GKO-BGKO
@@ -14590,8 +14590,8 @@ multipointz0|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipointz0|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipointz0|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipointz0|4326|Tin|3|KO-BKO-GKO-BGKO
-multipointz0||COUNT|12|
-multipointz0||GCOUNT|12|
+multipointz0||COUNT|8|
+multipointz0||GCOUNT|8|
 multipointz4326|0|Point|0|KO-BKO-GKO-BGKO
 multipointz4326|0|PointNE|0|KO-BKO-GKO-BGKO
 multipointz4326|0|LineString|0|KO-BKO-GKO-BGKO
@@ -14609,7 +14609,7 @@ multipointz4326|0|MultiSurface|0|KO-BKO-GKO-BGKO
 multipointz4326|0|PolyhedralSurface|0|KO-BKO-GKO-BGKO
 multipointz4326|0|Triangle|0|KO-BKO-GKO-BGKO
 multipointz4326|0|Tin|0|KO-BKO-GKO-BGKO
-multipointz4326|0|Point|2|KO-BKO-GOK-BGOK
+multipointz4326|0|Point|2|KO-BKO-GKO-BGKO
 multipointz4326|0|PointNE|2|KO-BKO-GKO-BGKO
 multipointz4326|0|LineString|2|KO-BKO-GKO-BGKO
 multipointz4326|0|Polygon|2|KO-BKO-GKO-BGKO
@@ -14677,7 +14677,7 @@ multipointz4326|4326|MultiSurface|0|KO-BKO-GKO-BGKO
 multipointz4326|4326|PolyhedralSurface|0|KO-BKO-GKO-BGKO
 multipointz4326|4326|Triangle|0|KO-BKO-GKO-BGKO
 multipointz4326|4326|Tin|0|KO-BKO-GKO-BGKO
-multipointz4326|4326|Point|2|OK-BOK-GOK-BGOK
+multipointz4326|4326|Point|2|KO-BKO-GKO-BGKO
 multipointz4326|4326|PointNE|2|KO-BKO-GKO-BGKO
 multipointz4326|4326|LineString|2|KO-BKO-GKO-BGKO
 multipointz4326|4326|Polygon|2|KO-BKO-GKO-BGKO
@@ -14728,8 +14728,8 @@ multipointz4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipointz4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipointz4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipointz4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multipointz4326||COUNT|6|
-multipointz4326||GCOUNT|12|
+multipointz4326||COUNT|4|
+multipointz4326||GCOUNT|8|
 multipointzm|0|Point|0|KO-BKO-GKO-BGKO
 multipointzm|0|PointNE|0|KO-BKO-GKO-BGKO
 multipointzm|0|LineString|0|KO-BKO-GKO-BGKO
@@ -14781,7 +14781,7 @@ multipointzm|0|MultiSurface|1|KO-BKO-GKO-BGKO
 multipointzm|0|PolyhedralSurface|1|KO-BKO-GKO-BGKO
 multipointzm|0|Triangle|1|KO-BKO-GKO-BGKO
 multipointzm|0|Tin|1|KO-BKO-GKO-BGKO
-multipointzm|0|Point|3|OK-BOK-GOK-BGOK
+multipointzm|0|Point|3|KO-BKO-GKO-BGKO
 multipointzm|0|PointNE|3|KO-BKO-GKO-BGKO
 multipointzm|0|LineString|3|KO-BKO-GKO-BGKO
 multipointzm|0|Polygon|3|KO-BKO-GKO-BGKO
@@ -14849,7 +14849,7 @@ multipointzm|4326|MultiSurface|1|KO-BKO-GKO-BGKO
 multipointzm|4326|PolyhedralSurface|1|KO-BKO-GKO-BGKO
 multipointzm|4326|Triangle|1|KO-BKO-GKO-BGKO
 multipointzm|4326|Tin|1|KO-BKO-GKO-BGKO
-multipointzm|4326|Point|3|OK-BOK-GOK-BGOK
+multipointzm|4326|Point|3|KO-BKO-GKO-BGKO
 multipointzm|4326|PointNE|3|KO-BKO-GKO-BGKO
 multipointzm|4326|LineString|3|KO-BKO-GKO-BGKO
 multipointzm|4326|Polygon|3|KO-BKO-GKO-BGKO
@@ -14866,8 +14866,8 @@ multipointzm|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipointzm|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipointzm|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipointzm|4326|Tin|3|KO-BKO-GKO-BGKO
-multipointzm||COUNT|12|
-multipointzm||GCOUNT|12|
+multipointzm||COUNT|8|
+multipointzm||GCOUNT|8|
 multipointzm0|0|Point|0|KO-BKO-GKO-BGKO
 multipointzm0|0|PointNE|0|KO-BKO-GKO-BGKO
 multipointzm0|0|LineString|0|KO-BKO-GKO-BGKO
@@ -14919,7 +14919,7 @@ multipointzm0|0|MultiSurface|1|KO-BKO-GKO-BGKO
 multipointzm0|0|PolyhedralSurface|1|KO-BKO-GKO-BGKO
 multipointzm0|0|Triangle|1|KO-BKO-GKO-BGKO
 multipointzm0|0|Tin|1|KO-BKO-GKO-BGKO
-multipointzm0|0|Point|3|OK-BOK-GOK-BGOK
+multipointzm0|0|Point|3|KO-BKO-GKO-BGKO
 multipointzm0|0|PointNE|3|KO-BKO-GKO-BGKO
 multipointzm0|0|LineString|3|KO-BKO-GKO-BGKO
 multipointzm0|0|Polygon|3|KO-BKO-GKO-BGKO
@@ -14987,7 +14987,7 @@ multipointzm0|4326|MultiSurface|1|KO-BKO-GKO-BGKO
 multipointzm0|4326|PolyhedralSurface|1|KO-BKO-GKO-BGKO
 multipointzm0|4326|Triangle|1|KO-BKO-GKO-BGKO
 multipointzm0|4326|Tin|1|KO-BKO-GKO-BGKO
-multipointzm0|4326|Point|3|OK-BOK-GOK-BGOK
+multipointzm0|4326|Point|3|KO-BKO-GKO-BGKO
 multipointzm0|4326|PointNE|3|KO-BKO-GKO-BGKO
 multipointzm0|4326|LineString|3|KO-BKO-GKO-BGKO
 multipointzm0|4326|Polygon|3|KO-BKO-GKO-BGKO
@@ -15004,8 +15004,8 @@ multipointzm0|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipointzm0|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipointzm0|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipointzm0|4326|Tin|3|KO-BKO-GKO-BGKO
-multipointzm0||COUNT|12|
-multipointzm0||GCOUNT|12|
+multipointzm0||COUNT|8|
+multipointzm0||GCOUNT|8|
 multipointzm4326|0|Point|0|KO-BKO-GKO-BGKO
 multipointzm4326|0|PointNE|0|KO-BKO-GKO-BGKO
 multipointzm4326|0|LineString|0|KO-BKO-GKO-BGKO
@@ -15057,7 +15057,7 @@ multipointzm4326|0|MultiSurface|1|KO-BKO-GKO-BGKO
 multipointzm4326|0|PolyhedralSurface|1|KO-BKO-GKO-BGKO
 multipointzm4326|0|Triangle|1|KO-BKO-GKO-BGKO
 multipointzm4326|0|Tin|1|KO-BKO-GKO-BGKO
-multipointzm4326|0|Point|3|KO-BKO-GOK-BGOK
+multipointzm4326|0|Point|3|KO-BKO-GKO-BGKO
 multipointzm4326|0|PointNE|3|KO-BKO-GKO-BGKO
 multipointzm4326|0|LineString|3|KO-BKO-GKO-BGKO
 multipointzm4326|0|Polygon|3|KO-BKO-GKO-BGKO
@@ -15125,7 +15125,7 @@ multipointzm4326|4326|MultiSurface|1|KO-BKO-GKO-BGKO
 multipointzm4326|4326|PolyhedralSurface|1|KO-BKO-GKO-BGKO
 multipointzm4326|4326|Triangle|1|KO-BKO-GKO-BGKO
 multipointzm4326|4326|Tin|1|KO-BKO-GKO-BGKO
-multipointzm4326|4326|Point|3|OK-BOK-GOK-BGOK
+multipointzm4326|4326|Point|3|KO-BKO-GKO-BGKO
 multipointzm4326|4326|PointNE|3|KO-BKO-GKO-BGKO
 multipointzm4326|4326|LineString|3|KO-BKO-GKO-BGKO
 multipointzm4326|4326|Polygon|3|KO-BKO-GKO-BGKO
@@ -15142,8 +15142,8 @@ multipointzm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipointzm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipointzm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipointzm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multipointzm4326||COUNT|6|
-multipointzm4326||GCOUNT|12|
+multipointzm4326||COUNT|4|
+multipointzm4326||GCOUNT|8|
 multipolygon|0|Point|0|KO-BKO-GKO-BGKO
 multipolygon|0|PointNE|0|KO-BKO-GKO-BGKO
 multipolygon|0|LineString|0|KO-BKO-GKO-BGKO

diff --git a/regress/wkb_expected b/regress/wkb_expected
index 621ce2842358f105563f32c848ba39a42a27d4f8..91fa0c897b870525ce79b6ddffb5bb83cd81f642 100644 (file)
--- a/regress/wkb_expected
+++ b/regress/wkb_expected
@@ -1,7 +1,7 @@
-POINT EMPTY|010400000000000000|f|000000000400000000
-POINT Z EMPTY|01ec03000000000000|f|00000003ec00000000
-POINT M EMPTY|01d407000000000000|f|00000007d400000000
-POINT ZM EMPTY|01bc0b000000000000|f|0000000bbc00000000
+POINT EMPTY|0101000000000000000000f87f000000000000f87f|t|00000000017ff80000000000007ff8000000000000
+POINT Z EMPTY|01e9030000000000000000f87f000000000000f87f000000000000f87f|t|00000003e97ff80000000000007ff80000000000007ff8000000000000
+POINT M EMPTY|01d1070000000000000000f87f000000000000f87f000000000000f87f|t|00000007d17ff80000000000007ff80000000000007ff8000000000000
+POINT ZM EMPTY|01b90b0000000000000000f87f000000000000f87f000000000000f87f000000000000f87f|t|0000000bb97ff80000000000007ff80000000000007ff80000000000007ff8000000000000
 POINT(0 0)|010100000000000000000000000000000000000000|t|000000000100000000000000000000000000000000
 POINT Z (1 2 3)|01e9030000000000000000f03f00000000000000400000000000000840|t|00000003e93ff000000000000040000000000000004008000000000000
 POINT M (1 2 3)|01d1070000000000000000f03f00000000000000400000000000000840|t|00000007d13ff000000000000040000000000000004008000000000000
@@ -55,8 +55,8 @@ GEOMETRYCOLLECTION ZM EMPTY|01bf0b000000000000|t|0000000bbf00000000
 GEOMETRYCOLLECTION ZM (POINT ZM (0 0 0 0),LINESTRING ZM (0 0 0 0,1 1 1 1))|01bf0b00000200000001b90b0000000000000000000000000000000000000000000000000000000000000000000001ba0b0000020000000000000000000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f000000000000f03f|t|0000000bbf000000020000000bb900000000000000000000000000000000000000000000000000000000000000000000000bba0000000200000000000000000000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff00000000000003ff0000000000000
 GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1))|01d70700000200000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f|t|00000007d70000000200000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff0000000000000
 GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1),GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1)))|01d70700000300000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f01d70700000200000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f|t|00000007d70000000300000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff000000000000000000007d70000000200000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff0000000000000
-GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1),POINT M EMPTY,GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1)))|01d70700000400000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f01d40700000000000001d70700000200000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f|f|00000007d70000000400000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff000000000000000000007d40000000000000007d70000000200000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff0000000000000
-GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1),GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1),POINT M EMPTY,GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1))),POINT M EMPTY,GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1)))|01d70700000500000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f01d70700000400000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f01d40700000000000001d70700000200000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f01d40700000000000001d70700000200000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f|f|00000007d70000000500000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff000000000000000000007d70000000400000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff000000000000000000007d40000000000000007d70000000200000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff000000000000000000007d40000000000000007d70000000200000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff0000000000000
+GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1),POINT M EMPTY,GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1)))|01d70700000400000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f01d1070000000000000000f87f000000000000f87f000000000000f87f01d70700000200000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f|t|00000007d70000000400000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff000000000000000000007d17ff80000000000007ff80000000000007ff800000000000000000007d70000000200000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff0000000000000
+GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1),GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1),POINT M EMPTY,GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1))),POINT M EMPTY,GEOMETRYCOLLECTION M (POINT M (0 0 0),LINESTRING M (0 0 0,1 1 1)))|01d70700000500000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f01d70700000400000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f01d1070000000000000000f87f000000000000f87f000000000000f87f01d70700000200000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f01d1070000000000000000f87f000000000000f87f000000000000f87f01d70700000200000001d107000000000000000000000000000000000000000000000000000001d207000002000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f|t|00000007d70000000500000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff000000000000000000007d70000000400000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff000000000000000000007d17ff80000000000007ff80000000000007ff800000000000000000007d70000000200000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff000000000000000000007d17ff80000000000007ff80000000000007ff800000000000000000007d70000000200000007d100000000000000000000000000000000000000000000000000000007d2000000020000000000000000000000000000000000000000000000003ff00000000000003ff00000000000003ff0000000000000
 CIRCULARSTRING EMPTY|010800000000000000|t|000000000800000000
 CIRCULARSTRING Z EMPTY|01f003000000000000|t|00000003f000000000
 CIRCULARSTRING M EMPTY|01d807000000000000|t|00000007d800000000