@mapbox/mapbox-gl-style-spec 14.8.0-beta.1 → 14.9.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -25,8 +25,17 @@ export default function validateTerrain(options: ValidationOptions): Array<Valid
25
25
 
26
26
  for (const key in terrain) {
27
27
  const transitionMatch = key.match(/^(.*)-transition$/);
28
+ const useThemeMatch = key.match(/^(.*)-use-theme$/);
28
29
 
29
- if (transitionMatch && terrainSpec[transitionMatch[1]] && terrainSpec[transitionMatch[1]].transition) {
30
+ if (useThemeMatch && terrainSpec[useThemeMatch[1]]) {
31
+ errors = errors.concat(validate({
32
+ key,
33
+ value: terrain[key],
34
+ valueSpec: {type:'string'},
35
+ style,
36
+ styleSpec
37
+ }));
38
+ } else if (transitionMatch && terrainSpec[transitionMatch[1]] && terrainSpec[transitionMatch[1]].transition) {
30
39
  errors = errors.concat(validate({
31
40
  key,
32
41
  value: terrain[key],
@@ -51,7 +60,7 @@ export default function validateTerrain(options: ValidationOptions): Array<Valid
51
60
  errors.push(new ValidationError(key, terrain, `terrain is missing required property "source"`));
52
61
  } else {
53
62
  const source = style.sources && style.sources[terrain.source];
54
- const sourceType = source && unbundle(source.type);
63
+ const sourceType = source && unbundle(source.type) as string;
55
64
  if (!source) {
56
65
  errors.push(new ValidationError(key, terrain.source, `source "${terrain.source}" not found`));
57
66
  } else if (sourceType !== 'raster-dem') {
@@ -5,6 +5,8 @@ import _validateLight from './validate/validate_light';
5
5
  import _validateLights from './validate/validate_lights';
6
6
  import _validateTerrain from './validate/validate_terrain';
7
7
  import _validateFog from './validate/validate_fog';
8
+ import _validateSnow from './validate/validate_snow';
9
+ import _validateRain from './validate/validate_rain';
8
10
  import _validateLayer from './validate/validate_layer';
9
11
  import _validateFilter from './validate/validate_filter';
10
12
  import _validatePaintProperty from './validate/validate_paint_property';
@@ -46,6 +48,8 @@ export const validateLight: Validator = opts => sortErrors(_validateLight(opts))
46
48
  export const validateLights: Validator = opts => sortErrors(_validateLights(opts));
47
49
  export const validateTerrain: Validator = opts => sortErrors(_validateTerrain(opts));
48
50
  export const validateFog: Validator = opts => sortErrors(_validateFog(opts));
51
+ export const validateSnow: Validator = opts => sortErrors(_validateSnow(opts));
52
+ export const validateRain: Validator = opts => sortErrors(_validateRain(opts));
49
53
  export const validateLayer: Validator = opts => sortErrors(_validateLayer(opts));
50
54
  export const validateFilter: Validator = opts => sortErrors(_validateFilter(opts));
51
55
  export const validatePaintProperty: Validator = opts => sortErrors(_validatePaintProperty(opts));