[postgis-tickets] [SCM] PostGIS; Spatial objects for PostgreSQL. branch master updated. f95dfc7b4a37cfa82872d5213f14fa1f77bf356a

git at osgeo.org git at osgeo.org
Mon Nov 4 13:13:27 PST 2019 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS; Spatial objects for PostgreSQL.".

The branch, master has been updated
       via  f95dfc7b4a37cfa82872d5213f14fa1f77bf356a (commit)
      from  91a3030781aea86e63f75996b7b83fe393662f93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f95dfc7b4a37cfa82872d5213f14fa1f77bf356a
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Nov 4 13:13:02 2019 -0800

    Allow SRID coercion when inserting unknown SRID geometry into known SRID column
    Closes #4569

diff --git a/NEWS b/NEWS
index cb9f4b7..36c7083 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PostGIS 3.1.0
 
 * Enhancements *
   - #4539, Unify libm includes (Raúl Marín)
+  - #4569, Allow unknown SRID geometry insertion into typmod SRID column (Paul Ramsey)
 
 * Bug fixes *
   - #4544, Fix leak when parsing a WKT geometry_list (Raúl Marín)
diff --git a/postgis/gserialized_typmod.c b/postgis/gserialized_typmod.c
index ea2a500..ef1eb79 100644
--- a/postgis/gserialized_typmod.c
+++ b/postgis/gserialized_typmod.c
@@ -148,6 +148,13 @@ GSERIALIZED* postgis_valid_typmod(GSERIALIZED *gser, int32_t typmod)
 			gser = geometry_serialize(lwpoint_as_lwgeom(empty_point));
 	}
 
