Fix types and unit test (internal-1055)

Author: stepankuzmin

src/style-spec/types.js

@@ -424,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
     |}
 |}
 

src/style/terrain.js

@@ -5,8 +5,7 @@ import {Evented} from '../util/evented.js';
 import {Properties, Transitionable, Transitioning, PossiblyEvaluated, DataConstantProperty} from './properties.js';
 
 import EvaluationParameters from './evaluation_parameters.js';
-import type {Expression} from '../../src/style-spec/expression/expression.js';
-import type {TransitionParameters} from './properties.js';
+import type {ConfigOptions, TransitionParameters} from './properties.js';
 import type {TerrainSpecification} from '../style-spec/types.js';
 import {ZoomDependentExpression} from '../style-spec/expression/index.js';
 
@@ -32,7 +31,7 @@ class Terrain extends Evented {
     properties: PossiblyEvaluated<Props>;
     drapeRenderMode: number;
 
-    constructor(terrainOptions: TerrainSpecification, drapeRenderMode: number, scope: string, configOptions?: ?Map<string, Expression>) {
+    constructor(terrainOptions: TerrainSpecification, drapeRenderMode: number, scope: string, configOptions?: ?ConfigOptions) {
         super();
         this.scope = scope;
         this._transitionable = new Transitionable(properties, configOptions);
@@ -45,7 +44,7 @@ class Terrain extends Evented {
         return (this._transitionable.serialize(): any);
     }
 
-    set(terrain: TerrainSpecification, configOptions?: ?Map<string, Expression>) {
+    set(terrain: TerrainSpecification, configOptions?: ?ConfigOptions) {
         this._transitionable.setTransitionOrValue<TerrainSpecification>(terrain, configOptions);
     }
 

test/unit/style/style_imports.test.js

@@ -1599,6 +1599,11 @@ test('Terrain', (t) => {
                 url: '/standard.json',
                 config: {showTerrain: true},
                 data: createStyleJSON({
+                    schema: {
+                        showTerrain: {
+                            default: true
+                        }
+                    },
                     terrain: {source: 'mapbox-dem', exaggeration: ['case', ['config', 'showTerrain'], 2, 0]},
                     sources: {
                         'mapbox-dem': {