Merge pull request antlr#1654 from bigsheeper/master

add supports for geometry type in wkt

Author: teverett

wkt/examples/example1.txt

@@ -3,4 +3,12 @@ POINT M (1 1 80)
 POINT EMPTY
 MULTIPOLYGON EMPTY
 CIRCULARSTRING(1 5, 6 2, 7 3)
+LINESTRING EMPTY
+GEOMETRYCOLLECTION(POINT(1 1), LINESTRING( 1 1 , 2 2, 3 3))
+COMPOUNDCURVE((5 3, 5 13), CIRCULARSTRING(5 13, 7 15, 9 13), (9 13, 9 3), CIRCULARSTRING(9 3, 7 1, 5 3))
+POLYHEDRALSURFACE (((0 0,0 0,0 1,0 0)),((0 0,0 1,1 0,0 0)),((0 0,1 0,0 0,0 0)),((1 0,0 1,0 0,1 0)))
+MULTICURVE ((5 5,3 5,3 3,0 3),CIRCULARSTRING (0 0,0.2 1,0.5 1.4),COMPOUNDCURVE (CIRCULARSTRING (0 0,1 1,1 0),(1 0,0 1)))
+CURVEPOLYGON (CIRCULARSTRING (0 0,4 0,4 4,0 4,0 0),(1.8888 1.787,3 3,3 1,1.8888 1.787))
+MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(0 0, 4 0, 4 4, 0 4, 0 0),(1 1, 3 3, 3 1, 1 1)))
+
 

wkt/wkt.g4

@@ -1,8 +1,12 @@
 
 grammar wkt;
 
+geometryCollection
+   : GEOMETRYCOLLECTION ( LPAR geometry (COMMA geometry)* RPAR | EMPTY)
+   ;
+
 geometry
-   : (polygonGeometry | lineStringGeometry | pointGeometry | multiPointGeometry | multiLineStringGeometry | multiPolygonGeometry | circularStringGeometry) + EOF
+   : (polygonGeometry | lineStringGeometry | pointGeometry | compoundCurveGeometry | curvePolygonGeometry | multiSurfaceGeometry | multiCurveGeometry | multiPointGeometry | multiLineStringGeometry | multiPolygonGeometry | circularStringGeometry | multiPolyhedralSurfaceGeometry | multiTinGeometry | geometryCollection)
    ;
 
 pointGeometry
@@ -17,18 +21,42 @@ polygonGeometry
    : POLYGON polygon
    ;
 
+multiCurveGeometry
+   : MULTICURVE ((LPAR (lineString | circularStringGeometry | compoundCurveGeometry) (COMMA (circularStringGeometry | lineString | compoundCurveGeometry))* RPAR) | EMPTY)
+   ;
+
+multiSurfaceGeometry
+   : MULTISURFACE ((LPAR (polygon | curvePolygonGeometry) (COMMA (polygon | curvePolygonGeometry))* RPAR) | EMPTY)
+   ;
+
+curvePolygonGeometry
+   : CURVEPOLYGON ((LPAR (lineString | circularStringGeometry | compoundCurveGeometry) (COMMA (circularStringGeometry | lineString | compoundCurveGeometry))* RPAR) | EMPTY)
+   ;
+
+compoundCurveGeometry
+   : COMPOUNDCURVE ((LPAR (lineString | circularStringGeometry) (COMMA (circularStringGeometry | lineString))* RPAR) | EMPTY)
+   ;
+
 multiPointGeometry
-   : MULTIPOINT LPAR pointOrClosedPoint (COMMA pointOrClosedPoint)* RPAR
+   : MULTIPOINT ((LPAR pointOrClosedPoint (COMMA pointOrClosedPoint)* RPAR) | EMPTY)
    ;
 
 multiLineStringGeometry
-   : MULTILINESTRING LPAR lineString (COMMA lineString)* RPAR
+   : MULTILINESTRING ((LPAR lineString (COMMA lineString)* RPAR) | EMPTY)
    ;
 
 multiPolygonGeometry
    : MULTIPOLYGON ((LPAR polygon (COMMA polygon)* RPAR) | EMPTY)
    ;
 
+multiPolyhedralSurfaceGeometry
+   : POLYHEDRALSURFACE ((LPAR polygon (COMMA polygon)* RPAR) | EMPTY)
+   ;
+
+multiTinGeometry
+   : TIN ((LPAR polygon (COMMA polygon)* RPAR) | EMPTY)
+   ;
+
 circularStringGeometry
    : CIRCULARSTRING LPAR point (COMMA point)* RPAR
    ;
@@ -39,11 +67,11 @@ pointOrClosedPoint
    ;
 
 polygon
-   : LPAR lineString (COMMA lineString)* RPAR
+   : LPAR lineString (COMMA lineString)* RPAR | EMPTY
    ;
 
 lineString
-   : LPAR point (COMMA point)* RPAR
+   : LPAR point (COMMA point)* RPAR | EMPTY
    ;
 
 point
@@ -152,6 +180,9 @@ COMPOUNDCURVE
    : C O M P O U N D C U R V E
    ;
 
+MULTISURFACE
+   : M U L T I S U R F A C E
+   ;
 
 CURVEPOLYGON
    : C U R V E P O L Y G O N
@@ -316,3 +347,4 @@ STRING
 WS
    : [ \t\r\n] + -> skip
    ;
+