Update documentation

h2/src/docsrc/help/help.csv

@@ -3037,20 +3037,34 @@ ENUM('clubs', 'diamonds', 'hearts', 'spades')
 "
 "Data Types","GEOMETRY Type","
 GEOMETRY
+    [({ sridInt | { {POINT|LINESTRING|POLYGON|MULTIPOINT|MULTILINESTRING
+    |MULTIPOLYGON|GEOMETRYCOLLECTION} [Z|M|ZM] [, sridInt]} })]
 ","
 A spatial geometry type.
-Mapped to ""org.locationtech.jts.geom.Geometry"" if JTS library is in classpath.
+If additional constraints are not specified this type accepts all supported types of geometries.
+A constraint with required geometry type and dimension system can be set by specifying name of the type and
+dimension system. A whitespace between them is optional.
+2D dimension system does not have a name and assumed if only a geometry type name is specified.
+POINT means 2D point, POINT Z or POINTZ means 3D point.
+A constraint with required spatial reference system identifier (SRID) can be set by specifying this identifier.
+Both constraints for type and SRID can be specified together.
+
+Mapped to ""org.locationtech.jts.geom.Geometry"" if JTS library is in classpath and to ""java.lang.String"" otherwise.
 May be represented in textual format using the WKT (well-known text) or EWKT (extended well-known text) format.
 Values are stored internally in EWKB (extended well-known binary) format.
 Only a subset of EWKB and EWKT features is supported.
 Supported objects are POINT, LINESTRING, POLYGON, MULTIPOINT, MULTILINESTRING, MULTIPOLYGON, and GEOMETRYCOLLECTION.
-Supported dimension systems are XY (2D), XYZ, XYM, and XYZM.
+Supported dimension systems are 2D (XY), Z (XYZ), M (XYM), and ZM (XYZM).
 SRID (spatial reference system identifier) is supported.
 
 Use a quoted string containing a WKT/EWKT formatted string or ""PreparedStatement.setObject()"" to store values,
 and ""ResultSet.getObject(..)"" or ""ResultSet.getString(..)"" to retrieve the values.
 ","
 GEOMETRY
+GEOMETRY(POINT)
+GEOMETRY(POINT Z)
+GEOMETRY(POINT Z, 4326)
+GEOMETRY(4326)
 "
 
 "Data Types","INTERVAL Type","

h2/src/main/org/h2/util/geometry/EWKTUtils.java

@@ -58,7 +58,7 @@ public final class EWKTUtils {
     /**
      * Names of dimension systems.
      */
-    private static final String[] DIMENSION_SYTEMS = { //
+    private static final String[] DIMENSION_SYSTEMS = { //
             "XY", //
             "Z", //
             "M", //
@@ -677,7 +677,7 @@ public final class EWKTUtils {
         }
         String result = TYPES[t - 1];
         if (d != DIMENSION_SYSTEM_XY) {
-            result = result + ' ' + DIMENSION_SYTEMS[d];
+            result = result + ' ' + DIMENSION_SYSTEMS[d];
         }
         return result;
     }

h2/src/main/org/h2/value/ValueEnum.java

@@ -5,11 +5,14 @@
  */
 package org.h2.value;
 
+/**
+ * ENUM value.
+ */
 public class ValueEnum extends ValueEnumBase {
 
     private final ExtTypeInfoEnum enumerators;
 
-    ValueEnum(ExtTypeInfoEnum enumerators, String label,  int ordinal) {
+    ValueEnum(ExtTypeInfoEnum enumerators, String label, int ordinal) {
         super(label, ordinal);
         this.enumerators = enumerators;
     }

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -795,3 +795,4 @@ minxd maxxd minyd maxyd bminxd bmaxxd bminyd bmaxyd
 interior envelopes multilinestring multipoint packed exterior normalization awkward determination subgeometries
 xym normalizes coord setz xyzm geometrycollection multipolygon mixup rings polygons rejection finite
 pointzm pointz pointm dimensionality redefine forum measures
+mpg casted pzm mls constrained