#1096 same fix as for linestringZ, apply to geometryM, zm and multilinestringZ

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

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index 7c946c74568ca5041e321a02345ce4e36683cd6d..ca030e4383632877c9358c4c80576a9bb153616b 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -4415,66 +4415,78 @@ $$
        FROM \r
        ( VALUES\r
                 ('GEOMETRY', 'Geometry', 2) ,\r
-                       ('GEOMETRY', 'Geometry', 3) ,\r
-                       ('GEOMETRY', 'Geometry', 4) ,\r
+                       ('GEOMETRY', 'GeometryZ', 3) ,\r
+                       ('GEOMETRY', 'GeometryZM', 4) ,\r
                        ('GEOMETRYCOLLECTION', 'GeometryCollection', 2) ,\r
                        ('GEOMETRYCOLLECTION', 'GeometryCollectionZ', 3) ,\r
                        ('GEOMETRYCOLLECTIONM', 'GeometryCollectionM', 3) ,\r
                        ('GEOMETRYCOLLECTION', 'GeometryCollectionZM', 4) ,\r
+                       \r
                        ('POINT', 'Point',2) ,\r
                        ('POINTM','PointM',3) ,\r
                        ('POINT', 'PointZ',3) ,\r
                        ('POINT', 'PointZM',4) ,\r
+                       \r
                        ('MULTIPOINT','MultiPoint',2) ,\r
                        ('MULTIPOINT','MultiPointZ',3) ,\r
                        ('MULTIPOINTM','MultiPointM',3) ,\r
                        ('MULTIPOINT','MultiPointZM',4) ,\r
+                       \r
                        ('POLYGON', 'Polygon',2) ,\r
                        ('POLYGON', 'PolygonZ',3) ,\r
                        ('POLYGONM', 'PolygonM',3) ,\r
                        ('POLYGON', 'PolygonZM',4) ,\r
+                       \r
                        ('MULTIPOLYGON', 'MultiPolygon',2) ,\r
                        ('MULTIPOLYGON', 'MultiPolygonZ',3) ,\r
                        ('MULTIPOLYGONM', 'MultiPolygonM',3) ,\r
                        ('MULTIPOLYGON', 'MultiPolygonZM',4) ,\r
+                       \r
                        ('MULTILINESTRING', 'MultiLineString',2) ,\r
+                       ('MULTILINESTRING', 'MultiLineStringZ',3) ,\r
                        ('MULTILINESTRINGM', 'MultiLineStringM',3) ,\r
                        ('MULTILINESTRING', 'MultiLineStringZM',4) ,\r
+                       \r
                        ('LINESTRING', 'LineString',2) ,\r
                        ('LINESTRING', 'LineStringZ',3) ,\r
                        ('LINESTRINGM', 'LineStringM',3) ,\r
                        ('LINESTRING', 'LineStringZM',4) ,\r
+                       \r
                        ('CIRCULARSTRING', 'CircularString',2) ,\r
                        ('CIRCULARSTRING', 'CircularStringZ',3) ,\r
                        ('CIRCULARSTRINGM', 'CircularStringM',3) ,\r
                        ('CIRCULARSTRING', 'CircularStringZM',4) ,\r
+                       \r
                        ('COMPOUNDCURVE', 'CompoundCurve',2) ,\r
                        ('COMPOUNDCURVE', 'CompoundCurveZ',3) ,\r
                        ('COMPOUNDCURVEM', 'CompoundCurveM',3) ,\r
                        ('COMPOUNDCURVE', 'CompoundCurveZM',4) ,\r
+                       \r
                        ('CURVEPOLYGON', 'CurvePolygon',2) ,\r
                        ('CURVEPOLYGON', 'CurvePolygonZ',3) ,\r
                        ('CURVEPOLYGONM', 'CurvePolygonM',3) ,\r
                        ('CURVEPOLYGON', 'CurvePolygonZM',4) ,\r
+                       \r
                        ('MULTICURVE', 'MultiCurve',2 ) ,\r
                        ('MULTICURVE', 'MultiCurveZ',3 ) ,\r
                        ('MULTICURVEM', 'MultiCurveM',3 ) ,\r
                        ('MULTICURVEM', 'MultiCurveZM',4 ) ,\r
+                       \r
                        ('MULTISURFACE', 'MultiSurface', 2) ,\r
                        ('MULTISURFACE', 'MultiSurfaceZ', 3) ,\r
                        ('MULTISURFACEM', 'MultiSurfaceM', 3) ,\r
                        ('MULTISURFACE', 'MultiSurfaceZM', 4) ,\r
+                       \r
                        ('POLYHEDRALSURFACE', 'PolyhedralSurface',2) ,\r
                        ('POLYHEDRALSURFACE', 'PolyhedralSurfaceZ',3) ,\r
                        ('POLYHEDRALSURFACEM', 'PolyhedralSurfaceM',3) ,\r
                        ('POLYHEDRALSURFACE', 'PolyhedralSurfaceZM',4) ,\r
-                       ('TRIANGLE', 'TriangleZ',3) ,\r
-                       ('TRIANGLEM', 'TriangleM',3) ,\r
-                       ('TRIANGLE', 'TriangleZM',4) ,\r
+                       \r
                        ('TRIANGLE', 'Triangle',2) ,\r
                        ('TRIANGLE', 'TriangleZ',3) ,\r
                        ('TRIANGLEM', 'TriangleM',3) ,\r
                        ('TRIANGLE', 'TriangleZM',4) ,\r
+\r
                        ('TIN', 'TIN', 2),\r
                        ('TIN', 'TinZ', 3),\r
                        ('TIN', 'TinM', 3),\r