@@ -328,7 +328,7 @@ function legacyFilterTests(createFilterExpr) {
328328 expect ( f ( { zoom : 0 } , { properties : { } } ) ) . toBe ( false ) ;
329329 } ) ;
330330
331- test ( '==, $type' , ( ) => {
331+ test ( '==, $type, Point ' , ( ) => {
332332 const fPoint = createFilterExpr ( [ '==' , '$type' , 'Point' ] ) . filter ;
333333 expect ( fPoint ( { zoom : 0 } , { type : 0 } ) ) . toBe ( false ) ; // Unknown geometry-type
334334 expect ( fPoint ( { zoom : 0 } , { type : 1 , geometry : [ [ { x : 0 , y : 0 } ] ] } ) ) . toBe ( true ) ; // Point geometry-type
@@ -347,7 +347,9 @@ function legacyFilterTests(createFilterExpr) {
347347 expect ( fPoint ( { zoom : 0 } , { type : 'MultiLineString' } ) ) . toBe ( false ) ;
348348 expect ( fPoint ( { zoom : 0 } , { type : 'Polygon' } ) ) . toBe ( false ) ;
349349 expect ( fPoint ( { zoom : 0 } , { type : 'MultiPolygon' } ) ) . toBe ( false ) ;
350+ } ) ;
350351
352+ test ( '==, $type, LineString' , ( ) => {
351353 const fLineString = createFilterExpr ( [ '==' , '$type' , 'LineString' ] ) . filter ;
352354 expect ( fLineString ( { zoom : 0 } , { type : 0 } ) ) . toBe ( false ) ; // Unknown geometry-type
353355 expect ( fLineString ( { zoom : 0 } , { type : 1 , geometry : [ [ { x : 0 , y : 0 } ] ] } ) ) . toBe ( false ) ; // Point geometry-type
@@ -366,7 +368,9 @@ function legacyFilterTests(createFilterExpr) {
366368 expect ( fLineString ( { zoom : 0 } , { type : 'MultiLineString' } ) ) . toBe ( true ) ;
367369 expect ( fLineString ( { zoom : 0 } , { type : 'Polygon' } ) ) . toBe ( false ) ;
368370 expect ( fLineString ( { zoom : 0 } , { type : 'MultiPolygon' } ) ) . toBe ( false ) ;
371+ } ) ;
369372
373+ test ( '==, $type, Polygon' , ( ) => {
370374 const fPolygon = createFilterExpr ( [ '==' , '$type' , 'Polygon' ] ) . filter ;
371375 expect ( fPolygon ( { zoom : 0 } , { type : 0 } ) ) . toBe ( false ) ; // Unknown geometry-type
372376 expect ( fPolygon ( { zoom : 0 } , { type : 1 , geometry : [ [ { x : 0 , y : 0 } ] ] } ) ) . toBe ( false ) ; // Point geometry-type
@@ -385,7 +389,9 @@ function legacyFilterTests(createFilterExpr) {
385389 expect ( fPolygon ( { zoom : 0 } , { type : 'MultiLineString' } ) ) . toBe ( false ) ;
386390 expect ( fPolygon ( { zoom : 0 } , { type : 'Polygon' } ) ) . toBe ( true ) ;
387391 expect ( fPolygon ( { zoom : 0 } , { type : 'MultiPolygon' } ) ) . toBe ( true ) ;
392+ } ) ;
388393
394+ test ( '==, $type, Unknown' , ( ) => {
389395 const fUnknown = createFilterExpr ( [ '==' , '$type' , 'Unknown' ] ) . filter ;
390396 expect ( fUnknown ( { zoom : 0 } , { type : 0 } ) ) . toBe ( true ) ; // Unknown geometry-type
391397 expect ( fUnknown ( { zoom : 0 } , { type : 1 , geometry : [ [ { x : 0 , y : 0 } ] ] } ) ) . toBe ( false ) ; // Point geometry-type
@@ -445,7 +451,7 @@ function legacyFilterTests(createFilterExpr) {
445451 expect ( f ( { zoom : 0 } , { properties : { } } ) ) . toBe ( true ) ;
446452 } ) ;
447453
448- test ( '!=, $type' , ( ) => {
454+ test ( '!=, $type, Point ' , ( ) => {
449455 const fPoint = createFilterExpr ( [ '!=' , '$type' , 'Point' ] ) . filter ;
450456 expect ( fPoint ( { zoom : 0 } , { type : 0 } ) ) . toBe ( true ) ; // Unknown geometry-type
451457 expect ( fPoint ( { zoom : 0 } , { type : 1 , geometry : [ [ { x : 0 , y : 0 } ] ] } ) ) . toBe ( false ) ; // Point geometry-type
@@ -464,7 +470,9 @@ function legacyFilterTests(createFilterExpr) {
464470 expect ( fPoint ( { zoom : 0 } , { type : 'MultiLineString' } ) ) . toBe ( true ) ;
465471 expect ( fPoint ( { zoom : 0 } , { type : 'Polygon' } ) ) . toBe ( true ) ;
466472 expect ( fPoint ( { zoom : 0 } , { type : 'MultiPolygon' } ) ) . toBe ( true ) ;
473+ } ) ;
467474
475+ test ( '!=, $type, LineString' , ( ) => {
468476 const fLineString = createFilterExpr ( [ '!=' , '$type' , 'LineString' ] ) . filter ;
469477 expect ( fLineString ( { zoom : 0 } , { type : 0 } ) ) . toBe ( true ) ; // Unknown geometry-type
470478 expect ( fLineString ( { zoom : 0 } , { type : 1 , geometry : [ [ { x : 0 , y : 0 } ] ] } ) ) . toBe ( true ) ; // Point geometry-type
@@ -483,7 +491,9 @@ function legacyFilterTests(createFilterExpr) {
483491 expect ( fLineString ( { zoom : 0 } , { type : 'MultiLineString' } ) ) . toBe ( false ) ;
484492 expect ( fLineString ( { zoom : 0 } , { type : 'Polygon' } ) ) . toBe ( true ) ;
485493 expect ( fLineString ( { zoom : 0 } , { type : 'MultiPolygon' } ) ) . toBe ( true ) ;
494+ } ) ;
486495
496+ test ( '!=, $type, Polygon' , ( ) => {
487497 const fPolygon = createFilterExpr ( [ '!=' , '$type' , 'Polygon' ] ) . filter ;
488498 expect ( fPolygon ( { zoom : 0 } , { type : 0 } ) ) . toBe ( true ) ; // Unknown geometry-type
489499 expect ( fPolygon ( { zoom : 0 } , { type : 1 , geometry : [ [ { x : 0 , y : 0 } ] ] } ) ) . toBe ( true ) ; // Point geometry-type
@@ -502,7 +512,9 @@ function legacyFilterTests(createFilterExpr) {
502512 expect ( fPolygon ( { zoom : 0 } , { type : 'MultiLineString' } ) ) . toBe ( true ) ;
503513 expect ( fPolygon ( { zoom : 0 } , { type : 'Polygon' } ) ) . toBe ( false ) ;
504514 expect ( fPolygon ( { zoom : 0 } , { type : 'MultiPolygon' } ) ) . toBe ( false ) ;
515+ } ) ;
505516
517+ test ( '!=, $type, Unknown' , ( ) => {
506518 const fUnknown = createFilterExpr ( [ '!=' , '$type' , 'Unknown' ] ) . filter ;
507519 expect ( fUnknown ( { zoom : 0 } , { type : 0 } ) ) . toBe ( false ) ; // Unknown geometry-type
508520 expect ( fUnknown ( { zoom : 0 } , { type : 1 , geometry : [ [ { x : 0 , y : 0 } ] ] } ) ) . toBe ( true ) ; // Point geometry-type
0 commit comments