npm - @lbdudc/gp-gis-dsl - Versions diffs - 0.2.1 → 0.2.2 - Mend

@lbdudc/gp-gis-dsl 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/grammar/GISGrammar.g4 +240 -230
package/package.json +54 -54
package/src/GISVisitor.js +368 -318
package/src/GISVisitorHelper.js +93 -162
package/src/cli.js +34 -34
package/src/error/ErrorListener.js +26 -26
package/src/features.js +72 -0
package/src/index.js +26 -26
package/src/lib/GISGrammar.interp +144 -140
package/src/lib/GISGrammar.tokens +45 -44
package/src/lib/GISGrammarLexer.interp +204 -201
package/src/lib/GISGrammarLexer.js +287 -279
package/src/lib/GISGrammarLexer.tokens +45 -44
package/src/lib/GISGrammarListener.js +19 -1
package/src/lib/GISGrammarParser.js +724 -365
package/src/lib/GISGrammarVisitor.js +13 -1
package/src/spl/GIS.js +234 -234
package/src/spl/GeoJSONLayer.js +21 -21
package/src/spl/GeoJSONLayerStyle.js +14 -14
package/src/spl/Map.js +53 -44
package/src/spl/TileLayer.js +16 -16
package/src/spl/WMSLayer.js +30 -30
package/src/spl/WMSStyle.js +13 -13
package/src/spl/WMSStyleCustom.js +22 -0
package/src/store.js +74 -74

package/src/lib/GISGrammar.interp CHANGED Viewed

