@mapbox/mapbox-gl-style-spec 13.24.0-alpha.6 → 13.24.0-beta.1

package/dist/index.es.js

@@ -95,7 +95,7 @@ var $root = {
 	},
 	projection: {
 		type: "projection",
-		doc: "The projection the map should be rendered in. Supported projections are Albers, Equal Earth, Equirectangular (WGS84), Lambert conformal conic, Mercator, Natural Earth, Globe, and Winkel Tripel. Terrain, fog, sky and CustomLayerInterface are not supported for projections other than mercator.",
+		doc: "The projection the map should be rendered in. Supported projections are Albers, Equal Earth, Equirectangular (WGS84), Lambert conformal conic, Mercator, Natural Earth, and Winkel Tripel. Terrain, fog, sky and CustomLayerInterface are not supported for projections other than mercator.",
 		example: {
 			name: "albers",
 			center: [
@@ -3916,9 +3916,6 @@ var projection = {
 			},
 			winkelTripel: {
 				doc: "A Winkel Tripel projection."
-			},
-			globe: {
-				doc: "A globe projection."
 			}
 		},
 		"default": "mercator",
@@ -9272,7 +9269,7 @@ class EvaluationContext {
         this.featureDistanceData = null;
     }
     id() {
-        return this.feature && 'id' in this.feature ? this.feature.id : null;
+        return this.feature && 'id' in this.feature && this.feature.id ? this.feature.id : null;
     }
     geometryType() {
         return this.feature ? typeof this.feature.type === 'number' ? geometryTypes[this.feature.type] : this.feature.type : null;
@@ -9625,6 +9622,8 @@ function getTilePoints(geometry, pointBBox, polyBBox, canonical) {
         canonical.y * EXTENT
     ];
     const tilePoints = [];
+    if (!geometry)
+        return tilePoints;
     for (const points of geometry) {
         for (const point of points) {
             const p = [
@@ -9644,6 +9643,8 @@ function getTileLines(geometry, lineBBox, polyBBox, canonical) {
         canonical.y * EXTENT
     ];
     const tileLines = [];
+    if (!geometry)
+        return tileLines;
     for (const line of geometry) {
         const tileLine = [];
         for (const point of line) {
@@ -9680,6 +9681,9 @@ function pointsWithinPolygons(ctx, polygonGeometry) {
         -Infinity
     ];
     const canonical = ctx.canonicalID();
+    if (!canonical) {
+        return false;
+    }
     if (polygonGeometry.type === 'Polygon') {
         const tilePolygon = getTilePolygon(polygonGeometry.coordinates, polyBBox, canonical);
         const tilePoints = getTilePoints(ctx.geometry(), pointBBox, polyBBox, canonical);
@@ -9716,6 +9720,9 @@ function linesWithinPolygons(ctx, polygonGeometry) {
         -Infinity
     ];
     const canonical = ctx.canonicalID();
+    if (!canonical) {
+        return false;
+    }
     if (polygonGeometry.type === 'Polygon') {
         const tilePolygon = getTilePolygon(polygonGeometry.coordinates, polyBBox, canonical);
         const tileLines = getTileLines(ctx.geometry(), lineBBox, polyBBox, canonical);
@@ -12137,7 +12144,7 @@ class StyleExpression {
         this._evaluator.globals = globals;
         this._evaluator.feature = feature;
         this._evaluator.featureState = featureState;
-        this._evaluator.canonical = canonical;
+        this._evaluator.canonical = canonical || null;
         this._evaluator.availableImages = availableImages || null;
         this._evaluator.formattedSection = formattedSection;
         this._evaluator.featureTileCoord = featureTileCoord || null;
@@ -12148,7 +12155,7 @@ class StyleExpression {
         this._evaluator.globals = globals;
         this._evaluator.feature = feature || null;
         this._evaluator.featureState = featureState || null;
-        this._evaluator.canonical = canonical;
+        this._evaluator.canonical = canonical || null;
         this._evaluator.availableImages = availableImages || null;
         this._evaluator.formattedSection = formattedSection || null;
         this._evaluator.featureTileCoord = featureTileCoord || null;
@@ -13695,7 +13702,8 @@ function validateObject(options) {
             validateElement = elementValidators['*'];
         } else if (elementSpecs['*']) {
             validateElement = validate;
-        } else {
+        }
+        if (!validateElement) {
             errors.push(new ValidationError(key, object[objectKey], `unknown property "${ objectKey }"`));
             continue;
         }
@@ -13740,7 +13748,8 @@ function validateArray(options) {
         'type': arraySpec.value,
         'values': arraySpec.values,
         'minimum': arraySpec.minimum,
-        'maximum': arraySpec.maximum
+        'maximum': arraySpec.maximum,
+        function: undefined
     };
     if (styleSpec.$version < 7) {
         arrayElementSpec.function = arraySpec.function;
@@ -13877,11 +13886,15 @@ function validateFunction(options) {
             if (value[0].value === undefined) {
                 return [new ValidationError(key, value, 'object stop key must have value')];
             }
-            if (previousStopDomainZoom && previousStopDomainZoom > unbundle(value[0].zoom)) {
+            const nextStopDomainZoom = unbundle(value[0].zoom);
+            if (typeof nextStopDomainZoom !== 'number') {
+                return [new ValidationError(key, value[0].zoom, 'stop zoom values must be numbers')];
+            }
+            if (previousStopDomainZoom && previousStopDomainZoom > nextStopDomainZoom) {
                 return [new ValidationError(key, value[0].zoom, 'stop zoom values must appear in ascending order')];
             }
-            if (unbundle(value[0].zoom) !== previousStopDomainZoom) {
-                previousStopDomainZoom = unbundle(value[0].zoom);
+            if (nextStopDomainZoom !== previousStopDomainZoom) {
+                previousStopDomainZoom = nextStopDomainZoom;
                 previousStopDomainValue = undefined;
                 stopDomainValues = {};
             }
@@ -13925,7 +13938,7 @@ function validateFunction(options) {
         } else if (type !== stopKeyType) {
             return [new ValidationError(options.key, reportValue, `${ type } stop domain type must match previous stop domain type ${ stopKeyType }`)];
         }
-        if (type !== 'number' && type !== 'string' && type !== 'boolean') {
+        if (type !== 'number' && type !== 'string' && type !== 'boolean' && typeof value !== 'number' && typeof value !== 'string' && typeof value !== 'boolean') {
             return [new ValidationError(options.key, reportValue, 'stop domain value must be a number, string, or boolean')];
         }
         if (type !== 'number' && functionType !== 'categorical') {
@@ -13935,10 +13948,10 @@ function validateFunction(options) {
             }
             return [new ValidationError(options.key, reportValue, message)];
         }
-        if (functionType === 'categorical' && type === 'number' && (!isFinite(value) || Math.floor(value) !== value)) {
-            return [new ValidationError(options.key, reportValue, `integer expected, found ${ value }`)];
+        if (functionType === 'categorical' && type === 'number' && (typeof value !== 'number' || !isFinite(value) || Math.floor(value) !== value)) {
+            return [new ValidationError(options.key, reportValue, `integer expected, found ${ String(value) }`)];
         }
-        if (functionType !== 'categorical' && type === 'number' && previousStopDomainValue !== undefined && value < previousStopDomainValue) {
+        if (functionType !== 'categorical' && type === 'number' && typeof value === 'number' && typeof previousStopDomainValue === 'number' && previousStopDomainValue !== undefined && value < previousStopDomainValue) {
             return [new ValidationError(options.key, reportValue, 'stop domain values must appear in ascending order')];
         } else {
             previousStopDomainValue = value;
@@ -13998,8 +14011,10 @@ function disallowedFilterParameters(e, options) {
         'pitch',
         'distance-from-center'
     ]);
-    for (const param of options.valueSpec.expression.parameters) {
-        disallowedParameters.delete(param);
+    if (options.valueSpec && options.valueSpec.expression) {
+        for (const param of options.valueSpec.expression.parameters) {
+            disallowedParameters.delete(param);
+        }
     }
     if (disallowedParameters.size === 0) {
         return [];
@@ -14058,10 +14073,10 @@ function validateEnum(options) {
 
 function validateFilter(options) {
     if (isExpressionFilter(deepUnbundle(options.value))) {
-        const layerType = deepUnbundle(options.layerType);
+        const layerType = options.layerType || 'fill';
         return validateExpression(extend({}, options, {
             expressionContext: 'filter',
-            valueSpec: options.styleSpec[`filter_${ layerType || 'fill' }`]
+            valueSpec: options.styleSpec[`filter_${ layerType }`]
         }));
     } else {
         return validateNonExpressionFilter(options);
@@ -14249,7 +14264,8 @@ function validateLayer(options) {
                 parent = layer;
         });
         if (!parent) {
-            errors.push(new ValidationError(key, layer.ref, `ref layer "${ ref }" not found`));
+            if (typeof ref === 'string')
+                errors.push(new ValidationError(key, layer.ref, `ref layer "${ ref }" not found`));
         } else if (parent.ref) {
             errors.push(new ValidationError(key, layer.ref, 'ref cannot reference another ref layer'));
         } else {
@@ -14305,6 +14321,7 @@ function validateLayer(options) {
                     layer,
                     key: options.key,
                     value: options.value,
+                    valueSpec: {},
                     style: options.style,
                     styleSpec: options.styleSpec,
                     objectElementValidators: {
@@ -14319,6 +14336,7 @@ function validateLayer(options) {
                     layer,
                     key: options.key,
                     value: options.value,
+                    valueSpec: {},
                     style: options.style,
                     styleSpec: options.styleSpec,
                     objectElementValidators: {
@@ -14537,7 +14555,7 @@ function validateTerrain(options) {
         if (!source) {
             errors.push(new ValidationError(key, terrain.source, `source "${ terrain.source }" not found`));
         } else if (sourceType !== 'raster-dem') {
-            errors.push(new ValidationError(key, terrain.source, `terrain cannot be used with a source of type ${ sourceType }, it only be used with a "raster-dem" source type`));
+            errors.push(new ValidationError(key, terrain.source, `terrain cannot be used with a source of type ${ String(sourceType) }, it only be used with a "raster-dem" source type`));
         }
     }
     return errors;
@@ -14686,7 +14704,7 @@ function validateStyle(style, styleSpec = v8) {
     return sortErrors(errors);
 }
 function sortErrors(errors) {
-    return errors.slice().sort((a, b) => a.line - b.line);
+    return errors.slice().sort((a, b) => a.line && b.line ? a.line - b.line : 0);
 }
 
 /* parser generated by jison 0.4.15 */