@mapbox/mapbox-gl-style-spec 14.0.0 → 14.1.0

package/types.js

@@ -68,7 +68,7 @@ export type StyleSpecification = {|
     "pitch"?: number,
     "light"?: LightSpecification,
     "lights"?: Array<LightsSpecification>,
-    "terrain"?: TerrainSpecification,
+    "terrain"?: ?TerrainSpecification,
     "fog"?: FogSpecification,
     "camera"?: CameraSpecification,
     "imports"?: Array<ImportSpecification>,
@@ -190,6 +190,19 @@ export type RasterDEMSourceSpecification = {
     [_: string]: mixed
 }
 
+export type Raster_arraySourceSpecification = {
+    "type": "raster-array",
+    "url"?: string,
+    "tiles"?: Array<string>,
+    "bounds"?: [number, number, number, number],
+    "minzoom"?: number,
+    "maxzoom"?: number,
+    "tileSize"?: number,
+    "attribution"?: string,
+    "rasterLayers"?: mixed,
+    [_: string]: mixed
+}
+
 export type GeoJSONSourceSpecification = {|
     "type": "geojson",
     "data"?: mixed,
@@ -231,6 +244,7 @@ export type SourceSpecification =
     | VectorSourceSpecification
     | RasterSourceSpecification
     | RasterDEMSourceSpecification
+    | Raster_arraySourceSpecification
     | GeoJSONSourceSpecification
     | VideoSourceSpecification
     | ImageSourceSpecification
@@ -410,7 +424,8 @@ export type SymbolLayerSpecification = {|
         "text-halo-width"?: DataDrivenPropertyValueSpecification<number>,
         "text-halo-blur"?: DataDrivenPropertyValueSpecification<number>,
         "text-translate"?: PropertyValueSpecification<[number, number]>,
-        "text-translate-anchor"?: PropertyValueSpecification<"map" | "viewport">
+        "text-translate-anchor"?: PropertyValueSpecification<"map" | "viewport">,
+        "icon-color-saturation"?: ExpressionSpecification
     |}
 |}
 
@@ -501,7 +516,8 @@ export type FillExtrusionLayerSpecification = {|
         "fill-extrusion-flood-light-ground-attenuation"?: PropertyValueSpecification<number>,
         "fill-extrusion-vertical-scale"?: PropertyValueSpecification<number>,
         "fill-extrusion-rounded-roof"?: PropertyValueSpecification<boolean>,
-        "fill-extrusion-cutoff-fade-range"?: ExpressionSpecification
+        "fill-extrusion-cutoff-fade-range"?: ExpressionSpecification,
+        "fill-extrusion-emissive-strength"?: PropertyValueSpecification<number>
     |}
 |}
 
@@ -529,7 +545,10 @@ export type RasterLayerSpecification = {|
         "raster-saturation"?: PropertyValueSpecification<number>,
         "raster-contrast"?: PropertyValueSpecification<number>,
         "raster-resampling"?: PropertyValueSpecification<"linear" | "nearest">,
-        "raster-fade-duration"?: PropertyValueSpecification<number>
+        "raster-fade-duration"?: PropertyValueSpecification<number>,
+        "raster-emissive-strength"?: PropertyValueSpecification<number>,
+        "raster-array-band"?: string,
+        "raster-elevation"?: PropertyValueSpecification<number>
     |}
 |}
 

package/validate/validate_property.js

@@ -6,7 +6,7 @@ import getType from '../util/get_type.js';
 import {isFunction} from '../function/index.js';
 import {unbundle, deepUnbundle} from '../util/unbundle_jsonlint.js';
 import {supportsLightExpression, supportsPropertyExpression, supportsZoomExpression} from '../util/properties.js';
-import {isGlobalPropertyConstant} from '../expression/is_constant.js';
+import {isGlobalPropertyConstant, isFeatureConstant, isStateConstant} from '../expression/is_constant.js';
 
 import type {ValidationOptions} from './validate.js';
 import {createPropertyExpression} from '../expression/index.js';
@@ -67,8 +67,11 @@ export default function validateProperty(options: PropertyValidationOptions, pro
             // Performance related style spec limitation: zoom and light expressions are not allowed for e.g. trees.
             const expression = createPropertyExpression(deepUnbundle(value), valueSpec);
             const expressionObj = (expression.value: any).expression || (expression.value: any)._styleExpression.expression;
+
             if (expressionObj && !isGlobalPropertyConstant(expressionObj, ['measure-light'])) {
-                errors.push(new ValidationError(key, value, `${propertyKey} does not support measure-light expressions when the model layer source is vector tile or GeoJSON.`));
+                if (propertyKey !== 'model-emissive-strength' || (!isFeatureConstant(expressionObj) || !isStateConstant(expressionObj))) {
+                    errors.push(new ValidationError(key, value, `${propertyKey} does not support measure-light expressions when the model layer source is vector tile or GeoJSON.`));
+                }
             }
         }
     }

package/validate/validate_source.js

@@ -26,20 +26,26 @@ export default function validateSource(options: ValidationOptions): Array<Valida
     }
 
     const type = unbundle(value.type);
-    let errors;
+    let errors = [];
+
+    if (['vector', 'raster', 'raster-dem'].includes(type)) {
+        if (!value.url && !value.tiles) {
+            errors.push(new ValidationError(key, value, 'Either "url" or "tiles" is required.'));
+        }
+    }
 
     switch (type) {
     case 'vector':
     case 'raster':
     case 'raster-dem':
-        errors = validateObject({
+        errors = errors.concat(validateObject({
             key,
             value,
             valueSpec: styleSpec[`source_${type.replace('-', '_')}`],
             style: options.style,
             styleSpec,
             objectElementValidators
-        });
+        }));
         return errors;
 
     case 'geojson':

package/validate/validate_terrain.js

@@ -18,6 +18,8 @@ export default function validateTerrain(options: ValidationOptions): Array<Valid
     const rootType = getType(terrain);
     if (terrain === undefined) {
         return errors;
+    } else if (rootType === 'null') {
+        return errors;
     } else if (rootType !== 'object') {
         errors = errors.concat([new ValidationError('terrain', terrain, `object expected, ${rootType} found`)]);
         return errors;