WKT2 parser: update to OGC 18-010r6

- Allow ID[] in base CRS of Derived CRS
- Allow VERSION[] in non-conversion coordinate operations
- Use VERSION[] to set operationVersion member of CoordinateOperation
- Export operationVersion in WKT2:2018

1 files changed, 71 insertions, 70 deletions

diff --git a/src/wkt2_generated_parser.h b/src/wkt2_generated_parser.h
index baeb0b4f..80b0c34b 100644
--- a/src/wkt2_generated_parser.h
+++ b/src/wkt2_generated_parser.h
@@ -121,76 +121,77 @@ extern int pj_wkt2_debug;
     T_COORDEPOCH = 330,
     T_COORDINATEMETADATA = 331,
     T_POINTMOTIONOPERATION = 332,
-    T_GEODETICCRS = 333,
-    T_GEODETICDATUM = 334,
-    T_PROJECTEDCRS = 335,
-    T_PRIMEMERIDIAN = 336,
-    T_GEOGRAPHICCRS = 337,
-    T_TRF = 338,
-    T_VERTICALCRS = 339,
-    T_VERTICALDATUM = 340,
-    T_VRF = 341,
-    T_TIMEDATUM = 342,
-    T_TEMPORALQUANTITY = 343,
-    T_ENGINEERINGDATUM = 344,
-    T_ENGINEERINGCRS = 345,
-    T_PARAMETRICDATUM = 346,
-    T_AFFINE = 347,
-    T_CARTESIAN = 348,
-    T_CYLINDRICAL = 349,
-    T_ELLIPSOIDAL = 350,
-    T_LINEAR = 351,
-    T_PARAMETRIC = 352,
-    T_POLAR = 353,
-    T_SPHERICAL = 354,
-    T_VERTICAL = 355,
-    T_TEMPORAL = 356,
-    T_TEMPORALCOUNT = 357,
-    T_TEMPORALMEASURE = 358,
-    T_ORDINAL = 359,
-    T_TEMPORALDATETIME = 360,
-    T_NORTH = 361,
-    T_NORTHNORTHEAST = 362,
-    T_NORTHEAST = 363,
-    T_EASTNORTHEAST = 364,
-    T_EAST = 365,
-    T_EASTSOUTHEAST = 366,
-    T_SOUTHEAST = 367,
-    T_SOUTHSOUTHEAST = 368,
-    T_SOUTH = 369,
-    T_SOUTHSOUTHWEST = 370,
-    T_SOUTHWEST = 371,
-    T_WESTSOUTHWEST = 372,
-    T_WEST = 373,
-    T_WESTNORTHWEST = 374,
-    T_NORTHWEST = 375,
-    T_NORTHNORTHWEST = 376,
-    T_UP = 377,
-    T_DOWN = 378,
-    T_GEOCENTRICX = 379,
-    T_GEOCENTRICY = 380,
-    T_GEOCENTRICZ = 381,
-    T_COLUMNPOSITIVE = 382,
-    T_COLUMNNEGATIVE = 383,
-    T_ROWPOSITIVE = 384,
-    T_ROWNEGATIVE = 385,
-    T_DISPLAYRIGHT = 386,
-    T_DISPLAYLEFT = 387,
-    T_DISPLAYUP = 388,
-    T_DISPLAYDOWN = 389,
-    T_FORWARD = 390,
-    T_AFT = 391,
-    T_PORT = 392,
-    T_STARBOARD = 393,
-    T_CLOCKWISE = 394,
-    T_COUNTERCLOCKWISE = 395,
-    T_TOWARDS = 396,
-    T_AWAYFROM = 397,
-    T_FUTURE = 398,
-    T_PAST = 399,
-    T_UNSPECIFIED = 400,
-    T_STRING = 401,
-    T_UNSIGNED_INTEGER_DIFFERENT_ONE_TWO_THREE = 402
+    T_VERSION = 333,
+    T_GEODETICCRS = 334,
+    T_GEODETICDATUM = 335,
+    T_PROJECTEDCRS = 336,
+    T_PRIMEMERIDIAN = 337,
+    T_GEOGRAPHICCRS = 338,
+    T_TRF = 339,
+    T_VERTICALCRS = 340,
+    T_VERTICALDATUM = 341,
+    T_VRF = 342,
+    T_TIMEDATUM = 343,
+    T_TEMPORALQUANTITY = 344,
+    T_ENGINEERINGDATUM = 345,
+    T_ENGINEERINGCRS = 346,
+    T_PARAMETRICDATUM = 347,
+    T_AFFINE = 348,
+    T_CARTESIAN = 349,
+    T_CYLINDRICAL = 350,
+    T_ELLIPSOIDAL = 351,
+    T_LINEAR = 352,
+    T_PARAMETRIC = 353,
+    T_POLAR = 354,
+    T_SPHERICAL = 355,
+    T_VERTICAL = 356,
+    T_TEMPORAL = 357,
+    T_TEMPORALCOUNT = 358,
+    T_TEMPORALMEASURE = 359,
+    T_ORDINAL = 360,
+    T_TEMPORALDATETIME = 361,
+    T_NORTH = 362,
+    T_NORTHNORTHEAST = 363,
+    T_NORTHEAST = 364,
+    T_EASTNORTHEAST = 365,
+    T_EAST = 366,
+    T_EASTSOUTHEAST = 367,
+    T_SOUTHEAST = 368,
+    T_SOUTHSOUTHEAST = 369,
+    T_SOUTH = 370,
+    T_SOUTHSOUTHWEST = 371,
+    T_SOUTHWEST = 372,
+    T_WESTSOUTHWEST = 373,
+    T_WEST = 374,
+    T_WESTNORTHWEST = 375,
+    T_NORTHWEST = 376,
+    T_NORTHNORTHWEST = 377,
+    T_UP = 378,
+    T_DOWN = 379,
+    T_GEOCENTRICX = 380,
+    T_GEOCENTRICY = 381,
+    T_GEOCENTRICZ = 382,
+    T_COLUMNPOSITIVE = 383,
+    T_COLUMNNEGATIVE = 384,
+    T_ROWPOSITIVE = 385,
+    T_ROWNEGATIVE = 386,
+    T_DISPLAYRIGHT = 387,
+    T_DISPLAYLEFT = 388,
+    T_DISPLAYUP = 389,
+    T_DISPLAYDOWN = 390,
+    T_FORWARD = 391,
+    T_AFT = 392,
+    T_PORT = 393,
+    T_STARBOARD = 394,
+    T_CLOCKWISE = 395,
+    T_COUNTERCLOCKWISE = 396,
+    T_TOWARDS = 397,
+    T_AWAYFROM = 398,
+    T_FUTURE = 399,
+    T_PAST = 400,
+    T_UNSPECIFIED = 401,
+    T_STRING = 402,
+    T_UNSIGNED_INTEGER_DIFFERENT_ONE_TWO_THREE = 403
   };
 #endif