12 wildcard geometry and geometry array

SCHEMA.md

@@ -107,7 +107,7 @@ into this...
 
 | key              | value   | description                                                                                    |
 | ---------------- | :------ | :--------------------------------------------------------------------------------------------- |
-| geometry         | string  | geometry type MapCSS is intended to match                                                      |
+| geometry         | array   | geometry type MapCSS is intended to match                                                      |
 | equals           | object  | object with key/value pair MapCSS is intended to match                                         |
 | notEqual         | string  | object with key/value pair MapCSS is not intended to match                                     |
 | presence         | string  | tag key MapCSS is intended to match                                                            |

schema/primitives/feature.js

@@ -4,6 +4,6 @@ const Joi = require('joi');
 const GEOMETRY = new RegExp(require('../../source/classes/regexType/geometry/constants').GEOMETRY);
 
 module.exports = {
-    geometry: Joi.string().regex(GEOMETRY),
+    geometry: Joi.array().items(Joi.string().regex(GEOMETRY)),
     tags: Joi.object()
 };

schema/primitives/geometry.js

@@ -3,4 +3,4 @@
 const Joi = require('joi');
 const GEOMETRY_SCHEMA = new RegExp(require('../../source/classes/regexType/geometry/constants').GEOMETRY_SCHEMA);
 
-module.exports = { geometry: Joi.string().regex(GEOMETRY_SCHEMA) };
+module.exports = { geometry: Joi.array().items(Joi.string().regex(GEOMETRY_SCHEMA)) };

source/classes/regexType/geometry/constants.js

@@ -6,13 +6,15 @@ const _NODE = 'node';
 const _WAY = 'way';
 const _CLOSEDWAY = ':closed';
 const _CLOSEDWAY_FULL = 'closedway';
+const _WILDCARD = '\\*';
 
 exports.NODE = new RegExp(_NODE);
 exports.WAY = new RegExp(_WAY);
 exports.CLOSEDWAY = new RegExp(_CLOSEDWAY);
 exports.CLOSEDWAY_FULL = new RegExp(_CLOSEDWAY_FULL);
+exports.WILDCARD = new RegExp(_WILDCARD);
 
-exports.GEOMETRY_GROUPS = `${_NODE}|${_WAY}|${_CLOSEDWAY}`;
+exports.GEOMETRY_GROUPS = `${_NODE}|${_WAY}|${_CLOSEDWAY}|${_WILDCARD}`;
 
-exports.GEOMETRY = new RegExp(`^${_NODE}$|^${_WAY}$|^${_CLOSEDWAY}$`, 'i');
-exports.GEOMETRY_SCHEMA = new RegExp(`^${_NODE}$|^${_WAY}$|^${_CLOSEDWAY_FULL}$`, 'i');
+exports.GEOMETRY = new RegExp(`^${_NODE}$|^${_WAY}$|^${_CLOSEDWAY}$|^${_WILDCARD}$`, 'i');
+exports.GEOMETRY_SCHEMA = new RegExp(`^${_NODE}$|^${_WAY}$|^${_CLOSEDWAY_FULL}$|^${_WILDCARD}$`, 'i');

source/classes/regexType/geometry/index.js

@@ -14,7 +14,7 @@ class GeometryType extends RegexType {
         return geometryTypeFromSource(super.getMatches(source)[0]);
     }
     getPrimitive(source) {
-        return { geometry: this.getMatches(source) };
+        return { geometry: [this.getMatches(source)] };
     }
 }
 

test/classes/regexType/constants.js

@@ -11,7 +11,8 @@ const GEOMETRY_GROUPS = require('../../../source/classes/regexType/geometry/cons
 const NODE = require('../../../source/classes/regexType/geometry/constants').NODE;
 const WAY =  require('../../../source/classes/regexType/geometry/constants').WAY;
 const CLOSEDWAY =  require('../../../source/classes/regexType/geometry/constants').CLOSEDWAY;
-const GEOMS = [NODE, WAY, CLOSEDWAY];
+const WILDCARD =  require('../../../source/classes/regexType/geometry/constants').WILDCARD;
+const GEOMS = [NODE, WAY, CLOSEDWAY, WILDCARD];
 
 const GREATER_THAN = require('../../../source/classes/regexType/selector/constants').GREATER_THAN;
 const GREATER_THAN_EQUAL = require('../../../source/classes/regexType/selector/constants').GREATER_THAN_EQUAL;

test/helpers.js

@@ -31,6 +31,7 @@ describe('helpers', () => {
             expect(helpers.geometryTypeFromSource(':closed')).to.eql('closedway');
             expect(helpers.geometryTypeFromSource('node')).to.eql('node');
             expect(helpers.geometryTypeFromSource('way')).to.eql('way');
+            expect(helpers.geometryTypeFromSource('*')).to.eql('*');
         });
     });
 });

testData/test.mapcss

@@ -30,4 +30,7 @@ way[amenity=school]{
 }
 way[building][height=1] {
     throwError: "..."
+}
+*[amenity][!name] {
+    throwError: "name required on any amenity"
 }