@@ -1,140 +1,144 @@
-token literal names:
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-null
-'0..1'
-'1..1'
-'0..*'
-'1..*'
-null
-'#'
-'.'
-'('
-')'
-','
-';'
-null
-null
-null
-null
-null
-null
-null
-token symbolic names:
-null
-CREATE_SYMBOL
-GIS_SYMBOL
-ENTITY_SYMBOL
-USING_SYMBOL
-USE_SYMBOL
-GENERATE_SYMBOL
-IDENTIFIER_SYMBOL
-RELATIONSHIP_SYMBOL
-DISPLAYSTRING_SYMBOL
-REQUIRED_SYMBOL
-UNIQUE_SYMBOL
-BIDIRECTIONAL_SYMBOL
-MAPPEDBY_SYMBOL
-LAYER_SYMBOL
-TILE_SYMBOL
-GEOJSON_SYMBOL
-AS_SYMBOL
-URL_SYMBOL
-SLD_SYMBOL
-EDITABLE_SYMBOL
-FILL_COLOR_SYMBOL
-STROKE_COLOR_SYMBOL
-FILL_OPACITY_SYMBOL
-STROKE_OPACITY_SYMBOL
-WMS_SYMBOL
-STYLE_SYMBOL
-IS_BASE_LAYER_SYMBOL
-HIDDEN_SYMBOL
-SORTABLE_SYMBOL
-MAP_SYMBOL
-SET_SYMBOL
-DEPLOYMENT_SYMBOL
-ZERO_ONE_SYMBOL
-ONE_ONE_SYMBOL
-ZERO_MANY_SYMBOL
-ONE_MANY_SYMBOL
-TYPE
-POUND_SYMBOL
-DOT_SYMBOL
-OPAR_SYMBOL
-CPAR_SYMBOL
-COMMA_SYMBOL
-SCOL_SYMBOL
-HEX_COLOR
-INT_NUMBER
-FLOAT_NUMBER
-COMMENT
-WHITESPACE
-IDENTIFIER
-QUOTED_TEXT
-rule names:
-parse
-sentence
-createStatement
-createGIS
-createEntity
-createLayer
-createTileLayer
-createGeoJSONLayer
-createWmsStyle
-createWmsLayer
-wmsSubLayer
-createSortableMap
-createMap
-mapLayer
-useGIS
-generateGIS
-setDeployment
-deploymentProperty
-property
-propertyDefinition
-relationshipDefinition
-mappedRelationshipDefinition
-ownedRelationshipDefinition
-cardinality
-srid
-identifier
-text
-hexColor
-floatNumber
-atn:
-[4, 1, 50, 275, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 1, 0, 4, 0, 60, 8, 0, 11, 0, 12, 0, 61, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 68, 8, 1, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 74, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 5, 4, 88, 8, 4, 10, 4, 12, 4, 91, 9, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 102, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 109, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 122, 8, 7, 1, 7, 1, 7, 1, 7, 3, 7, 127, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 158, 8, 9, 1, 9, 1, 9, 1, 9, 1, 9, 5, 9, 164, 8, 9, 10, 9, 12, 9, 167, 9, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 182, 8, 12, 1, 12, 1, 12, 1, 12, 1, 12, 5, 12, 188, 8, 12, 10, 12, 12, 12, 191, 9, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 3, 13, 198, 8, 13, 1, 13, 3, 13, 201, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 219, 8, 16, 10, 16, 12, 16, 222, 9, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 3, 18, 232, 8, 18, 1, 19, 1, 19, 1, 19, 5, 19, 237, 8, 19, 10, 19, 12, 19, 240, 9, 19, 1, 20, 1, 20, 3, 20, 244, 8, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 3, 22, 261, 8, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 0, 0, 29, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 0, 2, 2, 0, 7, 7, 9, 11, 1, 0, 33, 36, 271, 0, 59, 1, 0, 0, 0, 2, 67, 1, 0, 0, 0, 4, 69, 1, 0, 0, 0, 6, 75, 1, 0, 0, 0, 8, 81, 1, 0, 0, 0, 10, 101, 1, 0, 0, 0, 12, 103, 1, 0, 0, 0, 14, 116, 1, 0, 0, 0, 16, 143, 1, 0, 0, 0, 18, 152, 1, 0, 0, 0, 20, 171, 1, 0, 0, 0, 22, 174, 1, 0, 0, 0, 24, 177, 1, 0, 0, 0, 26, 195, 1, 0, 0, 0, 28, 202, 1, 0, 0, 0, 30, 207, 1, 0, 0, 0, 32, 212, 1, 0, 0, 0, 34, 226, 1, 0, 0, 0, 36, 231, 1, 0, 0, 0, 38, 233, 1, 0, 0, 0, 40, 243, 1, 0, 0, 0, 42, 245, 1, 0, 0, 0, 44, 251, 1, 0, 0, 0, 46, 262, 1, 0, 0, 0, 48, 264, 1, 0, 0, 0, 50, 266, 1, 0, 0, 0, 52, 268, 1, 0, 0, 0, 54, 270, 1, 0, 0, 0, 56, 272, 1, 0, 0, 0, 58, 60, 3, 2, 1, 0, 59, 58, 1, 0, 0, 0, 60, 61, 1, 0, 0, 0, 61, 59, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 1, 1, 0, 0, 0, 63, 68, 3, 4, 2, 0, 64, 68, 3, 28, 14, 0, 65, 68, 3, 30, 15, 0, 66, 68, 3, 32, 16, 0, 67, 63, 1, 0, 0, 0, 67, 64, 1, 0, 0, 0, 67, 65, 1, 0, 0, 0, 67, 66, 1, 0, 0, 0, 68, 3, 1, 0, 0, 0, 69, 73, 5, 1, 0, 0, 70, 74, 3, 6, 3, 0, 71, 74, 3, 8, 4, 0, 72, 74, 3, 10, 5, 0, 73, 70, 1, 0, 0, 0, 73, 71, 1, 0, 0, 0, 73, 72, 1, 0, 0, 0, 74, 5, 1, 0, 0, 0, 75, 76, 5, 2, 0, 0, 76, 77, 3, 50, 25, 0, 77, 78, 5, 4, 0, 0, 78, 79, 3, 48, 24, 0, 79, 80, 5, 43, 0, 0, 80, 7, 1, 0, 0, 0, 81, 82, 5, 3, 0, 0, 82, 83, 3, 50, 25, 0, 83, 84, 5, 40, 0, 0, 84, 89, 3, 36, 18, 0, 85, 86, 5, 42, 0, 0, 86, 88, 3, 36, 18, 0, 87, 85, 1, 0, 0, 0, 88, 91, 1, 0, 0, 0, 89, 87, 1, 0, 0, 0, 89, 90, 1, 0, 0, 0, 90, 92, 1, 0, 0, 0, 91, 89, 1, 0, 0, 0, 92, 93, 5, 41, 0, 0, 93, 94, 5, 43, 0, 0, 94, 9, 1, 0, 0, 0, 95, 102, 3, 12, 6, 0, 96, 102, 3, 14, 7, 0, 97, 102, 3, 16, 8, 0, 98, 102, 3, 18, 9, 0, 99, 102, 3, 24, 12, 0, 100, 102, 3, 22, 11, 0, 101, 95, 1, 0, 0, 0, 101, 96, 1, 0, 0, 0, 101, 97, 1, 0, 0, 0, 101, 98, 1, 0, 0, 0, 101, 99, 1, 0, 0, 0, 101, 100, 1, 0, 0, 0, 102, 11, 1, 0, 0, 0, 103, 104, 5, 15, 0, 0, 104, 105, 5, 14, 0, 0, 105, 108, 3, 50, 25, 0, 106, 107, 5, 17, 0, 0, 107, 109, 3, 52, 26, 0, 108, 106, 1, 0, 0, 0, 108, 109, 1, 0, 0, 0, 109, 110, 1, 0, 0, 0, 110, 111, 5, 40, 0, 0, 111, 112, 5, 18, 0, 0, 112, 113, 3, 52, 26, 0, 113, 114, 5, 41, 0, 0, 114, 115, 5, 43, 0, 0, 115, 13, 1, 0, 0, 0, 116, 117, 5, 16, 0, 0, 117, 118, 5, 14, 0, 0, 118, 121, 3, 50, 25, 0, 119, 120, 5, 17, 0, 0, 120, 122, 3, 52, 26, 0, 121, 119, 1, 0, 0, 0, 121, 122, 1, 0, 0, 0, 122, 123, 1, 0, 0, 0, 123, 124, 5, 40, 0, 0, 124, 126, 3, 50, 25, 0, 125, 127, 5, 20, 0, 0, 126, 125, 1, 0, 0, 0, 126, 127, 1, 0, 0, 0, 127, 128, 1, 0, 0, 0, 128, 129, 5, 42, 0, 0, 129, 130, 5, 21, 0, 0, 130, 131, 3, 54, 27, 0, 131, 132, 5, 42, 0, 0, 132, 133, 5, 22, 0, 0, 133, 134, 3, 54, 27, 0, 134, 135, 5, 42, 0, 0, 135, 136, 5, 23, 0, 0, 136, 137, 3, 56, 28, 0, 137, 138, 5, 42, 0, 0, 138, 139, 5, 24, 0, 0, 139, 140, 3, 56, 28, 0, 140, 141, 5, 41, 0, 0, 141, 142, 5, 43, 0, 0, 142, 15, 1, 0, 0, 0, 143, 144, 5, 25, 0, 0, 144, 145, 5, 26, 0, 0, 145, 146, 3, 50, 25, 0, 146, 147, 5, 40, 0, 0, 147, 148, 5, 19, 0, 0, 148, 149, 3, 52, 26, 0, 149, 150, 5, 41, 0, 0, 150, 151, 5, 43, 0, 0, 151, 17, 1, 0, 0, 0, 152, 153, 5, 25, 0, 0, 153, 154, 5, 14, 0, 0, 154, 157, 3, 50, 25, 0, 155, 156, 5, 17, 0, 0, 156, 158, 3, 52, 26, 0, 157, 155, 1, 0, 0, 0, 157, 158, 1, 0, 0, 0, 158, 159, 1, 0, 0, 0, 159, 160, 5, 40, 0, 0, 160, 165, 3, 20, 10, 0, 161, 162, 5, 42, 0, 0, 162, 164, 3, 20, 10, 0, 163, 161, 1, 0, 0, 0, 164, 167, 1, 0, 0, 0, 165, 163, 1, 0, 0, 0, 165, 166, 1, 0, 0, 0, 166, 168, 1, 0, 0, 0, 167, 165, 1, 0, 0, 0, 168, 169, 5, 41, 0, 0, 169, 170, 5, 43, 0, 0, 170, 19, 1, 0, 0, 0, 171, 172, 3, 50, 25, 0, 172, 173, 3, 50, 25, 0, 173, 21, 1, 0, 0, 0, 174, 175, 5, 29, 0, 0, 175, 176, 3, 24, 12, 0, 176, 23, 1, 0, 0, 0, 177, 178, 5, 30, 0, 0, 178, 181, 3, 50, 25, 0, 179, 180, 5, 17, 0, 0, 180, 182, 3, 52, 26, 0, 181, 179, 1, 0, 0, 0, 181, 182, 1, 0, 0, 0, 182, 183, 1, 0, 0, 0, 183, 184, 5, 40, 0, 0, 184, 189, 3, 26, 13, 0, 185, 186, 5, 42, 0, 0, 186, 188, 3, 26, 13, 0, 187, 185, 1, 0, 0, 0, 188, 191, 1, 0, 0, 0, 189, 187, 1, 0, 0, 0, 189, 190, 1, 0, 0, 0, 190, 192, 1, 0, 0, 0, 191, 189, 1, 0, 0, 0, 192, 193, 5, 41, 0, 0, 193, 194, 5, 43, 0, 0, 194, 25, 1, 0, 0, 0, 195, 197, 3, 50, 25, 0, 196, 198, 5, 27, 0, 0, 197, 196, 1, 0, 0, 0, 197, 198, 1, 0, 0, 0, 198, 200, 1, 0, 0, 0, 199, 201, 5, 28, 0, 0, 200, 199, 1, 0, 0, 0, 200, 201, 1, 0, 0, 0, 201, 27, 1, 0, 0, 0, 202, 203, 5, 5, 0, 0, 203, 204, 5, 2, 0, 0, 204, 205, 3, 50, 25, 0, 205, 206, 5, 43, 0, 0, 206, 29, 1, 0, 0, 0, 207, 208, 5, 6, 0, 0, 208, 209, 5, 2, 0, 0, 209, 210, 3, 50, 25, 0, 210, 211, 5, 43, 0, 0, 211, 31, 1, 0, 0, 0, 212, 213, 5, 31, 0, 0, 213, 214, 5, 32, 0, 0, 214, 215, 5, 40, 0, 0, 215, 220, 3, 34, 17, 0, 216, 217, 5, 42, 0, 0, 217, 219, 3, 34, 17, 0, 218, 216, 1, 0, 0, 0, 219, 222, 1, 0, 0, 0, 220, 218, 1, 0, 0, 0, 220, 221, 1, 0, 0, 0, 221, 223, 1, 0, 0, 0, 222, 220, 1, 0, 0, 0, 223, 224, 5, 41, 0, 0, 224, 225, 5, 43, 0, 0, 225, 33, 1, 0, 0, 0, 226, 227, 3, 52, 26, 0, 227, 228, 3, 52, 26, 0, 228, 35, 1, 0, 0, 0, 229, 232, 3, 38, 19, 0, 230, 232, 3, 40, 20, 0, 231, 229, 1, 0, 0, 0, 231, 230, 1, 0, 0, 0, 232, 37, 1, 0, 0, 0, 233, 234, 3, 50, 25, 0, 234, 238, 5, 37, 0, 0, 235, 237, 7, 0, 0, 0, 236, 235, 1, 0, 0, 0, 237, 240, 1, 0, 0, 0, 238, 236, 1, 0, 0, 0, 238, 239, 1, 0, 0, 0, 239, 39, 1, 0, 0, 0, 240, 238, 1, 0, 0, 0, 241, 244, 3, 44, 22, 0, 242, 244, 3, 42, 21, 0, 243, 241, 1, 0, 0, 0, 243, 242, 1, 0, 0, 0, 244, 41, 1, 0, 0, 0, 245, 246, 3, 50, 25, 0, 246, 247, 3, 50, 25, 0, 247, 248, 5, 8, 0, 0, 248, 249, 5, 13, 0, 0, 249, 250, 3, 50, 25, 0, 250, 43, 1, 0, 0, 0, 251, 252, 3, 50, 25, 0, 252, 253, 3, 50, 25, 0, 253, 254, 5, 8, 0, 0, 254, 255, 5, 40, 0, 0, 255, 256, 3, 46, 23, 0, 256, 257, 5, 42, 0, 0, 257, 258, 3, 46, 23, 0, 258, 260, 5, 41, 0, 0, 259, 261, 5, 12, 0, 0, 260, 259, 1, 0, 0, 0, 260, 261, 1, 0, 0, 0, 261, 45, 1, 0, 0, 0, 262, 263, 7, 1, 0, 0, 263, 47, 1, 0, 0, 0, 264, 265, 5, 45, 0, 0, 265, 49, 1, 0, 0, 0, 266, 267, 5, 49, 0, 0, 267, 51, 1, 0, 0, 0, 268, 269, 5, 50, 0, 0, 269, 53, 1, 0, 0, 0, 270, 271, 5, 44, 0, 0, 271, 55, 1, 0, 0, 0, 272, 273, 5, 46, 0, 0, 273, 57, 1, 0, 0, 0, 19, 61, 67, 73, 89, 101, 108, 121, 126, 157, 165, 181, 189, 197, 200, 220, 231, 238, 243, 260]
+token literal names:
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+'0..1'
+'1..1'
+'0..*'
+'1..*'
+null
+'#'
+'.'
+'('
+')'
+','
+';'
+null
+null
+null
+null
+null
+null
+null
+token symbolic names:
+null
+CREATE_SYMBOL
+GIS_SYMBOL
+ENTITY_SYMBOL
+USING_SYMBOL
+USE_SYMBOL
+GENERATE_SYMBOL
+IDENTIFIER_SYMBOL
+RELATIONSHIP_SYMBOL
+DISPLAYSTRING_SYMBOL
+REQUIRED_SYMBOL
+UNIQUE_SYMBOL
+BIDIRECTIONAL_SYMBOL
+MAPPEDBY_SYMBOL
+LAYER_SYMBOL
+TILE_SYMBOL
+GEOJSON_SYMBOL
+GEOMETRY_TYPE_SYMBOL
+AS_SYMBOL
+URL_SYMBOL
+SLD_SYMBOL
+EDITABLE_SYMBOL
+FILL_COLOR_SYMBOL
+STROKE_COLOR_SYMBOL
+FILL_OPACITY_SYMBOL
+STROKE_OPACITY_SYMBOL
+WMS_SYMBOL
+STYLE_SYMBOL
+IS_BASE_LAYER_SYMBOL
+HIDDEN_SYMBOL
+SORTABLE_SYMBOL
+MAP_SYMBOL
+SET_SYMBOL
+DEPLOYMENT_SYMBOL
+ZERO_ONE_SYMBOL
+ONE_ONE_SYMBOL
+ZERO_MANY_SYMBOL
+ONE_MANY_SYMBOL
+TYPE
+POUND_SYMBOL
+DOT_SYMBOL
+OPAR_SYMBOL
+CPAR_SYMBOL
+COMMA_SYMBOL
+SCOL_SYMBOL
+HEX_COLOR
+INT_NUMBER
+FLOAT_NUMBER
+COMMENT
+WHITESPACE
+IDENTIFIER
+QUOTED_TEXT
+rule names:
+parse
+sentence
+createStatement
+createGIS
+createEntity
+createLayer
+createTileLayer
+createGeoJSONLayer
+sldCustomBody
+createWmsStyle
+createWmsLayer
+wmsSubLayer
+createSortableMap
+createMap
+mapLayer
+useGIS
+generateGIS
+setDeployment
+deploymentProperty
+property
+propertyDefinition
+relationshipDefinition
+mappedRelationshipDefinition
+ownedRelationshipDefinition
+cardinality
+srid
+identifier
+text
+hexColor
+floatNumber
+intNumber
+atn:
+[4, 1, 51, 327, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 1, 0, 4, 0, 64, 8, 0, 11, 0, 12, 0, 65, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 72, 8, 1, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 78, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 5, 4, 92, 8, 4, 10, 4, 12, 4, 95, 9, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 106, 8, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 113, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 126, 8, 7, 1, 7, 1, 7, 1, 7, 3, 7, 131, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 152, 8, 8, 1, 8, 3, 8, 155, 8, 8, 1, 8, 3, 8, 158, 8, 8, 1, 8, 3, 8, 161, 8, 8, 1, 8, 3, 8, 164, 8, 8, 1, 8, 3, 8, 167, 8, 8, 1, 8, 3, 8, 170, 8, 8, 1, 8, 1, 8, 3, 8, 174, 8, 8, 1, 8, 3, 8, 177, 8, 8, 1, 8, 3, 8, 180, 8, 8, 1, 8, 1, 8, 3, 8, 184, 8, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 192, 8, 9, 1, 9, 3, 9, 195, 8, 9, 1, 9, 3, 9, 198, 8, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 3, 10, 208, 8, 10, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 214, 8, 10, 10, 10, 12, 10, 217, 9, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 232, 8, 13, 1, 13, 1, 13, 1, 13, 1, 13, 5, 13, 238, 8, 13, 10, 13, 12, 13, 241, 9, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 3, 14, 248, 8, 14, 1, 14, 3, 14, 251, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 5, 17, 269, 8, 17, 10, 17, 12, 17, 272, 9, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 282, 8, 19, 1, 20, 1, 20, 1, 20, 5, 20, 287, 8, 20, 10, 20, 12, 20, 290, 9, 20, 1, 21, 1, 21, 3, 21, 294, 8, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 3, 23, 311, 8, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 0, 0, 31, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 0, 2, 2, 0, 7, 7, 9, 11, 1, 0, 34, 37, 337, 0, 63, 1, 0, 0, 0, 2, 71, 1, 0, 0, 0, 4, 73, 1, 0, 0, 0, 6, 79, 1, 0, 0, 0, 8, 85, 1, 0, 0, 0, 10, 105, 1, 0, 0, 0, 12, 107, 1, 0, 0, 0, 14, 120, 1, 0, 0, 0, 16, 147, 1, 0, 0, 0, 18, 185, 1, 0, 0, 0, 20, 202, 1, 0, 0, 0, 22, 221, 1, 0, 0, 0, 24, 224, 1, 0, 0, 0, 26, 227, 1, 0, 0, 0, 28, 245, 1, 0, 0, 0, 30, 252, 1, 0, 0, 0, 32, 257, 1, 0, 0, 0, 34, 262, 1, 0, 0, 0, 36, 276, 1, 0, 0, 0, 38, 281, 1, 0, 0, 0, 40, 283, 1, 0, 0, 0, 42, 293, 1, 0, 0, 0, 44, 295, 1, 0, 0, 0, 46, 301, 1, 0, 0, 0, 48, 312, 1, 0, 0, 0, 50, 314, 1, 0, 0, 0, 52, 316, 1, 0, 0, 0, 54, 318, 1, 0, 0, 0, 56, 320, 1, 0, 0, 0, 58, 322, 1, 0, 0, 0, 60, 324, 1, 0, 0, 0, 62, 64, 3, 2, 1, 0, 63, 62, 1, 0, 0, 0, 64, 65, 1, 0, 0, 0, 65, 63, 1, 0, 0, 0, 65, 66, 1, 0, 0, 0, 66, 1, 1, 0, 0, 0, 67, 72, 3, 4, 2, 0, 68, 72, 3, 30, 15, 0, 69, 72, 3, 32, 16, 0, 70, 72, 3, 34, 17, 0, 71, 67, 1, 0, 0, 0, 71, 68, 1, 0, 0, 0, 71, 69, 1, 0, 0, 0, 71, 70, 1, 0, 0, 0, 72, 3, 1, 0, 0, 0, 73, 77, 5, 1, 0, 0, 74, 78, 3, 6, 3, 0, 75, 78, 3, 8, 4, 0, 76, 78, 3, 10, 5, 0, 77, 74, 1, 0, 0, 0, 77, 75, 1, 0, 0, 0, 77, 76, 1, 0, 0, 0, 78, 5, 1, 0, 0, 0, 79, 80, 5, 2, 0, 0, 80, 81, 3, 52, 26, 0, 81, 82, 5, 4, 0, 0, 82, 83, 3, 50, 25, 0, 83, 84, 5, 44, 0, 0, 84, 7, 1, 0, 0, 0, 85, 86, 5, 3, 0, 0, 86, 87, 3, 52, 26, 0, 87, 88, 5, 41, 0, 0, 88, 93, 3, 38, 19, 0, 89, 90, 5, 43, 0, 0, 90, 92, 3, 38, 19, 0, 91, 89, 1, 0, 0, 0, 92, 95, 1, 0, 0, 0, 93, 91, 1, 0, 0, 0, 93, 94, 1, 0, 0, 0, 94, 96, 1, 0, 0, 0, 95, 93, 1, 0, 0, 0, 96, 97, 5, 42, 0, 0, 97, 98, 5, 44, 0, 0, 98, 9, 1, 0, 0, 0, 99, 106, 3, 12, 6, 0, 100, 106, 3, 14, 7, 0, 101, 106, 3, 18, 9, 0, 102, 106, 3, 20, 10, 0, 103, 106, 3, 26, 13, 0, 104, 106, 3, 24, 12, 0, 105, 99, 1, 0, 0, 0, 105, 100, 1, 0, 0, 0, 105, 101, 1, 0, 0, 0, 105, 102, 1, 0, 0, 0, 105, 103, 1, 0, 0, 0, 105, 104, 1, 0, 0, 0, 106, 11, 1, 0, 0, 0, 107, 108, 5, 15, 0, 0, 108, 109, 5, 14, 0, 0, 109, 112, 3, 52, 26, 0, 110, 111, 5, 18, 0, 0, 111, 113, 3, 54, 27, 0, 112, 110, 1, 0, 0, 0, 112, 113, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 115, 5, 41, 0, 0, 115, 116, 5, 19, 0, 0, 116, 117, 3, 54, 27, 0, 117, 118, 5, 42, 0, 0, 118, 119, 5, 44, 0, 0, 119, 13, 1, 0, 0, 0, 120, 121, 5, 16, 0, 0, 121, 122, 5, 14, 0, 0, 122, 125, 3, 52, 26, 0, 123, 124, 5, 18, 0, 0, 124, 126, 3, 54, 27, 0, 125, 123, 1, 0, 0, 0, 125, 126, 1, 0, 0, 0, 126, 127, 1, 0, 0, 0, 127, 128, 5, 41, 0, 0, 128, 130, 3, 52, 26, 0, 129, 131, 5, 21, 0, 0, 130, 129, 1, 0, 0, 0, 130, 131, 1, 0, 0, 0, 131, 132, 1, 0, 0, 0, 132, 133, 5, 43, 0, 0, 133, 134, 5, 22, 0, 0, 134, 135, 3, 56, 28, 0, 135, 136, 5, 43, 0, 0, 136, 137, 5, 23, 0, 0, 137, 138, 3, 56, 28, 0, 138, 139, 5, 43, 0, 0, 139, 140, 5, 24, 0, 0, 140, 141, 3, 58, 29, 0, 141, 142, 5, 43, 0, 0, 142, 143, 5, 25, 0, 0, 143, 144, 3, 58, 29, 0, 144, 145, 5, 42, 0, 0, 145, 146, 5, 44, 0, 0, 146, 15, 1, 0, 0, 0, 147, 148, 5, 17, 0, 0, 148, 149, 5, 38, 0, 0, 149, 151, 5, 43, 0, 0, 150, 152, 5, 22, 0, 0, 151, 150, 1, 0, 0, 0, 151, 152, 1, 0, 0, 0, 152, 154, 1, 0, 0, 0, 153, 155, 3, 56, 28, 0, 154, 153, 1, 0, 0, 0, 154, 155, 1, 0, 0, 0, 155, 157, 1, 0, 0, 0, 156, 158, 5, 43, 0, 0, 157, 156, 1, 0, 0, 0, 157, 158, 1, 0, 0, 0, 158, 160, 1, 0, 0, 0, 159, 161, 5, 23, 0, 0, 160, 159, 1, 0, 0, 0, 160, 161, 1, 0, 0, 0, 161, 163, 1, 0, 0, 0, 162, 164, 3, 56, 28, 0, 163, 162, 1, 0, 0, 0, 163, 164, 1, 0, 0, 0, 164, 166, 1, 0, 0, 0, 165, 167, 5, 43, 0, 0, 166, 165, 1, 0, 0, 0, 166, 167, 1, 0, 0, 0, 167, 169, 1, 0, 0, 0, 168, 170, 5, 24, 0, 0, 169, 168, 1, 0, 0, 0, 169, 170, 1, 0, 0, 0, 170, 173, 1, 0, 0, 0, 171, 174, 3, 58, 29, 0, 172, 174, 3, 60, 30, 0, 173, 171, 1, 0, 0, 0, 173, 172, 1, 0, 0, 0, 173, 174, 1, 0, 0, 0, 174, 176, 1, 0, 0, 0, 175, 177, 5, 43, 0, 0, 176, 175, 1, 0, 0, 0, 176, 177, 1, 0, 0, 0, 177, 179, 1, 0, 0, 0, 178, 180, 5, 25, 0, 0, 179, 178, 1, 0, 0, 0, 179, 180, 1, 0, 0, 0, 180, 183, 1, 0, 0, 0, 181, 184, 3, 58, 29, 0, 182, 184, 3, 60, 30, 0, 183, 181, 1, 0, 0, 0, 183, 182, 1, 0, 0, 0, 183, 184, 1, 0, 0, 0, 184, 17, 1, 0, 0, 0, 185, 186, 5, 26, 0, 0, 186, 187, 5, 27, 0, 0, 187, 188, 3, 52, 26, 0, 188, 191, 5, 41, 0, 0, 189, 190, 5, 20, 0, 0, 190, 192, 3, 54, 27, 0, 191, 189, 1, 0, 0, 0, 191, 192, 1, 0, 0, 0, 192, 194, 1, 0, 0, 0, 193, 195, 5, 43, 0, 0, 194, 193, 1, 0, 0, 0, 194, 195, 1, 0, 0, 0, 195, 197, 1, 0, 0, 0, 196, 198, 3, 16, 8, 0, 197, 196, 1, 0, 0, 0, 197, 198, 1, 0, 0, 0, 198, 199, 1, 0, 0, 0, 199, 200, 5, 42, 0, 0, 200, 201, 5, 44, 0, 0, 201, 19, 1, 0, 0, 0, 202, 203, 5, 26, 0, 0, 203, 204, 5, 14, 0, 0, 204, 207, 3, 52, 26, 0, 205, 206, 5, 18, 0, 0, 206, 208, 3, 54, 27, 0, 207, 205, 1, 0, 0, 0, 207, 208, 1, 0, 0, 0, 208, 209, 1, 0, 0, 0, 209, 210, 5, 41, 0, 0, 210, 215, 3, 22, 11, 0, 211, 212, 5, 43, 0, 0, 212, 214, 3, 22, 11, 0, 213, 211, 1, 0, 0, 0, 214, 217, 1, 0, 0, 0, 215, 213, 1, 0, 0, 0, 215, 216, 1, 0, 0, 0, 216, 218, 1, 0, 0, 0, 217, 215, 1, 0, 0, 0, 218, 219, 5, 42, 0, 0, 219, 220, 5, 44, 0, 0, 220, 21, 1, 0, 0, 0, 221, 222, 3, 52, 26, 0, 222, 223, 3, 52, 26, 0, 223, 23, 1, 0, 0, 0, 224, 225, 5, 30, 0, 0, 225, 226, 3, 26, 13, 0, 226, 25, 1, 0, 0, 0, 227, 228, 5, 31, 0, 0, 228, 231, 3, 52, 26, 0, 229, 230, 5, 18, 0, 0, 230, 232, 3, 54, 27, 0, 231, 229, 1, 0, 0, 0, 231, 232, 1, 0, 0, 0, 232, 233, 1, 0, 0, 0, 233, 234, 5, 41, 0, 0, 234, 239, 3, 28, 14, 0, 235, 236, 5, 43, 0, 0, 236, 238, 3, 28, 14, 0, 237, 235, 1, 0, 0, 0, 238, 241, 1, 0, 0, 0, 239, 237, 1, 0, 0, 0, 239, 240, 1, 0, 0, 0, 240, 242, 1, 0, 0, 0, 241, 239, 1, 0, 0, 0, 242, 243, 5, 42, 0, 0, 243, 244, 5, 44, 0, 0, 244, 27, 1, 0, 0, 0, 245, 247, 3, 52, 26, 0, 246, 248, 5, 28, 0, 0, 247, 246, 1, 0, 0, 0, 247, 248, 1, 0, 0, 0, 248, 250, 1, 0, 0, 0, 249, 251, 5, 29, 0, 0, 250, 249, 1, 0, 0, 0, 250, 251, 1, 0, 0, 0, 251, 29, 1, 0, 0, 0, 252, 253, 5, 5, 0, 0, 253, 254, 5, 2, 0, 0, 254, 255, 3, 52, 26, 0, 255, 256, 5, 44, 0, 0, 256, 31, 1, 0, 0, 0, 257, 258, 5, 6, 0, 0, 258, 259, 5, 2, 0, 0, 259, 260, 3, 52, 26, 0, 260, 261, 5, 44, 0, 0, 261, 33, 1, 0, 0, 0, 262, 263, 5, 32, 0, 0, 263, 264, 5, 33, 0, 0, 264, 265, 5, 41, 0, 0, 265, 270, 3, 36, 18, 0, 266, 267, 5, 43, 0, 0, 267, 269, 3, 36, 18, 0, 268, 266, 1, 0, 0, 0, 269, 272, 1, 0, 0, 0, 270, 268, 1, 0, 0, 0, 270, 271, 1, 0, 0, 0, 271, 273, 1, 0, 0, 0, 272, 270, 1, 0, 0, 0, 273, 274, 5, 42, 0, 0, 274, 275, 5, 44, 0, 0, 275, 35, 1, 0, 0, 0, 276, 277, 3, 54, 27, 0, 277, 278, 3, 54, 27, 0, 278, 37, 1, 0, 0, 0, 279, 282, 3, 40, 20, 0, 280, 282, 3, 42, 21, 0, 281, 279, 1, 0, 0, 0, 281, 280, 1, 0, 0, 0, 282, 39, 1, 0, 0, 0, 283, 284, 3, 52, 26, 0, 284, 288, 5, 38, 0, 0, 285, 287, 7, 0, 0, 0, 286, 285, 1, 0, 0, 0, 287, 290, 1, 0, 0, 0, 288, 286, 1, 0, 0, 0, 288, 289, 1, 0, 0, 0, 289, 41, 1, 0, 0, 0, 290, 288, 1, 0, 0, 0, 291, 294, 3, 46, 23, 0, 292, 294, 3, 44, 22, 0, 293, 291, 1, 0, 0, 0, 293, 292, 1, 0, 0, 0, 294, 43, 1, 0, 0, 0, 295, 296, 3, 52, 26, 0, 296, 297, 3, 52, 26, 0, 297, 298, 5, 8, 0, 0, 298, 299, 5, 13, 0, 0, 299, 300, 3, 52, 26, 0, 300, 45, 1, 0, 0, 0, 301, 302, 3, 52, 26, 0, 302, 303, 3, 52, 26, 0, 303, 304, 5, 8, 0, 0, 304, 305, 5, 41, 0, 0, 305, 306, 3, 48, 24, 0, 306, 307, 5, 43, 0, 0, 307, 308, 3, 48, 24, 0, 308, 310, 5, 42, 0, 0, 309, 311, 5, 12, 0, 0, 310, 309, 1, 0, 0, 0, 310, 311, 1, 0, 0, 0, 311, 47, 1, 0, 0, 0, 312, 313, 7, 1, 0, 0, 313, 49, 1, 0, 0, 0, 314, 315, 5, 46, 0, 0, 315, 51, 1, 0, 0, 0, 316, 317, 5, 50, 0, 0, 317, 53, 1, 0, 0, 0, 318, 319, 5, 51, 0, 0, 319, 55, 1, 0, 0, 0, 320, 321, 5, 45, 0, 0, 321, 57, 1, 0, 0, 0, 322, 323, 5, 47, 0, 0, 323, 59, 1, 0, 0, 0, 324, 325, 5, 46, 0, 0, 325, 61, 1, 0, 0, 0, 33, 65, 71, 77, 93, 105, 112, 125, 130, 151, 154, 157, 160, 163, 166, 169, 173, 176, 179, 183, 191, 194, 197, 207, 215, 231, 239, 247, 250, 270, 281, 288, 293, 310]