+	/* Typmod has a preference for SRID, but geometry does not? Harmonize the geometry SRID. */
+	if ( typmod_srid > 0 && geom_srid == 0 )
+	{
+		gserialized_set_srid(gser, typmod_srid);
+		geom_srid = typmod_srid;
+	}
+
 	/* Typmod has a preference for SRID? Geometry SRID had better match. */
 	if ( typmod_srid > 0 && typmod_srid != geom_srid )
 	{
diff --git a/regress/core/typmod_expected b/regress/core/typmod_expected
index 2e5716c..93d25a7 100644
--- a/regress/core/typmod_expected
+++ b/regress/core/typmod_expected
@@ -571,7 +571,7 @@ circularstring4326|0|MultiPointNE|0|KO-BKO
 circularstring4326|0|MultiLineString|0|KO-BKO
 circularstring4326|0|MultiPolygon|0|KO-BKO
 circularstring4326|0|GeometryCollection|0|KO-BKO
-circularstring4326|0|CircularString|0|KO-BKO
+circularstring4326|0|CircularString|0|OK-BOK
 circularstring4326|0|CompoundCurve|0|KO-BKO
 circularstring4326|0|CurvePolygon|0|KO-BKO
 circularstring4326|0|MultiCurve|0|KO-BKO
@@ -698,7 +698,7 @@ circularstring4326|4326|MultiSurface|3|KO-BKO
 circularstring4326|4326|PolyhedralSurface|3|KO-BKO
 circularstring4326|4326|Triangle|3|KO-BKO
 circularstring4326|4326|Tin|3|KO-BKO
-circularstring4326||COUNT|2|
+circularstring4326||COUNT|4|
 circularstringm|0|Point|0|KO-BKO
 circularstringm|0|PointNE|0|KO-BKO
 circularstringm|0|LineString|0|KO-BKO
@@ -1016,7 +1016,7 @@ circularstringm4326|0|MultiPointNE|1|KO-BKO
 circularstringm4326|0|MultiLineString|1|KO-BKO
 circularstringm4326|0|MultiPolygon|1|KO-BKO
 circularstringm4326|0|GeometryCollection|1|KO-BKO
-circularstringm4326|0|CircularString|1|KO-BKO
+circularstringm4326|0|CircularString|1|OK-BOK
 circularstringm4326|0|CompoundCurve|1|KO-BKO
 circularstringm4326|0|CurvePolygon|1|KO-BKO
 circularstringm4326|0|MultiCurve|1|KO-BKO
@@ -1109,7 +1109,7 @@ circularstringm4326|4326|MultiSurface|3|KO-BKO
 circularstringm4326|4326|PolyhedralSurface|3|KO-BKO
 circularstringm4326|4326|Triangle|3|KO-BKO
 circularstringm4326|4326|Tin|3|KO-BKO
-circularstringm4326||COUNT|2|
+circularstringm4326||COUNT|4|
 circularstringz|0|Point|0|KO-BKO
 circularstringz|0|PointNE|0|KO-BKO
 circularstringz|0|LineString|0|KO-BKO
@@ -1410,7 +1410,7 @@ circularstringz4326|0|MultiPointNE|2|KO-BKO
 circularstringz4326|0|MultiLineString|2|KO-BKO
 circularstringz4326|0|MultiPolygon|2|KO-BKO
 circularstringz4326|0|GeometryCollection|2|KO-BKO
-circularstringz4326|0|CircularString|2|KO-BKO
+circularstringz4326|0|CircularString|2|OK-BOK
 circularstringz4326|0|CompoundCurve|2|KO-BKO
 circularstringz4326|0|CurvePolygon|2|KO-BKO
 circularstringz4326|0|MultiCurve|2|KO-BKO
@@ -1520,7 +1520,7 @@ circularstringz4326|4326|MultiSurface|3|KO-BKO
 circularstringz4326|4326|PolyhedralSurface|3|KO-BKO
 circularstringz4326|4326|Triangle|3|KO-BKO
 circularstringz4326|4326|Tin|3|KO-BKO
-circularstringz4326||COUNT|2|
+circularstringz4326||COUNT|4|
 circularstringzm|0|Point|0|KO-BKO
 circularstringzm|0|PointNE|0|KO-BKO
 circularstringzm|0|LineString|0|KO-BKO
@@ -1855,7 +1855,7 @@ circularstringzm4326|0|MultiPointNE|3|KO-BKO
 circularstringzm4326|0|MultiLineString|3|KO-BKO
 circularstringzm4326|0|MultiPolygon|3|KO-BKO
 circularstringzm4326|0|GeometryCollection|3|KO-BKO
-circularstringzm4326|0|CircularString|3|KO-BKO
+circularstringzm4326|0|CircularString|3|OK-BOK
 circularstringzm4326|0|CompoundCurve|3|KO-BKO
 circularstringzm4326|0|CurvePolygon|3|KO-BKO
 circularstringzm4326|0|MultiCurve|3|KO-BKO
@@ -1931,7 +1931,7 @@ circularstringzm4326|4326|MultiSurface|3|KO-BKO
 circularstringzm4326|4326|PolyhedralSurface|3|KO-BKO
 circularstringzm4326|4326|Triangle|3|KO-BKO
 circularstringzm4326|4326|Tin|3|KO-BKO
-circularstringzm4326||COUNT|2|
+circularstringzm4326||COUNT|4|
 compoundcurve|0|Point|0|KO-BKO
 compoundcurve|0|PointNE|0|KO-BKO
 compoundcurve|0|LineString|0|KO-BKO
@@ -2216,7 +2216,7 @@ compoundcurve4326|0|MultiLineString|0|KO-BKO
 compoundcurve4326|0|MultiPolygon|0|KO-BKO
 compoundcurve4326|0|GeometryCollection|0|KO-BKO
 compoundcurve4326|0|CircularString|0|KO-BKO
-compoundcurve4326|0|CompoundCurve|0|KO-BKO
+compoundcurve4326|0|CompoundCurve|0|OK-BOK
 compoundcurve4326|0|CurvePolygon|0|KO-BKO
 compoundcurve4326|0|MultiCurve|0|KO-BKO
 compoundcurve4326|0|MultiSurface|0|KO-BKO
@@ -2342,7 +2342,7 @@ compoundcurve4326|4326|MultiSurface|3|KO-BKO
 compoundcurve4326|4326|PolyhedralSurface|3|KO-BKO
 compoundcurve4326|4326|Triangle|3|KO-BKO
 compoundcurve4326|4326|Tin|3|KO-BKO
-compoundcurve4326||COUNT|2|
+compoundcurve4326||COUNT|4|
 compoundcurvem|0|Point|0|KO-BKO
 compoundcurvem|0|PointNE|0|KO-BKO
 compoundcurvem|0|LineString|0|KO-BKO
@@ -2661,7 +2661,7 @@ compoundcurvem4326|0|MultiLineString|1|KO-BKO
 compoundcurvem4326|0|MultiPolygon|1|KO-BKO
 compoundcurvem4326|0|GeometryCollection|1|KO-BKO
 compoundcurvem4326|0|CircularString|1|KO-BKO
-compoundcurvem4326|0|CompoundCurve|1|KO-BKO
+compoundcurvem4326|0|CompoundCurve|1|OK-BOK
 compoundcurvem4326|0|CurvePolygon|1|KO-BKO
 compoundcurvem4326|0|MultiCurve|1|KO-BKO
 compoundcurvem4326|0|MultiSurface|1|KO-BKO
@@ -2753,7 +2753,7 @@ compoundcurvem4326|4326|MultiSurface|3|KO-BKO
 compoundcurvem4326|4326|PolyhedralSurface|3|KO-BKO
 compoundcurvem4326|4326|Triangle|3|KO-BKO
 compoundcurvem4326|4326|Tin|3|KO-BKO
-compoundcurvem4326||COUNT|2|
+compoundcurvem4326||COUNT|4|
 compoundcurvez|0|Point|0|KO-BKO
 compoundcurvez|0|PointNE|0|KO-BKO
 compoundcurvez|0|LineString|0|KO-BKO
@@ -3055,7 +3055,7 @@ compoundcurvez4326|0|MultiLineString|2|KO-BKO
 compoundcurvez4326|0|MultiPolygon|2|KO-BKO
 compoundcurvez4326|0|GeometryCollection|2|KO-BKO
 compoundcurvez4326|0|CircularString|2|KO-BKO
-compoundcurvez4326|0|CompoundCurve|2|KO-BKO
+compoundcurvez4326|0|CompoundCurve|2|OK-BOK
 compoundcurvez4326|0|CurvePolygon|2|KO-BKO
 compoundcurvez4326|0|MultiCurve|2|KO-BKO
 compoundcurvez4326|0|MultiSurface|2|KO-BKO
@@ -3164,7 +3164,7 @@ compoundcurvez4326|4326|MultiSurface|3|KO-BKO
 compoundcurvez4326|4326|PolyhedralSurface|3|KO-BKO
 compoundcurvez4326|4326|Triangle|3|KO-BKO
 compoundcurvez4326|4326|Tin|3|KO-BKO
-compoundcurvez4326||COUNT|2|
+compoundcurvez4326||COUNT|4|
 compoundcurvezm|0|Point|0|KO-BKO
 compoundcurvezm|0|PointNE|0|KO-BKO
 compoundcurvezm|0|LineString|0|KO-BKO
@@ -3500,7 +3500,7 @@ compoundcurvezm4326|0|MultiLineString|3|KO-BKO
 compoundcurvezm4326|0|MultiPolygon|3|KO-BKO
 compoundcurvezm4326|0|GeometryCollection|3|KO-BKO
 compoundcurvezm4326|0|CircularString|3|KO-BKO
-compoundcurvezm4326|0|CompoundCurve|3|KO-BKO
+compoundcurvezm4326|0|CompoundCurve|3|OK-BOK
 compoundcurvezm4326|0|CurvePolygon|3|KO-BKO
 compoundcurvezm4326|0|MultiCurve|3|KO-BKO
 compoundcurvezm4326|0|MultiSurface|3|KO-BKO
@@ -3575,7 +3575,7 @@ compoundcurvezm4326|4326|MultiSurface|3|KO-BKO
 compoundcurvezm4326|4326|PolyhedralSurface|3|KO-BKO
 compoundcurvezm4326|4326|Triangle|3|KO-BKO
 compoundcurvezm4326|4326|Tin|3|KO-BKO
-compoundcurvezm4326||COUNT|2|
+compoundcurvezm4326||COUNT|4|
 curvepolygon|0|Point|0|KO-BKO
 curvepolygon|0|PointNE|0|KO-BKO
 curvepolygon|0|LineString|0|KO-BKO
@@ -3861,7 +3861,7 @@ curvepolygon4326|0|MultiPolygon|0|KO-BKO
 curvepolygon4326|0|GeometryCollection|0|KO-BKO
 curvepolygon4326|0|CircularString|0|KO-BKO
 curvepolygon4326|0|CompoundCurve|0|KO-BKO
-curvepolygon4326|0|CurvePolygon|0|KO-BKO
+curvepolygon4326|0|CurvePolygon|0|OK-BOK
 curvepolygon4326|0|MultiCurve|0|KO-BKO
 curvepolygon4326|0|MultiSurface|0|KO-BKO
 curvepolygon4326|0|PolyhedralSurface|0|KO-BKO
@@ -3986,7 +3986,7 @@ curvepolygon4326|4326|MultiSurface|3|KO-BKO
 curvepolygon4326|4326|PolyhedralSurface|3|KO-BKO
 curvepolygon4326|4326|Triangle|3|KO-BKO
 curvepolygon4326|4326|Tin|3|KO-BKO
-curvepolygon4326||COUNT|2|
+curvepolygon4326||COUNT|4|
 curvepolygonm|0|Point|0|KO-BKO
 curvepolygonm|0|PointNE|0|KO-BKO
 curvepolygonm|0|LineString|0|KO-BKO
@@ -4306,7 +4306,7 @@ curvepolygonm4326|0|MultiPolygon|1|KO-BKO
 curvepolygonm4326|0|GeometryCollection|1|KO-BKO
 curvepolygonm4326|0|CircularString|1|KO-BKO
 curvepolygonm4326|0|CompoundCurve|1|KO-BKO
-curvepolygonm4326|0|CurvePolygon|1|KO-BKO
+curvepolygonm4326|0|CurvePolygon|1|OK-BOK
 curvepolygonm4326|0|MultiCurve|1|KO-BKO
 curvepolygonm4326|0|MultiSurface|1|KO-BKO
 curvepolygonm4326|0|PolyhedralSurface|1|KO-BKO
@@ -4397,7 +4397,7 @@ curvepolygonm4326|4326|MultiSurface|3|KO-BKO
 curvepolygonm4326|4326|PolyhedralSurface|3|KO-BKO
 curvepolygonm4326|4326|Triangle|3|KO-BKO
 curvepolygonm4326|4326|Tin|3|KO-BKO
-curvepolygonm4326||COUNT|2|
+curvepolygonm4326||COUNT|4|
 curvepolygonz|0|Point|0|KO-BKO
 curvepolygonz|0|PointNE|0|KO-BKO
 curvepolygonz|0|LineString|0|KO-BKO
@@ -4700,7 +4700,7 @@ curvepolygonz4326|0|MultiPolygon|2|KO-BKO
 curvepolygonz4326|0|GeometryCollection|2|KO-BKO
 curvepolygonz4326|0|CircularString|2|KO-BKO
 curvepolygonz4326|0|CompoundCurve|2|KO-BKO
-curvepolygonz4326|0|CurvePolygon|2|KO-BKO
+curvepolygonz4326|0|CurvePolygon|2|OK-BOK
 curvepolygonz4326|0|MultiCurve|2|KO-BKO
 curvepolygonz4326|0|MultiSurface|2|KO-BKO
 curvepolygonz4326|0|PolyhedralSurface|2|KO-BKO
@@ -4808,7 +4808,7 @@ curvepolygonz4326|4326|MultiSurface|3|KO-BKO
 curvepolygonz4326|4326|PolyhedralSurface|3|KO-BKO
 curvepolygonz4326|4326|Triangle|3|KO-BKO
 curvepolygonz4326|4326|Tin|3|KO-BKO
-curvepolygonz4326||COUNT|2|
+curvepolygonz4326||COUNT|4|
 curvepolygonzm|0|Point|0|KO-BKO
 curvepolygonzm|0|PointNE|0|KO-BKO
 curvepolygonzm|0|LineString|0|KO-BKO
@@ -5145,7 +5145,7 @@ curvepolygonzm4326|0|MultiPolygon|3|KO-BKO
 curvepolygonzm4326|0|GeometryCollection|3|KO-BKO
 curvepolygonzm4326|0|CircularString|3|KO-BKO
 curvepolygonzm4326|0|CompoundCurve|3|KO-BKO
-curvepolygonzm4326|0|CurvePolygon|3|KO-BKO
+curvepolygonzm4326|0|CurvePolygon|3|OK-BOK
 curvepolygonzm4326|0|MultiCurve|3|KO-BKO
 curvepolygonzm4326|0|MultiSurface|3|KO-BKO
 curvepolygonzm4326|0|PolyhedralSurface|3|KO-BKO
@@ -5219,7 +5219,7 @@ curvepolygonzm4326|4326|MultiSurface|3|KO-BKO
 curvepolygonzm4326|4326|PolyhedralSurface|3|KO-BKO
 curvepolygonzm4326|4326|Triangle|3|KO-BKO
 curvepolygonzm4326|4326|Tin|3|KO-BKO
-curvepolygonzm4326||COUNT|2|
+curvepolygonzm4326||COUNT|4|
 geometry|0|Point|0|OK-BOK-GOK-BGOK
 geometry|0|PointNE|0|OK-BOK-GOK-BGOK
 geometry|0|LineString|0|OK-BOK-GOK-BGOK
@@ -5496,23 +5496,23 @@ geometry0|4326|Triangle|3|KO-BKO-GKO-BGKO
 geometry0|4326|Tin|3|KO-BKO-GKO-BGKO
 geometry0||COUNT|68|
 geometry0||GCOUNT|36|
-geometry4326|0|Point|0|KO-BKO-GOK-BGOK
-geometry4326|0|PointNE|0|KO-BKO-GOK-BGOK
-geometry4326|0|LineString|0|KO-BKO-GOK-BGOK
-geometry4326|0|Polygon|0|KO-BKO-GOK-BGOK
-geometry4326|0|MultiPoint|0|KO-BKO-GOK-BGOK
-geometry4326|0|MultiPointNE|0|KO-BKO-GOK-BGOK
-geometry4326|0|MultiLineString|0|KO-BKO-GOK-BGOK
-geometry4326|0|MultiPolygon|0|KO-BKO-GOK-BGOK
-geometry4326|0|GeometryCollection|0|KO-BKO-GOK-BGOK
-geometry4326|0|CircularString|0|KO-BKO-GKO-BGKO
-geometry4326|0|CompoundCurve|0|KO-BKO-GKO-BGKO
-geometry4326|0|CurvePolygon|0|KO-BKO-GKO-BGKO
-geometry4326|0|MultiCurve|0|KO-BKO-GKO-BGKO
-geometry4326|0|MultiSurface|0|KO-BKO-GKO-BGKO
-geometry4326|0|PolyhedralSurface|0|KO-BKO-GKO-BGKO
-geometry4326|0|Triangle|0|KO-BKO-GKO-BGKO
-geometry4326|0|Tin|0|KO-BKO-GKO-BGKO
+geometry4326|0|Point|0|OK-BOK-GOK-BGOK
+geometry4326|0|PointNE|0|OK-BOK-GOK-BGOK
+geometry4326|0|LineString|0|OK-BOK-GOK-BGOK
+geometry4326|0|Polygon|0|OK-BOK-GOK-BGOK
+geometry4326|0|MultiPoint|0|OK-BOK-GOK-BGOK
+geometry4326|0|MultiPointNE|0|OK-BOK-GOK-BGOK
+geometry4326|0|MultiLineString|0|OK-BOK-GOK-BGOK
+geometry4326|0|MultiPolygon|0|OK-BOK-GOK-BGOK
+geometry4326|0|GeometryCollection|0|OK-BOK-GOK-BGOK
+geometry4326|0|CircularString|0|OK-BOK-GKO-BGKO
+geometry4326|0|CompoundCurve|0|OK-BOK-GKO-BGKO
+geometry4326|0|CurvePolygon|0|OK-BOK-GKO-BGKO
+geometry4326|0|MultiCurve|0|OK-BOK-GKO-BGKO
+geometry4326|0|MultiSurface|0|OK-BOK-GKO-BGKO
+geometry4326|0|PolyhedralSurface|0|OK-BOK-GKO-BGKO
+geometry4326|0|Triangle|0|OK-BOK-GKO-BGKO
+geometry4326|0|Tin|0|OK-BOK-GKO-BGKO
 geometry4326|0|Point|2|KO-BKO-GKO-BGKO
 geometry4326|0|PointNE|2|KO-BKO-GKO-BGKO
 geometry4326|0|LineString|2|KO-BKO-GKO-BGKO
@@ -5632,7 +5632,7 @@ geometry4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 geometry4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 geometry4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 geometry4326|4326|Tin|3|KO-BKO-GKO-BGKO
-geometry4326||COUNT|34|
+geometry4326||COUNT|68|
 geometry4326||GCOUNT|36|
 geometrycollection|0|Point|0|KO-BKO-GKO-BGKO
 geometrycollection|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -5918,7 +5918,7 @@ geometrycollection4326|0|MultiPoint|0|KO-BKO-GKO-BGKO
 geometrycollection4326|0|MultiPointNE|0|KO-BKO-GKO-BGKO
 geometrycollection4326|0|MultiLineString|0|KO-BKO-GKO-BGKO
 geometrycollection4326|0|MultiPolygon|0|KO-BKO-GKO-BGKO
-geometrycollection4326|0|GeometryCollection|0|KO-BKO-GOK-BGOK
+geometrycollection4326|0|GeometryCollection|0|OK-BOK-GOK-BGOK
 geometrycollection4326|0|CircularString|0|KO-BKO-GKO-BGKO
 geometrycollection4326|0|CompoundCurve|0|KO-BKO-GKO-BGKO
 geometrycollection4326|0|CurvePolygon|0|KO-BKO-GKO-BGKO
@@ -6046,7 +6046,7 @@ geometrycollection4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 geometrycollection4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 geometrycollection4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 geometrycollection4326|4326|Tin|3|KO-BKO-GKO-BGKO
-geometrycollection4326||COUNT|2|
+geometrycollection4326||COUNT|4|
 geometrycollection4326||GCOUNT|4|
 geometrycollectionm|0|Point|0|KO-BKO-GKO-BGKO
 geometrycollectionm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -6366,7 +6366,7 @@ geometrycollectionm4326|0|MultiPoint|1|KO-BKO-GKO-BGKO
 geometrycollectionm4326|0|MultiPointNE|1|KO-BKO-GKO-BGKO
 geometrycollectionm4326|0|MultiLineString|1|KO-BKO-GKO-BGKO
 geometrycollectionm4326|0|MultiPolygon|1|KO-BKO-GKO-BGKO
-geometrycollectionm4326|0|GeometryCollection|1|KO-BKO-GOK-BGOK
+geometrycollectionm4326|0|GeometryCollection|1|OK-BOK-GOK-BGOK
 geometrycollectionm4326|0|CircularString|1|KO-BKO-GKO-BGKO
 geometrycollectionm4326|0|CompoundCurve|1|KO-BKO-GKO-BGKO
 geometrycollectionm4326|0|CurvePolygon|1|KO-BKO-GKO-BGKO
@@ -6460,7 +6460,7 @@ geometrycollectionm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 geometrycollectionm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 geometrycollectionm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 geometrycollectionm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-geometrycollectionm4326||COUNT|2|
+geometrycollectionm4326||COUNT|4|
 geometrycollectionm4326||GCOUNT|4|
 geometrycollectionz|0|Point|0|KO-BKO-GKO-BGKO
 geometrycollectionz|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -6763,7 +6763,7 @@ geometrycollectionz4326|0|MultiPoint|2|KO-BKO-GKO-BGKO
 geometrycollectionz4326|0|MultiPointNE|2|KO-BKO-GKO-BGKO
 geometrycollectionz4326|0|MultiLineString|2|KO-BKO-GKO-BGKO
 geometrycollectionz4326|0|MultiPolygon|2|KO-BKO-GKO-BGKO
-geometrycollectionz4326|0|GeometryCollection|2|KO-BKO-GOK-BGOK
+geometrycollectionz4326|0|GeometryCollection|2|OK-BOK-GOK-BGOK
 geometrycollectionz4326|0|CircularString|2|KO-BKO-GKO-BGKO
 geometrycollectionz4326|0|CompoundCurve|2|KO-BKO-GKO-BGKO
 geometrycollectionz4326|0|CurvePolygon|2|KO-BKO-GKO-BGKO
@@ -6874,7 +6874,7 @@ geometrycollectionz4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 geometrycollectionz4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 geometrycollectionz4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 geometrycollectionz4326|4326|Tin|3|KO-BKO-GKO-BGKO
-geometrycollectionz4326||COUNT|2|
+geometrycollectionz4326||COUNT|4|
 geometrycollectionz4326||GCOUNT|4|
 geometrycollectionzm|0|Point|0|KO-BKO-GKO-BGKO
 geometrycollectionzm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -7211,7 +7211,7 @@ geometrycollectionzm4326|0|MultiPoint|3|KO-BKO-GKO-BGKO
 geometrycollectionzm4326|0|MultiPointNE|3|KO-BKO-GKO-BGKO
 geometrycollectionzm4326|0|MultiLineString|3|KO-BKO-GKO-BGKO
 geometrycollectionzm4326|0|MultiPolygon|3|KO-BKO-GKO-BGKO
-geometrycollectionzm4326|0|GeometryCollection|3|KO-BKO-GOK-BGOK
+geometrycollectionzm4326|0|GeometryCollection|3|OK-BOK-GOK-BGOK
 geometrycollectionzm4326|0|CircularString|3|KO-BKO-GKO-BGKO
 geometrycollectionzm4326|0|CompoundCurve|3|KO-BKO-GKO-BGKO
 geometrycollectionzm4326|0|CurvePolygon|3|KO-BKO-GKO-BGKO
@@ -7288,7 +7288,7 @@ geometrycollectionzm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 geometrycollectionzm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 geometrycollectionzm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 geometrycollectionzm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-geometrycollectionzm4326||COUNT|2|
+geometrycollectionzm4326||COUNT|4|
 geometrycollectionzm4326||GCOUNT|4|
 geometrym|0|Point|0|KO-BKO-GKO-BGKO
 geometrym|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -7600,23 +7600,23 @@ geometrym4326|0|MultiSurface|2|KO-BKO-GKO-BGKO
 geometrym4326|0|PolyhedralSurface|2|KO-BKO-GKO-BGKO
 geometrym4326|0|Triangle|2|KO-BKO-GKO-BGKO
 geometrym4326|0|Tin|2|KO-BKO-GKO-BGKO
-geometrym4326|0|Point|1|KO-BKO-GOK-BGOK
-geometrym4326|0|PointNE|1|KO-BKO-GOK-BGOK
-geometrym4326|0|LineString|1|KO-BKO-GOK-BGOK
-geometrym4326|0|Polygon|1|KO-BKO-GOK-BGOK
-geometrym4326|0|MultiPoint|1|KO-BKO-GOK-BGOK
-geometrym4326|0|MultiPointNE|1|KO-BKO-GOK-BGOK
-geometrym4326|0|MultiLineString|1|KO-BKO-GOK-BGOK
-geometrym4326|0|MultiPolygon|1|KO-BKO-GOK-BGOK
-geometrym4326|0|GeometryCollection|1|KO-BKO-GOK-BGOK
-geometrym4326|0|CircularString|1|KO-BKO-GKO-BGKO
-geometrym4326|0|CompoundCurve|1|KO-BKO-GKO-BGKO
-geometrym4326|0|CurvePolygon|1|KO-BKO-GKO-BGKO
-geometrym4326|0|MultiCurve|1|KO-BKO-GKO-BGKO
-geometrym4326|0|MultiSurface|1|KO-BKO-GKO-BGKO
-geometrym4326|0|PolyhedralSurface|1|KO-BKO-GKO-BGKO
-geometrym4326|0|Triangle|1|KO-BKO-GKO-BGKO
-geometrym4326|0|Tin|1|KO-BKO-GKO-BGKO
+geometrym4326|0|Point|1|OK-BOK-GOK-BGOK
+geometrym4326|0|PointNE|1|OK-BOK-GOK-BGOK
+geometrym4326|0|LineString|1|OK-BOK-GOK-BGOK
+geometrym4326|0|Polygon|1|OK-BOK-GOK-BGOK
+geometrym4326|0|MultiPoint|1|OK-BOK-GOK-BGOK
+geometrym4326|0|MultiPointNE|1|OK-BOK-GOK-BGOK
+geometrym4326|0|MultiLineString|1|OK-BOK-GOK-BGOK
+geometrym4326|0|MultiPolygon|1|OK-BOK-GOK-BGOK
+geometrym4326|0|GeometryCollection|1|OK-BOK-GOK-BGOK
+geometrym4326|0|CircularString|1|OK-BOK-GKO-BGKO
+geometrym4326|0|CompoundCurve|1|OK-BOK-GKO-BGKO
+geometrym4326|0|CurvePolygon|1|OK-BOK-GKO-BGKO
+geometrym4326|0|MultiCurve|1|OK-BOK-GKO-BGKO
+geometrym4326|0|MultiSurface|1|OK-BOK-GKO-BGKO
+geometrym4326|0|PolyhedralSurface|1|OK-BOK-GKO-BGKO
+geometrym4326|0|Triangle|1|OK-BOK-GKO-BGKO
+geometrym4326|0|Tin|1|OK-BOK-GKO-BGKO
 geometrym4326|0|Point|3|KO-BKO-GKO-BGKO
 geometrym4326|0|PointNE|3|KO-BKO-GKO-BGKO
 geometrym4326|0|LineString|3|KO-BKO-GKO-BGKO
@@ -7702,7 +7702,7 @@ geometrym4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 geometrym4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 geometrym4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 geometrym4326|4326|Tin|3|KO-BKO-GKO-BGKO
-geometrym4326||COUNT|34|
+geometrym4326||COUNT|68|
 geometrym4326||GCOUNT|36|
 geometryz|0|Point|0|KO-BKO-GKO-BGKO
 geometryz|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -7997,23 +7997,23 @@ geometryz4326|0|MultiSurface|0|KO-BKO-GKO-BGKO
 geometryz4326|0|PolyhedralSurface|0|KO-BKO-GKO-BGKO
 geometryz4326|0|Triangle|0|KO-BKO-GKO-BGKO
 geometryz4326|0|Tin|0|KO-BKO-GKO-BGKO
-geometryz4326|0|Point|2|KO-BKO-GOK-BGOK
-geometryz4326|0|PointNE|2|KO-BKO-GOK-BGOK
-geometryz4326|0|LineString|2|KO-BKO-GOK-BGOK
-geometryz4326|0|Polygon|2|KO-BKO-GOK-BGOK
-geometryz4326|0|MultiPoint|2|KO-BKO-GOK-BGOK
-geometryz4326|0|MultiPointNE|2|KO-BKO-GOK-BGOK
-geometryz4326|0|MultiLineString|2|KO-BKO-GOK-BGOK
-geometryz4326|0|MultiPolygon|2|KO-BKO-GOK-BGOK
-geometryz4326|0|GeometryCollection|2|KO-BKO-GOK-BGOK
-geometryz4326|0|CircularString|2|KO-BKO-GKO-BGKO
-geometryz4326|0|CompoundCurve|2|KO-BKO-GKO-BGKO
-geometryz4326|0|CurvePolygon|2|KO-BKO-GKO-BGKO
-geometryz4326|0|MultiCurve|2|KO-BKO-GKO-BGKO
-geometryz4326|0|MultiSurface|2|KO-BKO-GKO-BGKO
-geometryz4326|0|PolyhedralSurface|2|KO-BKO-GKO-BGKO
-geometryz4326|0|Triangle|2|KO-BKO-GKO-BGKO
-geometryz4326|0|Tin|2|KO-BKO-GKO-BGKO
+geometryz4326|0|Point|2|OK-BOK-GOK-BGOK
+geometryz4326|0|PointNE|2|OK-BOK-GOK-BGOK
+geometryz4326|0|LineString|2|OK-BOK-GOK-BGOK
+geometryz4326|0|Polygon|2|OK-BOK-GOK-BGOK
+geometryz4326|0|MultiPoint|2|OK-BOK-GOK-BGOK
+geometryz4326|0|MultiPointNE|2|OK-BOK-GOK-BGOK
+geometryz4326|0|MultiLineString|2|OK-BOK-GOK-BGOK
+geometryz4326|0|MultiPolygon|2|OK-BOK-GOK-BGOK
+geometryz4326|0|GeometryCollection|2|OK-BOK-GOK-BGOK
+geometryz4326|0|CircularString|2|OK-BOK-GKO-BGKO
+geometryz4326|0|CompoundCurve|2|OK-BOK-GKO-BGKO
+geometryz4326|0|CurvePolygon|2|OK-BOK-GKO-BGKO
+geometryz4326|0|MultiCurve|2|OK-BOK-GKO-BGKO
+geometryz4326|0|MultiSurface|2|OK-BOK-GKO-BGKO
+geometryz4326|0|PolyhedralSurface|2|OK-BOK-GKO-BGKO
+geometryz4326|0|Triangle|2|OK-BOK-GKO-BGKO
+geometryz4326|0|Tin|2|OK-BOK-GKO-BGKO
 geometryz4326|0|Point|1|KO-BKO-GKO-BGKO
 geometryz4326|0|PointNE|1|KO-BKO-GKO-BGKO
 geometryz4326|0|LineString|1|KO-BKO-GKO-BGKO
@@ -8116,7 +8116,7 @@ geometryz4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 geometryz4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 geometryz4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 geometryz4326|4326|Tin|3|KO-BKO-GKO-BGKO
-geometryz4326||COUNT|34|
+geometryz4326||COUNT|68|
 geometryz4326||GCOUNT|36|
 geometryzm|0|Point|0|KO-BKO-GKO-BGKO
 geometryzm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -8445,23 +8445,23 @@ geometryzm4326|0|MultiSurface|1|KO-BKO-GKO-BGKO
 geometryzm4326|0|PolyhedralSurface|1|KO-BKO-GKO-BGKO
 geometryzm4326|0|Triangle|1|KO-BKO-GKO-BGKO
 geometryzm4326|0|Tin|1|KO-BKO-GKO-BGKO
-geometryzm4326|0|Point|3|KO-BKO-GOK-BGOK
-geometryzm4326|0|PointNE|3|KO-BKO-GOK-BGOK
-geometryzm4326|0|LineString|3|KO-BKO-GOK-BGOK
-geometryzm4326|0|Polygon|3|KO-BKO-GOK-BGOK
-geometryzm4326|0|MultiPoint|3|KO-BKO-GOK-BGOK
-geometryzm4326|0|MultiPointNE|3|KO-BKO-GOK-BGOK
-geometryzm4326|0|MultiLineString|3|KO-BKO-GOK-BGOK
-geometryzm4326|0|MultiPolygon|3|KO-BKO-GOK-BGOK
-geometryzm4326|0|GeometryCollection|3|KO-BKO-GOK-BGOK
-geometryzm4326|0|CircularString|3|KO-BKO-GKO-BGKO
-geometryzm4326|0|CompoundCurve|3|KO-BKO-GKO-BGKO
-geometryzm4326|0|CurvePolygon|3|KO-BKO-GKO-BGKO
-geometryzm4326|0|MultiCurve|3|KO-BKO-GKO-BGKO
-geometryzm4326|0|MultiSurface|3|KO-BKO-GKO-BGKO
-geometryzm4326|0|PolyhedralSurface|3|KO-BKO-GKO-BGKO
-geometryzm4326|0|Triangle|3|KO-BKO-GKO-BGKO
-geometryzm4326|0|Tin|3|KO-BKO-GKO-BGKO
+geometryzm4326|0|Point|3|OK-BOK-GOK-BGOK
+geometryzm4326|0|PointNE|3|OK-BOK-GOK-BGOK
+geometryzm4326|0|LineString|3|OK-BOK-GOK-BGOK
+geometryzm4326|0|Polygon|3|OK-BOK-GOK-BGOK
+geometryzm4326|0|MultiPoint|3|OK-BOK-GOK-BGOK
+geometryzm4326|0|MultiPointNE|3|OK-BOK-GOK-BGOK
+geometryzm4326|0|MultiLineString|3|OK-BOK-GOK-BGOK
+geometryzm4326|0|MultiPolygon|3|OK-BOK-GOK-BGOK
+geometryzm4326|0|GeometryCollection|3|OK-BOK-GOK-BGOK
+geometryzm4326|0|CircularString|3|OK-BOK-GKO-BGKO
+geometryzm4326|0|CompoundCurve|3|OK-BOK-GKO-BGKO
+geometryzm4326|0|CurvePolygon|3|OK-BOK-GKO-BGKO
+geometryzm4326|0|MultiCurve|3|OK-BOK-GKO-BGKO
+geometryzm4326|0|MultiSurface|3|OK-BOK-GKO-BGKO
+geometryzm4326|0|PolyhedralSurface|3|OK-BOK-GKO-BGKO
+geometryzm4326|0|Triangle|3|OK-BOK-GKO-BGKO
+geometryzm4326|0|Tin|3|OK-BOK-GKO-BGKO
 geometryzm4326|4326|Point|0|KO-BKO-GKO-BGKO
 geometryzm4326|4326|PointNE|0|KO-BKO-GKO-BGKO
 geometryzm4326|4326|LineString|0|KO-BKO-GKO-BGKO
@@ -8530,7 +8530,7 @@ geometryzm4326|4326|MultiSurface|3|OK-BOK-GKO-BGKO
 geometryzm4326|4326|PolyhedralSurface|3|OK-BOK-GKO-BGKO
 geometryzm4326|4326|Triangle|3|OK-BOK-GKO-BGKO
 geometryzm4326|4326|Tin|3|OK-BOK-GKO-BGKO
-geometryzm4326||COUNT|34|
+geometryzm4326||COUNT|68|
 geometryzm4326||GCOUNT|36|
 linestring|0|Point|0|KO-BKO-GKO-BGKO
 linestring|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -8810,7 +8810,7 @@ linestring0||COUNT|4|
 linestring0||GCOUNT|4|
 linestring4326|0|Point|0|KO-BKO-GKO-BGKO
 linestring4326|0|PointNE|0|KO-BKO-GKO-BGKO
-linestring4326|0|LineString|0|KO-BKO-GOK-BGOK
+linestring4326|0|LineString|0|OK-BOK-GOK-BGOK
 linestring4326|0|Polygon|0|KO-BKO-GKO-BGKO
 linestring4326|0|MultiPoint|0|KO-BKO-GKO-BGKO
 linestring4326|0|MultiPointNE|0|KO-BKO-GKO-BGKO
@@ -8944,7 +8944,7 @@ linestring4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 linestring4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 linestring4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 linestring4326|4326|Tin|3|KO-BKO-GKO-BGKO
-linestring4326||COUNT|2|
+linestring4326||COUNT|4|
 linestring4326||GCOUNT|4|
 linestringm|0|Point|0|KO-BKO-GKO-BGKO
 linestringm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -9258,7 +9258,7 @@ linestringm4326|0|Triangle|2|KO-BKO-GKO-BGKO
 linestringm4326|0|Tin|2|KO-BKO-GKO-BGKO
 linestringm4326|0|Point|1|KO-BKO-GKO-BGKO
 linestringm4326|0|PointNE|1|KO-BKO-GKO-BGKO
-linestringm4326|0|LineString|1|KO-BKO-GOK-BGOK
+linestringm4326|0|LineString|1|OK-BOK-GOK-BGOK
 linestringm4326|0|Polygon|1|KO-BKO-GKO-BGKO
 linestringm4326|0|MultiPoint|1|KO-BKO-GKO-BGKO
 linestringm4326|0|MultiPointNE|1|KO-BKO-GKO-BGKO
@@ -9358,7 +9358,7 @@ linestringm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 linestringm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 linestringm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 linestringm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-linestringm4326||COUNT|2|
+linestringm4326||COUNT|4|
 linestringm4326||GCOUNT|4|
 linestringz|0|Point|0|KO-BKO-GKO-BGKO
 linestringz|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -9655,7 +9655,7 @@ linestringz4326|0|Triangle|0|KO-BKO-GKO-BGKO
 linestringz4326|0|Tin|0|KO-BKO-GKO-BGKO
 linestringz4326|0|Point|2|KO-BKO-GKO-BGKO
 linestringz4326|0|PointNE|2|KO-BKO-GKO-BGKO
-linestringz4326|0|LineString|2|KO-BKO-GOK-BGOK
+linestringz4326|0|LineString|2|OK-BOK-GOK-BGOK
 linestringz4326|0|Polygon|2|KO-BKO-GKO-BGKO
 linestringz4326|0|MultiPoint|2|KO-BKO-GKO-BGKO
 linestringz4326|0|MultiPointNE|2|KO-BKO-GKO-BGKO
@@ -9772,7 +9772,7 @@ linestringz4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 linestringz4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 linestringz4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 linestringz4326|4326|Tin|3|KO-BKO-GKO-BGKO
-linestringz4326||COUNT|2|
+linestringz4326||COUNT|4|
 linestringz4326||GCOUNT|4|
 linestringzm|0|Point|0|KO-BKO-GKO-BGKO
 linestringzm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -10103,7 +10103,7 @@ linestringzm4326|0|Triangle|1|KO-BKO-GKO-BGKO
 linestringzm4326|0|Tin|1|KO-BKO-GKO-BGKO
 linestringzm4326|0|Point|3|KO-BKO-GKO-BGKO
 linestringzm4326|0|PointNE|3|KO-BKO-GKO-BGKO
-linestringzm4326|0|LineString|3|KO-BKO-GOK-BGOK
+linestringzm4326|0|LineString|3|OK-BOK-GOK-BGOK
 linestringzm4326|0|Polygon|3|KO-BKO-GKO-BGKO
 linestringzm4326|0|MultiPoint|3|KO-BKO-GKO-BGKO
 linestringzm4326|0|MultiPointNE|3|KO-BKO-GKO-BGKO
@@ -10186,7 +10186,7 @@ linestringzm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 linestringzm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 linestringzm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 linestringzm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-linestringzm4326||COUNT|2|
+linestringzm4326||COUNT|4|
 linestringzm4326||GCOUNT|4|
 multicurve|0|Point|0|KO-BKO
 multicurve|0|PointNE|0|KO-BKO
@@ -10474,7 +10474,7 @@ multicurve4326|0|GeometryCollection|0|KO-BKO
 multicurve4326|0|CircularString|0|KO-BKO
 multicurve4326|0|CompoundCurve|0|KO-BKO
 multicurve4326|0|CurvePolygon|0|KO-BKO
-multicurve4326|0|MultiCurve|0|KO-BKO
+multicurve4326|0|MultiCurve|0|OK-BOK
 multicurve4326|0|MultiSurface|0|KO-BKO
 multicurve4326|0|PolyhedralSurface|0|KO-BKO
 multicurve4326|0|Triangle|0|KO-BKO
@@ -10598,7 +10598,7 @@ multicurve4326|4326|MultiSurface|3|KO-BKO
 multicurve4326|4326|PolyhedralSurface|3|KO-BKO
 multicurve4326|4326|Triangle|3|KO-BKO
 multicurve4326|4326|Tin|3|KO-BKO
-multicurve4326||COUNT|2|
+multicurve4326||COUNT|4|
 multicurvem|0|Point|0|KO-BKO
 multicurvem|0|PointNE|0|KO-BKO
 multicurvem|0|LineString|0|KO-BKO
@@ -10919,7 +10919,7 @@ multicurvem4326|0|GeometryCollection|1|KO-BKO
 multicurvem4326|0|CircularString|1|KO-BKO
 multicurvem4326|0|CompoundCurve|1|KO-BKO
 multicurvem4326|0|CurvePolygon|1|KO-BKO
-multicurvem4326|0|MultiCurve|1|KO-BKO
+multicurvem4326|0|MultiCurve|1|OK-BOK
 multicurvem4326|0|MultiSurface|1|KO-BKO
 multicurvem4326|0|PolyhedralSurface|1|KO-BKO
 multicurvem4326|0|Triangle|1|KO-BKO
@@ -11009,7 +11009,7 @@ multicurvem4326|4326|MultiSurface|3|KO-BKO
 multicurvem4326|4326|PolyhedralSurface|3|KO-BKO
 multicurvem4326|4326|Triangle|3|KO-BKO
 multicurvem4326|4326|Tin|3|KO-BKO
-multicurvem4326||COUNT|2|
+multicurvem4326||COUNT|4|
 multicurvez|0|Point|0|KO-BKO
 multicurvez|0|PointNE|0|KO-BKO
 multicurvez|0|LineString|0|KO-BKO
@@ -11313,7 +11313,7 @@ multicurvez4326|0|GeometryCollection|2|KO-BKO
 multicurvez4326|0|CircularString|2|KO-BKO
 multicurvez4326|0|CompoundCurve|2|KO-BKO
 multicurvez4326|0|CurvePolygon|2|KO-BKO
-multicurvez4326|0|MultiCurve|2|KO-BKO
+multicurvez4326|0|MultiCurve|2|OK-BOK
 multicurvez4326|0|MultiSurface|2|KO-BKO
 multicurvez4326|0|PolyhedralSurface|2|KO-BKO
 multicurvez4326|0|Triangle|2|KO-BKO
@@ -11420,7 +11420,7 @@ multicurvez4326|4326|MultiSurface|3|KO-BKO
 multicurvez4326|4326|PolyhedralSurface|3|KO-BKO
 multicurvez4326|4326|Triangle|3|KO-BKO
 multicurvez4326|4326|Tin|3|KO-BKO
-multicurvez4326||COUNT|2|
+multicurvez4326||COUNT|4|
 multicurvezm|0|Point|0|KO-BKO
 multicurvezm|0|PointNE|0|KO-BKO
 multicurvezm|0|LineString|0|KO-BKO
@@ -11758,7 +11758,7 @@ multicurvezm4326|0|GeometryCollection|3|KO-BKO
 multicurvezm4326|0|CircularString|3|KO-BKO
 multicurvezm4326|0|CompoundCurve|3|KO-BKO
 multicurvezm4326|0|CurvePolygon|3|KO-BKO
-multicurvezm4326|0|MultiCurve|3|KO-BKO
+multicurvezm4326|0|MultiCurve|3|OK-BOK
 multicurvezm4326|0|MultiSurface|3|KO-BKO
 multicurvezm4326|0|PolyhedralSurface|3|KO-BKO
 multicurvezm4326|0|Triangle|3|KO-BKO
@@ -11831,7 +11831,7 @@ multicurvezm4326|4326|MultiSurface|3|KO-BKO
 multicurvezm4326|4326|PolyhedralSurface|3|KO-BKO
 multicurvezm4326|4326|Triangle|3|KO-BKO
 multicurvezm4326|4326|Tin|3|KO-BKO
-multicurvezm4326||COUNT|2|
+multicurvezm4326||COUNT|4|
 multilinestring|0|Point|0|KO-BKO-GKO-BGKO
 multilinestring|0|PointNE|0|KO-BKO-GKO-BGKO
 multilinestring|0|LineString|0|KO-BKO-GKO-BGKO
@@ -12114,7 +12114,7 @@ multilinestring4326|0|LineString|0|KO-BKO-GKO-BGKO
 multilinestring4326|0|Polygon|0|KO-BKO-GKO-BGKO
 multilinestring4326|0|MultiPoint|0|KO-BKO-GKO-BGKO
 multilinestring4326|0|MultiPointNE|0|KO-BKO-GKO-BGKO
-multilinestring4326|0|MultiLineString|0|KO-BKO-GOK-BGOK
+multilinestring4326|0|MultiLineString|0|OK-BOK-GOK-BGOK
 multilinestring4326|0|MultiPolygon|0|KO-BKO-GKO-BGKO
 multilinestring4326|0|GeometryCollection|0|KO-BKO-GKO-BGKO
 multilinestring4326|0|CircularString|0|KO-BKO-GKO-BGKO
@@ -12244,7 +12244,7 @@ multilinestring4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multilinestring4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multilinestring4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multilinestring4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multilinestring4326||COUNT|2|
+multilinestring4326||COUNT|4|
 multilinestring4326||GCOUNT|4|
 multilinestringm|0|Point|0|KO-BKO-GKO-BGKO
 multilinestringm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -12562,7 +12562,7 @@ multilinestringm4326|0|LineString|1|KO-BKO-GKO-BGKO
 multilinestringm4326|0|Polygon|1|KO-BKO-GKO-BGKO
 multilinestringm4326|0|MultiPoint|1|KO-BKO-GKO-BGKO
 multilinestringm4326|0|MultiPointNE|1|KO-BKO-GKO-BGKO
-multilinestringm4326|0|MultiLineString|1|KO-BKO-GOK-BGOK
+multilinestringm4326|0|MultiLineString|1|OK-BOK-GOK-BGOK
 multilinestringm4326|0|MultiPolygon|1|KO-BKO-GKO-BGKO
 multilinestringm4326|0|GeometryCollection|1|KO-BKO-GKO-BGKO
 multilinestringm4326|0|CircularString|1|KO-BKO-GKO-BGKO
@@ -12658,7 +12658,7 @@ multilinestringm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multilinestringm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multilinestringm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multilinestringm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multilinestringm4326||COUNT|2|
+multilinestringm4326||COUNT|4|
 multilinestringm4326||GCOUNT|4|
 multilinestringz|0|Point|0|KO-BKO-GKO-BGKO
 multilinestringz|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -12959,7 +12959,7 @@ multilinestringz4326|0|LineString|2|KO-BKO-GKO-BGKO
 multilinestringz4326|0|Polygon|2|KO-BKO-GKO-BGKO
 multilinestringz4326|0|MultiPoint|2|KO-BKO-GKO-BGKO
 multilinestringz4326|0|MultiPointNE|2|KO-BKO-GKO-BGKO
-multilinestringz4326|0|MultiLineString|2|KO-BKO-GOK-BGOK
+multilinestringz4326|0|MultiLineString|2|OK-BOK-GOK-BGOK
 multilinestringz4326|0|MultiPolygon|2|KO-BKO-GKO-BGKO
 multilinestringz4326|0|GeometryCollection|2|KO-BKO-GKO-BGKO
 multilinestringz4326|0|CircularString|2|KO-BKO-GKO-BGKO
@@ -13072,7 +13072,7 @@ multilinestringz4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multilinestringz4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multilinestringz4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multilinestringz4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multilinestringz4326||COUNT|2|
+multilinestringz4326||COUNT|4|
 multilinestringz4326||GCOUNT|4|
 multilinestringzm|0|Point|0|KO-BKO-GKO-BGKO
 multilinestringzm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -13407,7 +13407,7 @@ multilinestringzm4326|0|LineString|3|KO-BKO-GKO-BGKO
 multilinestringzm4326|0|Polygon|3|KO-BKO-GKO-BGKO
 multilinestringzm4326|0|MultiPoint|3|KO-BKO-GKO-BGKO
 multilinestringzm4326|0|MultiPointNE|3|KO-BKO-GKO-BGKO
-multilinestringzm4326|0|MultiLineString|3|KO-BKO-GOK-BGOK
+multilinestringzm4326|0|MultiLineString|3|OK-BOK-GOK-BGOK
 multilinestringzm4326|0|MultiPolygon|3|KO-BKO-GKO-BGKO
 multilinestringzm4326|0|GeometryCollection|3|KO-BKO-GKO-BGKO
 multilinestringzm4326|0|CircularString|3|KO-BKO-GKO-BGKO
@@ -13486,7 +13486,7 @@ multilinestringzm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multilinestringzm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multilinestringzm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multilinestringzm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multilinestringzm4326||COUNT|2|
+multilinestringzm4326||COUNT|4|
 multilinestringzm4326||GCOUNT|4|
 multipoint|0|Point|0|KO-BKO-GKO-BGKO
 multipoint|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -13768,8 +13768,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
-multipoint4326|0|MultiPoint|0|KO-BKO-GOK-BGOK
-multipoint4326|0|MultiPointNE|0|KO-BKO-GOK-BGOK
+multipoint4326|0|MultiPoint|0|OK-BOK-GOK-BGOK
+multipoint4326|0|MultiPointNE|0|OK-BOK-GOK-BGOK
 multipoint4326|0|MultiLineString|0|KO-BKO-GKO-BGKO
 multipoint4326|0|MultiPolygon|0|KO-BKO-GKO-BGKO
 multipoint4326|0|GeometryCollection|0|KO-BKO-GKO-BGKO
@@ -13900,7 +13900,7 @@ 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|4|
+multipoint4326||COUNT|8|
 multipoint4326||GCOUNT|8|
 multipointm|0|Point|0|KO-BKO-GKO-BGKO
 multipointm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -14216,8 +14216,8 @@ 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
-multipointm4326|0|MultiPoint|1|KO-BKO-GOK-BGOK
-multipointm4326|0|MultiPointNE|1|KO-BKO-GOK-BGOK
+multipointm4326|0|MultiPoint|1|OK-BOK-GOK-BGOK
+multipointm4326|0|MultiPointNE|1|OK-BOK-GOK-BGOK
 multipointm4326|0|MultiLineString|1|KO-BKO-GKO-BGKO
 multipointm4326|0|MultiPolygon|1|KO-BKO-GKO-BGKO
 multipointm4326|0|GeometryCollection|1|KO-BKO-GKO-BGKO
@@ -14314,7 +14314,7 @@ 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|4|
+multipointm4326||COUNT|8|
 multipointm4326||GCOUNT|8|
 multipointz|0|Point|0|KO-BKO-GKO-BGKO
 multipointz|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -14613,8 +14613,8 @@ 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
-multipointz4326|0|MultiPoint|2|KO-BKO-GOK-BGOK
-multipointz4326|0|MultiPointNE|2|KO-BKO-GOK-BGOK
+multipointz4326|0|MultiPoint|2|OK-BOK-GOK-BGOK
+multipointz4326|0|MultiPointNE|2|OK-BOK-GOK-BGOK
 multipointz4326|0|MultiLineString|2|KO-BKO-GKO-BGKO
 multipointz4326|0|MultiPolygon|2|KO-BKO-GKO-BGKO
 multipointz4326|0|GeometryCollection|2|KO-BKO-GKO-BGKO
@@ -14728,7 +14728,7 @@ 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|4|
+multipointz4326||COUNT|8|
 multipointz4326||GCOUNT|8|
 multipointzm|0|Point|0|KO-BKO-GKO-BGKO
 multipointzm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -15061,8 +15061,8 @@ 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
-multipointzm4326|0|MultiPoint|3|KO-BKO-GOK-BGOK
-multipointzm4326|0|MultiPointNE|3|KO-BKO-GOK-BGOK
+multipointzm4326|0|MultiPoint|3|OK-BOK-GOK-BGOK
+multipointzm4326|0|MultiPointNE|3|OK-BOK-GOK-BGOK
 multipointzm4326|0|MultiLineString|3|KO-BKO-GKO-BGKO
 multipointzm4326|0|MultiPolygon|3|KO-BKO-GKO-BGKO
 multipointzm4326|0|GeometryCollection|3|KO-BKO-GKO-BGKO
@@ -15142,7 +15142,7 @@ 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|4|
+multipointzm4326||COUNT|8|
 multipointzm4326||GCOUNT|8|
 multipolygon|0|Point|0|KO-BKO-GKO-BGKO
 multipolygon|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -15427,7 +15427,7 @@ multipolygon4326|0|Polygon|0|KO-BKO-GKO-BGKO
 multipolygon4326|0|MultiPoint|0|KO-BKO-GKO-BGKO
 multipolygon4326|0|MultiPointNE|0|KO-BKO-GKO-BGKO
 multipolygon4326|0|MultiLineString|0|KO-BKO-GKO-BGKO
-multipolygon4326|0|MultiPolygon|0|KO-BKO-GOK-BGOK
+multipolygon4326|0|MultiPolygon|0|OK-BOK-GOK-BGOK
 multipolygon4326|0|GeometryCollection|0|KO-BKO-GKO-BGKO
 multipolygon4326|0|CircularString|0|KO-BKO-GKO-BGKO
 multipolygon4326|0|CompoundCurve|0|KO-BKO-GKO-BGKO
@@ -15556,7 +15556,7 @@ multipolygon4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipolygon4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipolygon4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipolygon4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multipolygon4326||COUNT|2|
+multipolygon4326||COUNT|4|
 multipolygon4326||GCOUNT|4|
 multipolygonm|0|Point|0|KO-BKO-GKO-BGKO
 multipolygonm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -15875,7 +15875,7 @@ multipolygonm4326|0|Polygon|1|KO-BKO-GKO-BGKO
 multipolygonm4326|0|MultiPoint|1|KO-BKO-GKO-BGKO
 multipolygonm4326|0|MultiPointNE|1|KO-BKO-GKO-BGKO
 multipolygonm4326|0|MultiLineString|1|KO-BKO-GKO-BGKO
-multipolygonm4326|0|MultiPolygon|1|KO-BKO-GOK-BGOK
+multipolygonm4326|0|MultiPolygon|1|OK-BOK-GOK-BGOK
 multipolygonm4326|0|GeometryCollection|1|KO-BKO-GKO-BGKO
 multipolygonm4326|0|CircularString|1|KO-BKO-GKO-BGKO
 multipolygonm4326|0|CompoundCurve|1|KO-BKO-GKO-BGKO
@@ -15970,7 +15970,7 @@ multipolygonm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipolygonm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipolygonm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipolygonm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multipolygonm4326||COUNT|2|
+multipolygonm4326||COUNT|4|
 multipolygonm4326||GCOUNT|4|
 multipolygonz|0|Point|0|KO-BKO-GKO-BGKO
 multipolygonz|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -16272,7 +16272,7 @@ multipolygonz4326|0|Polygon|2|KO-BKO-GKO-BGKO
 multipolygonz4326|0|MultiPoint|2|KO-BKO-GKO-BGKO
 multipolygonz4326|0|MultiPointNE|2|KO-BKO-GKO-BGKO
 multipolygonz4326|0|MultiLineString|2|KO-BKO-GKO-BGKO
-multipolygonz4326|0|MultiPolygon|2|KO-BKO-GOK-BGOK
+multipolygonz4326|0|MultiPolygon|2|OK-BOK-GOK-BGOK
 multipolygonz4326|0|GeometryCollection|2|KO-BKO-GKO-BGKO
 multipolygonz4326|0|CircularString|2|KO-BKO-GKO-BGKO
 multipolygonz4326|0|CompoundCurve|2|KO-BKO-GKO-BGKO
@@ -16384,7 +16384,7 @@ multipolygonz4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipolygonz4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipolygonz4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipolygonz4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multipolygonz4326||COUNT|2|
+multipolygonz4326||COUNT|4|
 multipolygonz4326||GCOUNT|4|
 multipolygonzm|0|Point|0|KO-BKO-GKO-BGKO
 multipolygonzm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -16720,7 +16720,7 @@ multipolygonzm4326|0|Polygon|3|KO-BKO-GKO-BGKO
 multipolygonzm4326|0|MultiPoint|3|KO-BKO-GKO-BGKO
 multipolygonzm4326|0|MultiPointNE|3|KO-BKO-GKO-BGKO
 multipolygonzm4326|0|MultiLineString|3|KO-BKO-GKO-BGKO
-multipolygonzm4326|0|MultiPolygon|3|KO-BKO-GOK-BGOK
+multipolygonzm4326|0|MultiPolygon|3|OK-BOK-GOK-BGOK
 multipolygonzm4326|0|GeometryCollection|3|KO-BKO-GKO-BGKO
 multipolygonzm4326|0|CircularString|3|KO-BKO-GKO-BGKO
 multipolygonzm4326|0|CompoundCurve|3|KO-BKO-GKO-BGKO
@@ -16798,7 +16798,7 @@ multipolygonzm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 multipolygonzm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 multipolygonzm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 multipolygonzm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-multipolygonzm4326||COUNT|2|
+multipolygonzm4326||COUNT|4|
 multipolygonzm4326||GCOUNT|4|
 multisurface|0|Point|0|KO-BKO
 multisurface|0|PointNE|0|KO-BKO
@@ -17087,7 +17087,7 @@ multisurface4326|0|CircularString|0|KO-BKO
 multisurface4326|0|CompoundCurve|0|KO-BKO
 multisurface4326|0|CurvePolygon|0|KO-BKO
 multisurface4326|0|MultiCurve|0|KO-BKO
-multisurface4326|0|MultiSurface|0|KO-BKO
+multisurface4326|0|MultiSurface|0|OK-BOK
 multisurface4326|0|PolyhedralSurface|0|KO-BKO
 multisurface4326|0|Triangle|0|KO-BKO
 multisurface4326|0|Tin|0|KO-BKO
@@ -17210,7 +17210,7 @@ multisurface4326|4326|MultiSurface|3|KO-BKO
 multisurface4326|4326|PolyhedralSurface|3|KO-BKO
 multisurface4326|4326|Triangle|3|KO-BKO
 multisurface4326|4326|Tin|3|KO-BKO
-multisurface4326||COUNT|2|
+multisurface4326||COUNT|4|
 multisurfacem|0|Point|0|KO-BKO
 multisurfacem|0|PointNE|0|KO-BKO
 multisurfacem|0|LineString|0|KO-BKO
@@ -17532,7 +17532,7 @@ multisurfacem4326|0|CircularString|1|KO-BKO
 multisurfacem4326|0|CompoundCurve|1|KO-BKO
 multisurfacem4326|0|CurvePolygon|1|KO-BKO
 multisurfacem4326|0|MultiCurve|1|KO-BKO
-multisurfacem4326|0|MultiSurface|1|KO-BKO
+multisurfacem4326|0|MultiSurface|1|OK-BOK
 multisurfacem4326|0|PolyhedralSurface|1|KO-BKO
 multisurfacem4326|0|Triangle|1|KO-BKO
 multisurfacem4326|0|Tin|1|KO-BKO
@@ -17621,7 +17621,7 @@ multisurfacem4326|4326|MultiSurface|3|KO-BKO
 multisurfacem4326|4326|PolyhedralSurface|3|KO-BKO
 multisurfacem4326|4326|Triangle|3|KO-BKO
 multisurfacem4326|4326|Tin|3|KO-BKO
-multisurfacem4326||COUNT|2|
+multisurfacem4326||COUNT|4|
 multisurfacez|0|Point|0|KO-BKO
 multisurfacez|0|PointNE|0|KO-BKO
 multisurfacez|0|LineString|0|KO-BKO
@@ -17926,7 +17926,7 @@ multisurfacez4326|0|CircularString|2|KO-BKO
 multisurfacez4326|0|CompoundCurve|2|KO-BKO
 multisurfacez4326|0|CurvePolygon|2|KO-BKO
 multisurfacez4326|0|MultiCurve|2|KO-BKO
-multisurfacez4326|0|MultiSurface|2|KO-BKO
+multisurfacez4326|0|MultiSurface|2|OK-BOK
 multisurfacez4326|0|PolyhedralSurface|2|KO-BKO
 multisurfacez4326|0|Triangle|2|KO-BKO
 multisurfacez4326|0|Tin|2|KO-BKO
@@ -18032,7 +18032,7 @@ multisurfacez4326|4326|MultiSurface|3|KO-BKO
 multisurfacez4326|4326|PolyhedralSurface|3|KO-BKO
 multisurfacez4326|4326|Triangle|3|KO-BKO
 multisurfacez4326|4326|Tin|3|KO-BKO
-multisurfacez4326||COUNT|2|
+multisurfacez4326||COUNT|4|
 multisurfacezm|0|Point|0|KO-BKO
 multisurfacezm|0|PointNE|0|KO-BKO
 multisurfacezm|0|LineString|0|KO-BKO
@@ -18371,7 +18371,7 @@ multisurfacezm4326|0|CircularString|3|KO-BKO
 multisurfacezm4326|0|CompoundCurve|3|KO-BKO
 multisurfacezm4326|0|CurvePolygon|3|KO-BKO
 multisurfacezm4326|0|MultiCurve|3|KO-BKO
-multisurfacezm4326|0|MultiSurface|3|KO-BKO
+multisurfacezm4326|0|MultiSurface|3|OK-BOK
 multisurfacezm4326|0|PolyhedralSurface|3|KO-BKO
 multisurfacezm4326|0|Triangle|3|KO-BKO
 multisurfacezm4326|0|Tin|3|KO-BKO
@@ -18443,7 +18443,7 @@ multisurfacezm4326|4326|MultiSurface|3|OK-BOK
 multisurfacezm4326|4326|PolyhedralSurface|3|KO-BKO
 multisurfacezm4326|4326|Triangle|3|KO-BKO
 multisurfacezm4326|4326|Tin|3|KO-BKO
-multisurfacezm4326||COUNT|2|
+multisurfacezm4326||COUNT|4|
 point|0|Point|0|OK-BOK-GOK-BGOK
 point|0|PointNE|0|OK-BOK-GOK-BGOK
 point|0|LineString|0|KO-BKO-GKO-BGKO
@@ -18720,11 +18720,11 @@ point0|4326|Triangle|3|KO-BKO-GKO-BGKO
 point0|4326|Tin|3|KO-BKO-GKO-BGKO
 point0||COUNT|12|
 point0||GCOUNT|12|
-point4326|0|Point|0|KO-BKO-GOK-BGOK
-point4326|0|PointNE|0|KO-BKO-GOK-BGOK
+point4326|0|Point|0|OK-BOK-GOK-BGOK
+point4326|0|PointNE|0|OK-BOK-GOK-BGOK
 point4326|0|LineString|0|KO-BKO-GKO-BGKO
 point4326|0|Polygon|0|KO-BKO-GKO-BGKO
-point4326|0|MultiPoint|0|KO-BKO-GOK-BGOK
+point4326|0|MultiPoint|0|OK-BOK-GOK-BGOK
 point4326|0|MultiPointNE|0|KO-BKO-GKO-BGKO
 point4326|0|MultiLineString|0|KO-BKO-GKO-BGKO
 point4326|0|MultiPolygon|0|KO-BKO-GKO-BGKO
@@ -18856,7 +18856,7 @@ point4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 point4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 point4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 point4326|4326|Tin|3|KO-BKO-GKO-BGKO
-point4326||COUNT|6|
+point4326||COUNT|12|
 point4326||GCOUNT|12|
 pointm|0|Point|0|KO-BKO-GKO-BGKO
 pointm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -19168,11 +19168,11 @@ pointm4326|0|MultiSurface|2|KO-BKO-GKO-BGKO
 pointm4326|0|PolyhedralSurface|2|KO-BKO-GKO-BGKO
 pointm4326|0|Triangle|2|KO-BKO-GKO-BGKO
 pointm4326|0|Tin|2|KO-BKO-GKO-BGKO
-pointm4326|0|Point|1|KO-BKO-GOK-BGOK
-pointm4326|0|PointNE|1|KO-BKO-GOK-BGOK
+pointm4326|0|Point|1|OK-BOK-GOK-BGOK
+pointm4326|0|PointNE|1|OK-BOK-GOK-BGOK
 pointm4326|0|LineString|1|KO-BKO-GKO-BGKO
 pointm4326|0|Polygon|1|KO-BKO-GKO-BGKO
-pointm4326|0|MultiPoint|1|KO-BKO-GOK-BGOK
+pointm4326|0|MultiPoint|1|OK-BOK-GOK-BGOK
 pointm4326|0|MultiPointNE|1|KO-BKO-GKO-BGKO
 pointm4326|0|MultiLineString|1|KO-BKO-GKO-BGKO
 pointm4326|0|MultiPolygon|1|KO-BKO-GKO-BGKO
@@ -19270,7 +19270,7 @@ pointm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 pointm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 pointm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 pointm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-pointm4326||COUNT|6|
+pointm4326||COUNT|12|
 pointm4326||GCOUNT|12|
 pointz|0|Point|0|KO-BKO-GKO-BGKO
 pointz|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -19565,11 +19565,11 @@ pointz4326|0|MultiSurface|0|KO-BKO-GKO-BGKO
 pointz4326|0|PolyhedralSurface|0|KO-BKO-GKO-BGKO
 pointz4326|0|Triangle|0|KO-BKO-GKO-BGKO
 pointz4326|0|Tin|0|KO-BKO-GKO-BGKO
-pointz4326|0|Point|2|KO-BKO-GOK-BGOK
-pointz4326|0|PointNE|2|KO-BKO-GOK-BGOK
+pointz4326|0|Point|2|OK-BOK-GOK-BGOK
+pointz4326|0|PointNE|2|OK-BOK-GOK-BGOK
 pointz4326|0|LineString|2|KO-BKO-GKO-BGKO
 pointz4326|0|Polygon|2|KO-BKO-GKO-BGKO
-pointz4326|0|MultiPoint|2|KO-BKO-GOK-BGOK
+pointz4326|0|MultiPoint|2|OK-BOK-GOK-BGOK
 pointz4326|0|MultiPointNE|2|KO-BKO-GKO-BGKO
 pointz4326|0|MultiLineString|2|KO-BKO-GKO-BGKO
 pointz4326|0|MultiPolygon|2|KO-BKO-GKO-BGKO
@@ -19684,7 +19684,7 @@ pointz4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 pointz4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 pointz4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 pointz4326|4326|Tin|3|KO-BKO-GKO-BGKO
-pointz4326||COUNT|6|
+pointz4326||COUNT|12|
 pointz4326||GCOUNT|12|
 pointzm|0|Point|0|KO-BKO-GKO-BGKO
 pointzm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -20013,11 +20013,11 @@ pointzm4326|0|MultiSurface|1|KO-BKO-GKO-BGKO
 pointzm4326|0|PolyhedralSurface|1|KO-BKO-GKO-BGKO
 pointzm4326|0|Triangle|1|KO-BKO-GKO-BGKO
 pointzm4326|0|Tin|1|KO-BKO-GKO-BGKO
-pointzm4326|0|Point|3|KO-BKO-GOK-BGOK
-pointzm4326|0|PointNE|3|KO-BKO-GOK-BGOK
+pointzm4326|0|Point|3|OK-BOK-GOK-BGOK
+pointzm4326|0|PointNE|3|OK-BOK-GOK-BGOK
 pointzm4326|0|LineString|3|KO-BKO-GKO-BGKO
 pointzm4326|0|Polygon|3|KO-BKO-GKO-BGKO
-pointzm4326|0|MultiPoint|3|KO-BKO-GOK-BGOK
+pointzm4326|0|MultiPoint|3|OK-BOK-GOK-BGOK
 pointzm4326|0|MultiPointNE|3|KO-BKO-GKO-BGKO
 pointzm4326|0|MultiLineString|3|KO-BKO-GKO-BGKO
 pointzm4326|0|MultiPolygon|3|KO-BKO-GKO-BGKO
@@ -20098,7 +20098,7 @@ pointzm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 pointzm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 pointzm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 pointzm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-pointzm4326||COUNT|6|
+pointzm4326||COUNT|12|
 pointzm4326||GCOUNT|12|
 polygon|0|Point|0|KO-BKO-GKO-BGKO
 polygon|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -20379,7 +20379,7 @@ polygon0||GCOUNT|4|
 polygon4326|0|Point|0|KO-BKO-GKO-BGKO
 polygon4326|0|PointNE|0|KO-BKO-GKO-BGKO
 polygon4326|0|LineString|0|KO-BKO-GKO-BGKO
-polygon4326|0|Polygon|0|KO-BKO-GOK-BGOK
+polygon4326|0|Polygon|0|OK-BOK-GOK-BGOK
 polygon4326|0|MultiPoint|0|KO-BKO-GKO-BGKO
 polygon4326|0|MultiPointNE|0|KO-BKO-GKO-BGKO
 polygon4326|0|MultiLineString|0|KO-BKO-GKO-BGKO
@@ -20512,7 +20512,7 @@ polygon4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 polygon4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 polygon4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 polygon4326|4326|Tin|3|KO-BKO-GKO-BGKO
-polygon4326||COUNT|2|
+polygon4326||COUNT|4|
 polygon4326||GCOUNT|4|
 polygonm|0|Point|0|KO-BKO-GKO-BGKO
 polygonm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -20827,7 +20827,7 @@ polygonm4326|0|Tin|2|KO-BKO-GKO-BGKO
 polygonm4326|0|Point|1|KO-BKO-GKO-BGKO
 polygonm4326|0|PointNE|1|KO-BKO-GKO-BGKO
 polygonm4326|0|LineString|1|KO-BKO-GKO-BGKO
-polygonm4326|0|Polygon|1|KO-BKO-GOK-BGOK
+polygonm4326|0|Polygon|1|OK-BOK-GOK-BGOK
 polygonm4326|0|MultiPoint|1|KO-BKO-GKO-BGKO
 polygonm4326|0|MultiPointNE|1|KO-BKO-GKO-BGKO
 polygonm4326|0|MultiLineString|1|KO-BKO-GKO-BGKO
@@ -20926,7 +20926,7 @@ polygonm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 polygonm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 polygonm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 polygonm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-polygonm4326||COUNT|2|
+polygonm4326||COUNT|4|
 polygonm4326||GCOUNT|4|
 polygonz|0|Point|0|KO-BKO-GKO-BGKO
 polygonz|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -21224,7 +21224,7 @@ polygonz4326|0|Tin|0|KO-BKO-GKO-BGKO
 polygonz4326|0|Point|2|KO-BKO-GKO-BGKO
 polygonz4326|0|PointNE|2|KO-BKO-GKO-BGKO
 polygonz4326|0|LineString|2|KO-BKO-GKO-BGKO
-polygonz4326|0|Polygon|2|KO-BKO-GOK-BGOK
+polygonz4326|0|Polygon|2|OK-BOK-GOK-BGOK
 polygonz4326|0|MultiPoint|2|KO-BKO-GKO-BGKO
 polygonz4326|0|MultiPointNE|2|KO-BKO-GKO-BGKO
 polygonz4326|0|MultiLineString|2|KO-BKO-GKO-BGKO
@@ -21340,7 +21340,7 @@ polygonz4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 polygonz4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 polygonz4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 polygonz4326|4326|Tin|3|KO-BKO-GKO-BGKO
-polygonz4326||COUNT|2|
+polygonz4326||COUNT|4|
 polygonz4326||GCOUNT|4|
 polygonzm|0|Point|0|KO-BKO-GKO-BGKO
 polygonzm|0|PointNE|0|KO-BKO-GKO-BGKO
@@ -21672,7 +21672,7 @@ polygonzm4326|0|Tin|1|KO-BKO-GKO-BGKO
 polygonzm4326|0|Point|3|KO-BKO-GKO-BGKO
 polygonzm4326|0|PointNE|3|KO-BKO-GKO-BGKO
 polygonzm4326|0|LineString|3|KO-BKO-GKO-BGKO
-polygonzm4326|0|Polygon|3|KO-BKO-GOK-BGOK
+polygonzm4326|0|Polygon|3|OK-BOK-GOK-BGOK
 polygonzm4326|0|MultiPoint|3|KO-BKO-GKO-BGKO
 polygonzm4326|0|MultiPointNE|3|KO-BKO-GKO-BGKO
 polygonzm4326|0|MultiLineString|3|KO-BKO-GKO-BGKO
@@ -21754,7 +21754,7 @@ polygonzm4326|4326|MultiSurface|3|KO-BKO-GKO-BGKO
 polygonzm4326|4326|PolyhedralSurface|3|KO-BKO-GKO-BGKO
 polygonzm4326|4326|Triangle|3|KO-BKO-GKO-BGKO
 polygonzm4326|4326|Tin|3|KO-BKO-GKO-BGKO
-polygonzm4326||COUNT|2|
+polygonzm4326||COUNT|4|
 polygonzm4326||GCOUNT|4|
 polyhedralsurface|0|Point|0|KO-BKO
 polyhedralsurface|0|PointNE|0|KO-BKO
@@ -22044,7 +22044,7 @@ polyhedralsurface4326|0|CompoundCurve|0|KO-BKO
 polyhedralsurface4326|0|CurvePolygon|0|KO-BKO
 polyhedralsurface4326|0|MultiCurve|0|KO-BKO
 polyhedralsurface4326|0|MultiSurface|0|KO-BKO
-polyhedralsurface4326|0|PolyhedralSurface|0|KO-BKO
+polyhedralsurface4326|0|PolyhedralSurface|0|OK-BOK
 polyhedralsurface4326|0|Triangle|0|KO-BKO
 polyhedralsurface4326|0|Tin|0|KO-BKO
 polyhedralsurface4326|0|Point|2|KO-BKO
@@ -22166,7 +22166,7 @@ polyhedralsurface4326|4326|MultiSurface|3|KO-BKO
 polyhedralsurface4326|4326|PolyhedralSurface|3|KO-BKO
 polyhedralsurface4326|4326|Triangle|3|KO-BKO
 polyhedralsurface4326|4326|Tin|3|KO-BKO
-polyhedralsurface4326||COUNT|2|
+polyhedralsurface4326||COUNT|4|
 polyhedralsurfacem|0|Point|0|KO-BKO
 polyhedralsurfacem|0|PointNE|0|KO-BKO
 polyhedralsurfacem|0|LineString|0|KO-BKO
@@ -22489,7 +22489,7 @@ polyhedralsurfacem4326|0|CompoundCurve|1|KO-BKO
 polyhedralsurfacem4326|0|CurvePolygon|1|KO-BKO
 polyhedralsurfacem4326|0|MultiCurve|1|KO-BKO
 polyhedralsurfacem4326|0|MultiSurface|1|KO-BKO
-polyhedralsurfacem4326|0|PolyhedralSurface|1|KO-BKO
+polyhedralsurfacem4326|0|PolyhedralSurface|1|OK-BOK
 polyhedralsurfacem4326|0|Triangle|1|KO-BKO
 polyhedralsurfacem4326|0|Tin|1|KO-BKO
 polyhedralsurfacem4326|0|Point|3|KO-BKO
@@ -22577,7 +22577,7 @@ polyhedralsurfacem4326|4326|MultiSurface|3|KO-BKO
 polyhedralsurfacem4326|4326|PolyhedralSurface|3|KO-BKO
 polyhedralsurfacem4326|4326|Triangle|3|KO-BKO
 polyhedralsurfacem4326|4326|Tin|3|KO-BKO
-polyhedralsurfacem4326||COUNT|2|
+polyhedralsurfacem4326||COUNT|4|
 polyhedralsurfacez|0|Point|0|KO-BKO
 polyhedralsurfacez|0|PointNE|0|KO-BKO
 polyhedralsurfacez|0|LineString|0|KO-BKO
@@ -22883,7 +22883,7 @@ polyhedralsurfacez4326|0|CompoundCurve|2|KO-BKO
 polyhedralsurfacez4326|0|CurvePolygon|2|KO-BKO
 polyhedralsurfacez4326|0|MultiCurve|2|KO-BKO
 polyhedralsurfacez4326|0|MultiSurface|2|KO-BKO
-polyhedralsurfacez4326|0|PolyhedralSurface|2|KO-BKO
+polyhedralsurfacez4326|0|PolyhedralSurface|2|OK-BOK
 polyhedralsurfacez4326|0|Triangle|2|KO-BKO
 polyhedralsurfacez4326|0|Tin|2|KO-BKO
 polyhedralsurfacez4326|0|Point|1|KO-BKO
@@ -22988,7 +22988,7 @@ polyhedralsurfacez4326|4326|MultiSurface|3|KO-BKO
 polyhedralsurfacez4326|4326|PolyhedralSurface|3|KO-BKO
 polyhedralsurfacez4326|4326|Triangle|3|KO-BKO
 polyhedralsurfacez4326|4326|Tin|3|KO-BKO
-polyhedralsurfacez4326||COUNT|2|
+polyhedralsurfacez4326||COUNT|4|
 polyhedralsurfacezm|0|Point|0|KO-BKO
 polyhedralsurfacezm|0|PointNE|0|KO-BKO
 polyhedralsurfacezm|0|LineString|0|KO-BKO
@@ -23328,7 +23328,7 @@ polyhedralsurfacezm4326|0|CompoundCurve|3|KO-BKO
 polyhedralsurfacezm4326|0|CurvePolygon|3|KO-BKO
 polyhedralsurfacezm4326|0|MultiCurve|3|KO-BKO
 polyhedralsurfacezm4326|0|MultiSurface|3|KO-BKO
-polyhedralsurfacezm4326|0|PolyhedralSurface|3|KO-BKO
+polyhedralsurfacezm4326|0|PolyhedralSurface|3|OK-BOK
 polyhedralsurfacezm4326|0|Triangle|3|KO-BKO
 polyhedralsurfacezm4326|0|Tin|3|KO-BKO
 polyhedralsurfacezm4326|4326|Point|0|KO-BKO
@@ -23399,7 +23399,7 @@ polyhedralsurfacezm4326|4326|MultiSurface|3|KO-BKO
 polyhedralsurfacezm4326|4326|PolyhedralSurface|3|OK-BOK
 polyhedralsurfacezm4326|4326|Triangle|3|KO-BKO
 polyhedralsurfacezm4326|4326|Tin|3|KO-BKO
-polyhedralsurfacezm4326||COUNT|2|
+polyhedralsurfacezm4326||COUNT|4|
 tin|0|Point|0|KO-BKO
 tin|0|PointNE|0|KO-BKO
 tin|0|LineString|0|KO-BKO
@@ -23690,7 +23690,7 @@ tin4326|0|MultiCurve|0|KO-BKO
 tin4326|0|MultiSurface|0|KO-BKO
 tin4326|0|PolyhedralSurface|0|KO-BKO
 tin4326|0|Triangle|0|KO-BKO
-tin4326|0|Tin|0|KO-BKO
+tin4326|0|Tin|0|OK-BOK
 tin4326|0|Point|2|KO-BKO
 tin4326|0|PointNE|2|KO-BKO
 tin4326|0|LineString|2|KO-BKO
@@ -23810,7 +23810,7 @@ tin4326|4326|MultiSurface|3|KO-BKO
 tin4326|4326|PolyhedralSurface|3|KO-BKO
 tin4326|4326|Triangle|3|KO-BKO
 tin4326|4326|Tin|3|KO-BKO
-tin4326||COUNT|2|
+tin4326||COUNT|4|
 tinm|0|Point|0|KO-BKO
 tinm|0|PointNE|0|KO-BKO
 tinm|0|LineString|0|KO-BKO
@@ -24135,7 +24135,7 @@ tinm4326|0|MultiCurve|1|KO-BKO
 tinm4326|0|MultiSurface|1|KO-BKO
 tinm4326|0|PolyhedralSurface|1|KO-BKO
 tinm4326|0|Triangle|1|KO-BKO
-tinm4326|0|Tin|1|KO-BKO
+tinm4326|0|Tin|1|OK-BOK
 tinm4326|0|Point|3|KO-BKO
 tinm4326|0|PointNE|3|KO-BKO
 tinm4326|0|LineString|3|KO-BKO
@@ -24221,7 +24221,7 @@ tinm4326|4326|MultiSurface|3|KO-BKO
 tinm4326|4326|PolyhedralSurface|3|KO-BKO
 tinm4326|4326|Triangle|3|KO-BKO
 tinm4326|4326|Tin|3|KO-BKO
-tinm4326||COUNT|2|
+tinm4326||COUNT|4|
 tinz|0|Point|0|KO-BKO
 tinz|0|PointNE|0|KO-BKO
 tinz|0|LineString|0|KO-BKO
@@ -24529,7 +24529,7 @@ tinz4326|0|MultiCurve|2|KO-BKO
 tinz4326|0|MultiSurface|2|KO-BKO
 tinz4326|0|PolyhedralSurface|2|KO-BKO
 tinz4326|0|Triangle|2|KO-BKO
-tinz4326|0|Tin|2|KO-BKO
+tinz4326|0|Tin|2|OK-BOK
 tinz4326|0|Point|1|KO-BKO
 tinz4326|0|PointNE|1|KO-BKO
 tinz4326|0|LineString|1|KO-BKO
@@ -24632,7 +24632,7 @@ tinz4326|4326|MultiSurface|3|KO-BKO
 tinz4326|4326|PolyhedralSurface|3|KO-BKO
 tinz4326|4326|Triangle|3|KO-BKO
 tinz4326|4326|Tin|3|KO-BKO
-tinz4326||COUNT|2|
+tinz4326||COUNT|4|
 tinzm|0|Point|0|KO-BKO
 tinzm|0|PointNE|0|KO-BKO
 tinzm|0|LineString|0|KO-BKO
@@ -24974,7 +24974,7 @@ tinzm4326|0|MultiCurve|3|KO-BKO
 tinzm4326|0|MultiSurface|3|KO-BKO
 tinzm4326|0|PolyhedralSurface|3|KO-BKO
 tinzm4326|0|Triangle|3|KO-BKO
-tinzm4326|0|Tin|3|KO-BKO
+tinzm4326|0|Tin|3|OK-BOK
 tinzm4326|4326|Point|0|KO-BKO
 tinzm4326|4326|PointNE|0|KO-BKO
 tinzm4326|4326|LineString|0|KO-BKO
@@ -25043,7 +25043,7 @@ tinzm4326|4326|MultiSurface|3|KO-BKO
 tinzm4326|4326|PolyhedralSurface|3|KO-BKO
 tinzm4326|4326|Triangle|3|KO-BKO
 tinzm4326|4326|Tin|3|OK-BOK
-tinzm4326||COUNT|2|
+tinzm4326||COUNT|4|
 triangle|0|Point|0|KO-BKO
 triangle|0|PointNE|0|KO-BKO
 triangle|0|LineString|0|KO-BKO
@@ -25333,7 +25333,7 @@ triangle4326|0|CurvePolygon|0|KO-BKO
 triangle4326|0|MultiCurve|0|KO-BKO
 triangle4326|0|MultiSurface|0|KO-BKO
 triangle4326|0|PolyhedralSurface|0|KO-BKO
-triangle4326|0|Triangle|0|KO-BKO
+triangle4326|0|Triangle|0|OK-BOK
 triangle4326|0|Tin|0|KO-BKO
 triangle4326|0|Point|2|KO-BKO
 triangle4326|0|PointNE|2|KO-BKO
@@ -25454,7 +25454,7 @@ triangle4326|4326|MultiSurface|3|KO-BKO
 triangle4326|4326|PolyhedralSurface|3|KO-BKO
 triangle4326|4326|Triangle|3|KO-BKO
 triangle4326|4326|Tin|3|KO-BKO
-triangle4326||COUNT|2|
+triangle4326||COUNT|4|
 trianglem|0|Point|0|KO-BKO
 trianglem|0|PointNE|0|KO-BKO
 trianglem|0|LineString|0|KO-BKO
@@ -25778,7 +25778,7 @@ trianglem4326|0|CurvePolygon|1|KO-BKO
 trianglem4326|0|MultiCurve|1|KO-BKO
 trianglem4326|0|MultiSurface|1|KO-BKO
 trianglem4326|0|PolyhedralSurface|1|KO-BKO
-trianglem4326|0|Triangle|1|KO-BKO
+trianglem4326|0|Triangle|1|OK-BOK
 trianglem4326|0|Tin|1|KO-BKO
 trianglem4326|0|Point|3|KO-BKO
 trianglem4326|0|PointNE|3|KO-BKO
@@ -25865,7 +25865,7 @@ trianglem4326|4326|MultiSurface|3|KO-BKO
 trianglem4326|4326|PolyhedralSurface|3|KO-BKO
 trianglem4326|4326|Triangle|3|KO-BKO
 trianglem4326|4326|Tin|3|KO-BKO
-trianglem4326||COUNT|2|
+trianglem4326||COUNT|4|
 trianglez|0|Point|0|KO-BKO
 trianglez|0|PointNE|0|KO-BKO
 trianglez|0|LineString|0|KO-BKO
@@ -26172,7 +26172,7 @@ trianglez4326|0|CurvePolygon|2|KO-BKO
 trianglez4326|0|MultiCurve|2|KO-BKO
 trianglez4326|0|MultiSurface|2|KO-BKO
 trianglez4326|0|PolyhedralSurface|2|KO-BKO
-trianglez4326|0|Triangle|2|KO-BKO
+trianglez4326|0|Triangle|2|OK-BOK
 trianglez4326|0|Tin|2|KO-BKO
 trianglez4326|0|Point|1|KO-BKO
 trianglez4326|0|PointNE|1|KO-BKO
@@ -26276,7 +26276,7 @@ trianglez4326|4326|MultiSurface|3|KO-BKO
 trianglez4326|4326|PolyhedralSurface|3|KO-BKO
 trianglez4326|4326|Triangle|3|KO-BKO
 trianglez4326|4326|Tin|3|KO-BKO
-trianglez4326||COUNT|2|
+trianglez4326||COUNT|4|
 trianglezm|0|Point|0|KO-BKO
 trianglezm|0|PointNE|0|KO-BKO
 trianglezm|0|LineString|0|KO-BKO
@@ -26617,7 +26617,7 @@ trianglezm4326|0|CurvePolygon|3|KO-BKO
 trianglezm4326|0|MultiCurve|3|KO-BKO
 trianglezm4326|0|MultiSurface|3|KO-BKO
 trianglezm4326|0|PolyhedralSurface|3|KO-BKO
-trianglezm4326|0|Triangle|3|KO-BKO
+trianglezm4326|0|Triangle|3|OK-BOK
 trianglezm4326|0|Tin|3|KO-BKO
 trianglezm4326|4326|Point|0|KO-BKO
 trianglezm4326|4326|PointNE|0|KO-BKO
@@ -26687,4 +26687,4 @@ trianglezm4326|4326|MultiSurface|3|KO-BKO
 trianglezm4326|4326|PolyhedralSurface|3|KO-BKO
 trianglezm4326|4326|Triangle|3|OK-BOK
 trianglezm4326|4326|Tin|3|KO-BKO
-trianglezm4326||COUNT|2|
+trianglezm4326||COUNT|4|

-----------------------------------------------------------------------

Summary of changes:
 NEWS                         |   1 +
 postgis/gserialized_typmod.c |   7 +
 regress/core/typmod_expected | 408 +++++++++++++++++++++----------------------
 3 files changed, 212 insertions(+), 204 deletions(-)


hooks/post-receive
-- 
PostGIS; Spatial objects for PostgreSQL.

More information about the postgis-tickets mailing list