@mapbox/mapbox-gl-style-spec 14.8.0 → 14.9.0

package/types.ts

@@ -88,8 +88,20 @@ export type StyleSpecification = {
     "lights"?: Array<LightsSpecification>,
     "terrain"?: TerrainSpecification | null | undefined,
     "fog"?: FogSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
+    "snow"?: SnowSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
+    "rain"?: RainSpecification,
     "camera"?: CameraSpecification,
     "color-theme"?: ColorThemeSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
+    "indoor"?: IndoorSpecification,
     "imports"?: Array<ImportSpecification>,
     "schema"?: SchemaSpecification,
     "sources": SourcesSpecification,
@@ -119,6 +131,7 @@ export type LightSpecification = {
     "position-transition"?: TransitionSpecification,
     "color"?: PropertyValueSpecification<ColorSpecification>,
     "color-transition"?: TransitionSpecification,
+    "color-use-theme"?: PropertyValueSpecification<string>,
     "intensity"?: PropertyValueSpecification<number>,
     "intensity-transition"?: TransitionSpecification
 }
@@ -134,10 +147,13 @@ export type FogSpecification = {
     "range-transition"?: TransitionSpecification,
     "color"?: PropertyValueSpecification<ColorSpecification>,
     "color-transition"?: TransitionSpecification,
+    "color-use-theme"?: PropertyValueSpecification<string>,
     "high-color"?: PropertyValueSpecification<ColorSpecification>,
     "high-color-transition"?: TransitionSpecification,
+    "high-color-use-theme"?: PropertyValueSpecification<string>,
     "space-color"?: PropertyValueSpecification<ColorSpecification>,
     "space-color-transition"?: TransitionSpecification,
+    "space-color-use-theme"?: PropertyValueSpecification<string>,
     "horizon-blend"?: PropertyValueSpecification<number>,
     "horizon-blend-transition"?: TransitionSpecification,
     "star-intensity"?: PropertyValueSpecification<number>,
@@ -146,6 +162,54 @@ export type FogSpecification = {
     "vertical-range-transition"?: TransitionSpecification
 }
 
+export type SnowSpecification = {
+    "density"?: PropertyValueSpecification<number>,
+    "density-transition"?: TransitionSpecification,
+    "intensity"?: PropertyValueSpecification<number>,
+    "intensity-transition"?: TransitionSpecification,
+    "color"?: PropertyValueSpecification<ColorSpecification>,
+    "color-transition"?: TransitionSpecification,
+    "color-use-theme"?: PropertyValueSpecification<string>,
+    "opacity"?: PropertyValueSpecification<number>,
+    "opacity-transition"?: TransitionSpecification,
+    "vignette"?: PropertyValueSpecification<number>,
+    "vignette-transition"?: TransitionSpecification,
+    "vignette-color"?: PropertyValueSpecification<ColorSpecification>,
+    "vignette-color-transition"?: TransitionSpecification,
+    "vignette-color-use-theme"?: PropertyValueSpecification<string>,
+    "center-thinning"?: PropertyValueSpecification<number>,
+    "center-thinning-transition"?: TransitionSpecification,
+    "direction"?: PropertyValueSpecification<[number, number]>,
+    "direction-transition"?: TransitionSpecification,
+    "flake-size"?: PropertyValueSpecification<number>,
+    "flake-size-transition"?: TransitionSpecification
+}
+
+export type RainSpecification = {
+    "density"?: PropertyValueSpecification<number>,
+    "density-transition"?: TransitionSpecification,
+    "intensity"?: PropertyValueSpecification<number>,
+    "intensity-transition"?: TransitionSpecification,
+    "color"?: PropertyValueSpecification<ColorSpecification>,
+    "color-transition"?: TransitionSpecification,
+    "color-use-theme"?: PropertyValueSpecification<string>,
+    "opacity"?: PropertyValueSpecification<number>,
+    "opacity-transition"?: TransitionSpecification,
+    "vignette"?: PropertyValueSpecification<number>,
+    "vignette-transition"?: TransitionSpecification,
+    "vignette-color"?: PropertyValueSpecification<ColorSpecification>,
+    "vignette-color-transition"?: TransitionSpecification,
+    "vignette-color-use-theme"?: PropertyValueSpecification<string>,
+    "center-thinning"?: PropertyValueSpecification<number>,
+    "center-thinning-transition"?: TransitionSpecification,
+    "direction"?: PropertyValueSpecification<[number, number]>,
+    "direction-transition"?: TransitionSpecification,
+    "droplet-size"?: PropertyValueSpecification<[number, number]>,
+    "droplet-size-transition"?: TransitionSpecification,
+    "distortion-strength"?: PropertyValueSpecification<number>,
+    "distortion-strength-transition"?: TransitionSpecification
+}
+
 export type CameraSpecification = {
     "camera-projection"?: PropertyValueSpecification<"perspective" | "orthographic">,
     "camera-projection-transition"?: TransitionSpecification
@@ -165,7 +229,19 @@ export type ImportSpecification = {
     "id": string,
     "url": string,
     "config"?: ConfigSpecification,
-    "data"?: StyleSpecification
+    "data"?: StyleSpecification,
+    "color-theme"?: ColorThemeSpecification | null | undefined
+}
+
+export type IndoorSpecification = {
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
+    "floorplanFeaturesetId"?: ExpressionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
+    "buildingFeaturesetId"?: ExpressionSpecification
 }
 
 export type ConfigSpecification = {
@@ -333,6 +409,7 @@ export type AmbientLightSpecification = {
     "properties"?: {
         "color"?: PropertyValueSpecification<ColorSpecification>,
         "color-transition"?: TransitionSpecification,
+        "color-use-theme"?: PropertyValueSpecification<string>,
         "intensity"?: PropertyValueSpecification<number>,
         "intensity-transition"?: TransitionSpecification
     },
@@ -346,9 +423,14 @@ export type DirectionalLightSpecification = {
         "direction-transition"?: TransitionSpecification,
         "color"?: PropertyValueSpecification<ColorSpecification>,
         "color-transition"?: TransitionSpecification,
+        "color-use-theme"?: PropertyValueSpecification<string>,
         "intensity"?: PropertyValueSpecification<number>,
         "intensity-transition"?: TransitionSpecification,
         "cast-shadows"?: boolean,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "shadow-quality"?: PropertyValueSpecification<number>,
         "shadow-intensity"?: PropertyValueSpecification<number>,
         "shadow-intensity-transition"?: TransitionSpecification
     },
@@ -363,6 +445,7 @@ export type FlatLightSpecification = {
         "position-transition"?: TransitionSpecification,
         "color"?: PropertyValueSpecification<ColorSpecification>,
         "color-transition"?: TransitionSpecification,
+        "color-use-theme"?: PropertyValueSpecification<string>,
         "intensity"?: PropertyValueSpecification<number>,
         "intensity-transition"?: TransitionSpecification
     },
@@ -398,8 +481,10 @@ export type FillLayerSpecification = {
         "fill-opacity-transition"?: TransitionSpecification,
         "fill-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "fill-color-transition"?: TransitionSpecification,
+        "fill-color-use-theme"?: PropertyValueSpecification<string>,
         "fill-outline-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "fill-outline-color-transition"?: TransitionSpecification,
+        "fill-outline-color-use-theme"?: PropertyValueSpecification<string>,
         "fill-translate"?: PropertyValueSpecification<[number, number]>,
         "fill-translate-transition"?: TransitionSpecification,
         "fill-translate-anchor"?: PropertyValueSpecification<"map" | "viewport">,
@@ -449,13 +534,18 @@ export type LineLayerSpecification = {
          * @experimental This property is experimental and subject to change in future versions.
          */
         "line-cross-slope"?: ExpressionSpecification,
-        "visibility"?: "visible" | "none" | ExpressionSpecification
+        "visibility"?: "visible" | "none" | ExpressionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "line-width-unit"?: PropertyValueSpecification<"pixels" | "meters">
     },
     "paint"?: {
         "line-opacity"?: DataDrivenPropertyValueSpecification<number>,
         "line-opacity-transition"?: TransitionSpecification,
         "line-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "line-color-transition"?: TransitionSpecification,
+        "line-color-use-theme"?: PropertyValueSpecification<string>,
         "line-translate"?: PropertyValueSpecification<[number, number]>,
         "line-translate-transition"?: TransitionSpecification,
         "line-translate-anchor"?: PropertyValueSpecification<"map" | "viewport">,
@@ -470,6 +560,7 @@ export type LineLayerSpecification = {
         "line-dasharray"?: DataDrivenPropertyValueSpecification<Array<number>>,
         "line-pattern"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>,
         "line-gradient"?: ExpressionSpecification,
+        "line-gradient-use-theme"?: PropertyValueSpecification<string>,
         "line-trim-offset"?: [number, number],
         /**
          * @experimental This property is experimental and subject to change in future versions.
@@ -477,12 +568,14 @@ export type LineLayerSpecification = {
         "line-trim-fade-range"?: PropertyValueSpecification<[number, number]>,
         "line-trim-color"?: PropertyValueSpecification<ColorSpecification>,
         "line-trim-color-transition"?: TransitionSpecification,
+        "line-trim-color-use-theme"?: PropertyValueSpecification<string>,
         "line-emissive-strength"?: PropertyValueSpecification<number>,
         "line-emissive-strength-transition"?: TransitionSpecification,
         "line-border-width"?: DataDrivenPropertyValueSpecification<number>,
         "line-border-width-transition"?: TransitionSpecification,
         "line-border-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "line-border-color-transition"?: TransitionSpecification,
+        "line-border-color-use-theme"?: PropertyValueSpecification<string>,
         "line-occlusion-opacity"?: PropertyValueSpecification<number>,
         "line-occlusion-opacity-transition"?: TransitionSpecification
     }
@@ -576,8 +669,10 @@ export type SymbolLayerSpecification = {
         "text-emissive-strength-transition"?: TransitionSpecification,
         "icon-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "icon-color-transition"?: TransitionSpecification,
+        "icon-color-use-theme"?: PropertyValueSpecification<string>,
         "icon-halo-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "icon-halo-color-transition"?: TransitionSpecification,
+        "icon-halo-color-use-theme"?: PropertyValueSpecification<string>,
         "icon-halo-width"?: DataDrivenPropertyValueSpecification<number>,
         "icon-halo-width-transition"?: TransitionSpecification,
         "icon-halo-blur"?: DataDrivenPropertyValueSpecification<number>,
@@ -593,8 +688,10 @@ export type SymbolLayerSpecification = {
         "text-occlusion-opacity-transition"?: TransitionSpecification,
         "text-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "text-color-transition"?: TransitionSpecification,
+        "text-color-use-theme"?: PropertyValueSpecification<string>,
         "text-halo-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "text-halo-color-transition"?: TransitionSpecification,
+        "text-halo-color-use-theme"?: PropertyValueSpecification<string>,
         "text-halo-width"?: DataDrivenPropertyValueSpecification<number>,
         "text-halo-width-transition"?: TransitionSpecification,
         "text-halo-blur"?: DataDrivenPropertyValueSpecification<number>,
@@ -640,6 +737,7 @@ export type CircleLayerSpecification = {
         "circle-radius-transition"?: TransitionSpecification,
         "circle-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "circle-color-transition"?: TransitionSpecification,
+        "circle-color-use-theme"?: PropertyValueSpecification<string>,
         "circle-blur"?: DataDrivenPropertyValueSpecification<number>,
         "circle-blur-transition"?: TransitionSpecification,
         "circle-opacity"?: DataDrivenPropertyValueSpecification<number>,
@@ -653,6 +751,7 @@ export type CircleLayerSpecification = {
         "circle-stroke-width-transition"?: TransitionSpecification,
         "circle-stroke-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "circle-stroke-color-transition"?: TransitionSpecification,
+        "circle-stroke-color-use-theme"?: PropertyValueSpecification<string>,
         "circle-stroke-opacity"?: DataDrivenPropertyValueSpecification<number>,
         "circle-stroke-opacity-transition"?: TransitionSpecification,
         "circle-emissive-strength"?: PropertyValueSpecification<number>,
@@ -690,6 +789,7 @@ export type HeatmapLayerSpecification = {
         "heatmap-intensity"?: PropertyValueSpecification<number>,
         "heatmap-intensity-transition"?: TransitionSpecification,
         "heatmap-color"?: ExpressionSpecification,
+        "heatmap-color-use-theme"?: PropertyValueSpecification<string>,
         "heatmap-opacity"?: PropertyValueSpecification<number>,
         "heatmap-opacity-transition"?: TransitionSpecification
     }
@@ -727,6 +827,7 @@ export type FillExtrusionLayerSpecification = {
         "fill-extrusion-opacity-transition"?: TransitionSpecification,
         "fill-extrusion-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "fill-extrusion-color-transition"?: TransitionSpecification,
+        "fill-extrusion-color-use-theme"?: PropertyValueSpecification<string>,
         "fill-extrusion-translate"?: PropertyValueSpecification<[number, number]>,
         "fill-extrusion-translate-transition"?: TransitionSpecification,
         "fill-extrusion-translate-anchor"?: PropertyValueSpecification<"map" | "viewport">,
@@ -756,6 +857,7 @@ export type FillExtrusionLayerSpecification = {
         "fill-extrusion-ambient-occlusion-ground-attenuation-transition"?: TransitionSpecification,
         "fill-extrusion-flood-light-color"?: PropertyValueSpecification<ColorSpecification>,
         "fill-extrusion-flood-light-color-transition"?: TransitionSpecification,
+        "fill-extrusion-flood-light-color-use-theme"?: PropertyValueSpecification<string>,
         "fill-extrusion-flood-light-intensity"?: PropertyValueSpecification<number>,
         "fill-extrusion-flood-light-intensity-transition"?: TransitionSpecification,
         "fill-extrusion-flood-light-wall-radius"?: DataDrivenPropertyValueSpecification<number>,
@@ -806,6 +908,7 @@ export type RasterLayerSpecification = {
         "raster-opacity"?: PropertyValueSpecification<number>,
         "raster-opacity-transition"?: TransitionSpecification,
         "raster-color"?: ExpressionSpecification,
+        "raster-color-use-theme"?: PropertyValueSpecification<string>,
         "raster-color-mix"?: PropertyValueSpecification<[number, number, number, number]>,
         "raster-color-mix-transition"?: TransitionSpecification,
         "raster-color-range"?: PropertyValueSpecification<[number, number]>,
@@ -860,6 +963,7 @@ export type RasterParticleLayerSpecification = {
         "raster-particle-array-band"?: string,
         "raster-particle-count"?: number,
         "raster-particle-color"?: ExpressionSpecification,
+        "raster-particle-color-use-theme"?: PropertyValueSpecification<string>,
         "raster-particle-max-speed"?: number,
         "raster-particle-speed-factor"?: PropertyValueSpecification<number>,
         "raster-particle-speed-factor-transition"?: TransitionSpecification,
@@ -901,10 +1005,13 @@ export type HillshadeLayerSpecification = {
         "hillshade-exaggeration-transition"?: TransitionSpecification,
         "hillshade-shadow-color"?: PropertyValueSpecification<ColorSpecification>,
         "hillshade-shadow-color-transition"?: TransitionSpecification,
+        "hillshade-shadow-color-use-theme"?: PropertyValueSpecification<string>,
         "hillshade-highlight-color"?: PropertyValueSpecification<ColorSpecification>,
         "hillshade-highlight-color-transition"?: TransitionSpecification,
+        "hillshade-highlight-color-use-theme"?: PropertyValueSpecification<string>,
         "hillshade-accent-color"?: PropertyValueSpecification<ColorSpecification>,
         "hillshade-accent-color-transition"?: TransitionSpecification,
+        "hillshade-accent-color-use-theme"?: PropertyValueSpecification<string>,
         "hillshade-emissive-strength"?: PropertyValueSpecification<number>,
         "hillshade-emissive-strength-transition"?: TransitionSpecification
     }
@@ -935,7 +1042,7 @@ export type ModelLayerSpecification = {
         "model-id"?: DataDrivenPropertyValueSpecification<string>
     },
     "paint"?: {
-        "model-opacity"?: PropertyValueSpecification<number>,
+        "model-opacity"?: DataDrivenPropertyValueSpecification<number>,
         "model-opacity-transition"?: TransitionSpecification,
         "model-rotation"?: DataDrivenPropertyValueSpecification<[number, number, number]>,
         "model-rotation-transition"?: TransitionSpecification,
@@ -945,6 +1052,7 @@ export type ModelLayerSpecification = {
         "model-translation-transition"?: TransitionSpecification,
         "model-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "model-color-transition"?: TransitionSpecification,
+        "model-color-use-theme"?: PropertyValueSpecification<string>,
         "model-color-mix-intensity"?: DataDrivenPropertyValueSpecification<number>,
         "model-color-mix-intensity-transition"?: TransitionSpecification,
         "model-type"?: "common-3d" | "location-indicator",
@@ -987,9 +1095,13 @@ export type BackgroundLayerSpecification = {
         "visibility"?: "visible" | "none" | ExpressionSpecification
     },
     "paint"?: {
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "background-pitch-alignment"?: "map" | "viewport" | ExpressionSpecification,
         "background-color"?: PropertyValueSpecification<ColorSpecification>,
         "background-color-transition"?: TransitionSpecification,
+        "background-color-use-theme"?: PropertyValueSpecification<string>,
         "background-pattern"?: PropertyValueSpecification<ResolvedImageSpecification>,
         "background-opacity"?: PropertyValueSpecification<number>,
         "background-opacity-transition"?: TransitionSpecification,
@@ -1028,8 +1140,11 @@ export type SkyLayerSpecification = {
         "sky-gradient-center"?: PropertyValueSpecification<[number, number]>,
         "sky-gradient-radius"?: PropertyValueSpecification<number>,
         "sky-gradient"?: ExpressionSpecification,
+        "sky-gradient-use-theme"?: PropertyValueSpecification<string>,
         "sky-atmosphere-halo-color"?: ColorSpecification,
+        "sky-atmosphere-halo-color-use-theme"?: PropertyValueSpecification<string>,
         "sky-atmosphere-color"?: ColorSpecification,
+        "sky-atmosphere-color-use-theme"?: PropertyValueSpecification<string>,
         "sky-opacity"?: PropertyValueSpecification<number>,
         "sky-opacity-transition"?: TransitionSpecification
     }
@@ -1070,13 +1185,7 @@ export type ClipLayerSpecification = {
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
     "layout"?: {
-        /**
-         * @experimental This property is experimental and subject to change in future versions.
-         */
         "clip-layer-types"?: ExpressionSpecification,
-        /**
-         * @experimental This property is experimental and subject to change in future versions.
-         */
         "clip-layer-scope"?: ExpressionSpecification
     },
     "paint"?: never

package/util/color.ts

@@ -73,7 +73,7 @@ class Color {
      * var translucentGreen = new Color.parse('rgba(26, 207, 26, .73)');
      * translucentGreen.toString(); // = "rgba(26,207,26,0.73)"
      */
-    toString(): string {
+    toStringPremultipliedAlpha(): string {
         const [r, g, b, a] = this.a === 0 ? [0, 0, 0, 0] : [
             this.r * 255 / this.a,
             this.g * 255 / this.a,
@@ -83,10 +83,24 @@ class Color {
         return `rgba(${Math.round(r)},${Math.round(g)},${Math.round(b)},${a})`;
     }
 
+    toString(): string {
+        const [r, g, b, a] = [
+            this.r,
+            this.g,
+            this.b,
+            this.a
+        ];
+        return `rgba(${Math.round(r * 255)},${Math.round(g * 255)},${Math.round(b * 255)},${a})`;
+    }
+
     toRenderColor(lut: LUT | null): RenderColor {
         const {r, g, b, a} = this;
         return new RenderColor(lut, r, g, b, a);
     }
+
+    clone(): Color {
+        return new Color(this.r, this.g, this.b, this.a);
+    }
 }
 
 /**
@@ -179,6 +193,53 @@ export class RenderColor {
         ];
     }
 
+    /**
+     * Returns an HSLA array of values representing the color, unpremultiplied by A.
+     *
+     * @returns An array of HSLA color values.
+     */
+    toHslaArray(): [number, number, number, number] {
+        if (this.a === 0) {
+            return [0, 0, 0, 0];
+        }
+        const {r, g, b, a} = this;
+
+        const red = Math.min(Math.max(r / a, 0.0), 1.0);
+        const green = Math.min(Math.max(g / a, 0.0), 1.0);
+        const blue = Math.min(Math.max(b / a, 0.0), 1.0);
+
+        const min = Math.min(red, green, blue);
+        const max = Math.max(red, green, blue);
+
+        const l = (min + max) / 2;
+
+        if (min === max) {
+            return [0, 0, l * 100, a];
+        }
+
+        const delta = max - min;
+
+        const s = l > 0.5 ? delta / (2 - max - min) : delta / (max + min);
+
+        let h = 0;
+        if (max === red) {
+            h = (green - blue) / delta + (green < blue ? 6 : 0);
+        } else if (max === green) {
+            h = (blue - red) / delta + 2;
+        } else if (max === blue) {
+            h = (red - green) / delta + 4;
+        }
+
+        h *= 60;
+
+        return [
+            Math.min(Math.max(h, 0), 360),
+            Math.min(Math.max(s * 100, 0), 100),
+            Math.min(Math.max(l * 100, 0), 100),
+            a
+        ];
+    }
+
     /**
      * Returns a RGBA array of float values representing the color, unpremultiplied by A.
      *

package/validate/validate_fog.ts

@@ -21,8 +21,17 @@ export default function validateFog(options: ValidationOptions): Array<Validatio
 
     for (const key in fog) {
         const transitionMatch = key.match(/^(.*)-transition$/);
+        const useThemeMatch = key.match(/^(.*)-use-theme$/);
 
-        if (transitionMatch && fogSpec[transitionMatch[1]] && fogSpec[transitionMatch[1]].transition) {
+        if (useThemeMatch && fogSpec[useThemeMatch[1]]) {
+            errors = errors.concat(validate({
+                key,
+                value: fog[key],
+                valueSpec: {type:'string'},
+                style,
+                styleSpec
+            }));
+        } else if (transitionMatch && fogSpec[transitionMatch[1]] && fogSpec[transitionMatch[1]].transition) {
             errors = errors.concat(validate({
                 key,
                 value: fog[key],

package/validate/validate_function.ts

@@ -184,7 +184,7 @@ export default function validateFunction(options: ValidationOptions): any {
         }
 
         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)}`)];
+            return [new ValidationError(options.key, reportValue, `integer expected, found ${String(value as number)}`)];
         }
 
         if (functionType !== 'categorical' && type === 'number' && typeof value === 'number' && typeof previousStopDomainValue === 'number' && previousStopDomainValue !== undefined && value < previousStopDomainValue) {

package/validate/validate_light.ts

@@ -22,8 +22,17 @@ export default function validateLight(options: ValidationOptions): Array<Validat
 
     for (const key in light) {
         const transitionMatch = key.match(/^(.*)-transition$/);
+        const useThemeMatch = key.match(/^(.*)-use-theme$/);
 
-        if (transitionMatch && lightSpec[transitionMatch[1]] && lightSpec[transitionMatch[1]].transition) {
+        if (useThemeMatch && lightSpec[useThemeMatch[1]]) {
+            errors = errors.concat(validate({
+                key,
+                value: light[key],
+                valueSpec: {type:'string'},
+                style,
+                styleSpec
+            }));
+        } else if (transitionMatch && lightSpec[transitionMatch[1]] && lightSpec[transitionMatch[1]].transition) {
             errors = errors.concat(validate({
                 key,
                 value: light[key],

package/validate/validate_lights.ts

@@ -78,7 +78,17 @@ export default function validateLights(options: Options): Array<ValidationError>
             }
         } else {
             const transitionMatch = key.match(/^(.*)-transition$/);
-            if (transitionMatch && lightSpec[transitionMatch[1]] && lightSpec[transitionMatch[1]].transition) {
+            const useThemeMatch = key.match(/^(.*)-use-theme$/);
+
+            if (useThemeMatch && lightSpec[useThemeMatch[1]]) {
+                errors = errors.concat(validate({
+                    key,
+                    value: light[key],
+                    valueSpec: {type:'string'},
+                    style,
+                    styleSpec
+                }));
+            } else if (transitionMatch && lightSpec[transitionMatch[1]] && lightSpec[transitionMatch[1]].transition) {
                 errors = errors.concat(validate({
                     key,
                     value: light[key],

package/validate/validate_property.ts

@@ -26,6 +26,17 @@ export default function validateProperty(options: PropertyValidationOptions, pro
 
     if (!layerSpec) return [];
 
+    const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
+    if (propertyType === 'paint' && useThemeMatch && layerSpec[useThemeMatch[1]]) {
+        return validate({
+            key,
+            value,
+            valueSpec: {type:'string'},
+            style,
+            styleSpec
+        });
+    }
+
     const transitionMatch = propertyKey.match(/^(.*)-transition$/);
     if (propertyType === 'paint' && transitionMatch && layerSpec[transitionMatch[1]] && layerSpec[transitionMatch[1]].transition) {
         return validate({

package/validate/validate_rain.ts

@@ -0,0 +1,47 @@
+import {default as ValidationError, ValidationWarning} from '../error/validation_error';
+import validate from './validate';
+import getType from '../util/get_type';
+
+import type {ValidationOptions} from './validate';
+
+export default function validateRain(options: ValidationOptions): Array<ValidationError> {
+    const rain = options.value;
+    const style = options.style;
+    const styleSpec = options.styleSpec;
+    const rainSpec = styleSpec.rain;
+    let errors = [];
+
+    const rootType = getType(rain);
+    if (rain === undefined) {
+        return errors;
+    } else if (rootType !== 'object') {
+        errors = errors.concat([new ValidationError('rain', rain, `object expected, ${rootType} found`)]);
+        return errors;
+    }
+
+    for (const key in rain) {
+        const transitionMatch = key.match(/^(.*)-transition$/);
+
+        if (transitionMatch && rainSpec[transitionMatch[1]] && rainSpec[transitionMatch[1]].transition) {
+            errors = errors.concat(validate({
+                key,
+                value: rain[key],
+                valueSpec: styleSpec.transition,
+                style,
+                styleSpec
+            }));
+        } else if (rainSpec[key]) {
+            errors = errors.concat(validate({
+                key,
+                value: rain[key],
+                valueSpec: rainSpec[key],
+                style,
+                styleSpec
+            }));
+        } else {
+            errors = errors.concat([new ValidationWarning(key, rain[key], `unknown property "${key}"`)]);
+        }
+    }
+
+    return errors;
+}

package/validate/validate_snow.ts

@@ -0,0 +1,47 @@
+import {default as ValidationError, ValidationWarning} from '../error/validation_error';
+import validate from './validate';
+import getType from '../util/get_type';
+
+import type {ValidationOptions} from './validate';
+
+export default function validateSnow(options: ValidationOptions): Array<ValidationError> {
+    const snow = options.value;
+    const style = options.style;
+    const styleSpec = options.styleSpec;
+    const snowSpec = styleSpec.snow;
+    let errors = [];
+
+    const rootType = getType(snow);
+    if (snow === undefined) {
+        return errors;
+    } else if (rootType !== 'object') {
+        errors = errors.concat([new ValidationError('snow', snow, `object expected, ${rootType} found`)]);
+        return errors;
+    }
+
+    for (const key in snow) {
+        const transitionMatch = key.match(/^(.*)-transition$/);
+
+        if (transitionMatch && snowSpec[transitionMatch[1]] && snowSpec[transitionMatch[1]].transition) {
+            errors = errors.concat(validate({
+                key,
+                value: snow[key],
+                valueSpec: styleSpec.transition,
+                style,
+                styleSpec
+            }));
+        } else if (snowSpec[key]) {
+            errors = errors.concat(validate({
+                key,
+                value: snow[key],
+                valueSpec: snowSpec[key],
+                style,
+                styleSpec
+            }));
+        } else {
+            errors = errors.concat([new ValidationWarning(key, snow[key], `unknown property "${key}"`)]);
+        }
+    }
+
+    return errors;
+}

package/validate/validate_terrain.ts

@@ -25,8 +25,17 @@ export default function validateTerrain(options: ValidationOptions): Array<Valid
 
     for (const key in terrain) {
         const transitionMatch = key.match(/^(.*)-transition$/);
+        const useThemeMatch = key.match(/^(.*)-use-theme$/);
 
-        if (transitionMatch && terrainSpec[transitionMatch[1]] && terrainSpec[transitionMatch[1]].transition) {
+        if (useThemeMatch && terrainSpec[useThemeMatch[1]]) {
+            errors = errors.concat(validate({
+                key,
+                value: terrain[key],
+                valueSpec: {type:'string'},
+                style,
+                styleSpec
+            }));
+        } else if (transitionMatch && terrainSpec[transitionMatch[1]] && terrainSpec[transitionMatch[1]].transition) {
             errors = errors.concat(validate({
                 key,
                 value: terrain[key],
@@ -51,7 +60,7 @@ export default function validateTerrain(options: ValidationOptions): Array<Valid
         errors.push(new ValidationError(key, terrain, `terrain is missing required property "source"`));
     } else {
         const source = style.sources && style.sources[terrain.source];
-        const sourceType = source && unbundle(source.type);
+        const sourceType = source && unbundle(source.type) as string;
         if (!source) {
             errors.push(new ValidationError(key, terrain.source, `source "${terrain.source}" not found`));
         } else if (sourceType !== 'raster-dem') {