package/src/lib/GISGrammar.tokens CHANGED Viewed

@@ -14,47 +14,48 @@ MAPPEDBY_SYMBOL=13
 LAYER_SYMBOL=14
 TILE_SYMBOL=15
 GEOJSON_SYMBOL=16
-AS_SYMBOL=17
-URL_SYMBOL=18
-SLD_SYMBOL=19
-EDITABLE_SYMBOL=20
-FILL_COLOR_SYMBOL=21
-STROKE_COLOR_SYMBOL=22
-FILL_OPACITY_SYMBOL=23
-STROKE_OPACITY_SYMBOL=24
-WMS_SYMBOL=25
-STYLE_SYMBOL=26
-IS_BASE_LAYER_SYMBOL=27
-HIDDEN_SYMBOL=28
-SORTABLE_SYMBOL=29
-MAP_SYMBOL=30
-SET_SYMBOL=31
-DEPLOYMENT_SYMBOL=32
-ZERO_ONE_SYMBOL=33
-ONE_ONE_SYMBOL=34
-ZERO_MANY_SYMBOL=35
-ONE_MANY_SYMBOL=36
-TYPE=37
-POUND_SYMBOL=38
-DOT_SYMBOL=39
-OPAR_SYMBOL=40
-CPAR_SYMBOL=41
-COMMA_SYMBOL=42
-SCOL_SYMBOL=43
-HEX_COLOR=44
-INT_NUMBER=45
-FLOAT_NUMBER=46
-COMMENT=47
-WHITESPACE=48
-IDENTIFIER=49
-QUOTED_TEXT=50
-'0..1'=33
-'1..1'=34
-'0..*'=35
-'1..*'=36
-'#'=38
-'.'=39
-'('=40
-')'=41
-','=42
-';'=43
+GEOMETRY_TYPE_SYMBOL=17
+AS_SYMBOL=18
+URL_SYMBOL=19
+SLD_SYMBOL=20
+EDITABLE_SYMBOL=21
+FILL_COLOR_SYMBOL=22
+STROKE_COLOR_SYMBOL=23
+FILL_OPACITY_SYMBOL=24
+STROKE_OPACITY_SYMBOL=25
+WMS_SYMBOL=26
+STYLE_SYMBOL=27
+IS_BASE_LAYER_SYMBOL=28
+HIDDEN_SYMBOL=29
+SORTABLE_SYMBOL=30
+MAP_SYMBOL=31
+SET_SYMBOL=32
+DEPLOYMENT_SYMBOL=33
+ZERO_ONE_SYMBOL=34
+ONE_ONE_SYMBOL=35
+ZERO_MANY_SYMBOL=36
+ONE_MANY_SYMBOL=37
+TYPE=38
+POUND_SYMBOL=39
+DOT_SYMBOL=40
+OPAR_SYMBOL=41
+CPAR_SYMBOL=42
+COMMA_SYMBOL=43
+SCOL_SYMBOL=44
+HEX_COLOR=45
+INT_NUMBER=46
+FLOAT_NUMBER=47
+COMMENT=48
+WHITESPACE=49
+IDENTIFIER=50
+QUOTED_TEXT=51
+'0..1'=34
+'1..1'=35
+'0..*'=36
+'1..*'=37
+'#'=39
+'.'=40
+'('=41
+')'=42
+','=43
+';'=44