@mapbox/mapbox-gl-style-spec 14.2.0 → 14.3.0-beta.1

package/diff.js

@@ -148,20 +148,10 @@ export const operations: {[_: string]: string} = {
      */
     removeImport: 'removeImport',
 
-    /*
-     *  { command: 'setImportUrl', args: [importId, styleUrl] }
-     */
-    setImportUrl: 'setImportUrl',
-
-    /*
-     *  { command: 'setImportData', args: [importId, stylesheet] }
-     */
-    setImportData: 'setImportData',
-
-    /*
-     *  { command: 'setImportConfig', args: [importId, config] }
+    /**
+     * { command: 'updateImport', args: [importId, importSpecification | styleUrl] }
      */
-    setImportConfig: 'setImportConfig'
+    updateImport: 'updateImport'
 };
 
 function addSource(sourceId: string, after: Sources, commands: Array<Command>) {
@@ -424,20 +414,7 @@ export function diffImports(before: Array<ImportSpecification> = [], after: Arra
         const beforeImport = beforeIndex[afterImport.id];
         if (!beforeImport || isEqual(beforeImport, afterImport)) continue;
 
-        if (!isEqual(beforeImport.config, afterImport.config)) {
-            commands.push({command: operations.setImportConfig, args: [afterImport.id, afterImport.config]});
-        }
-
-        if (!isEqual(beforeImport.url, afterImport.url)) {
-            commands.push({command: operations.setImportUrl, args: [afterImport.id, afterImport.url]});
-        }
-
-        const beforeData = beforeImport && beforeImport.data;
-        const afterData = afterImport.data;
-
-        if (!isEqual(beforeData, afterData)) {
-            commands.push({command: operations.setImportData, args: [afterImport.id, afterData]});
-        }
+        commands.push({command: operations.updateImport, args: [afterImport.id, afterImport]});
     }
 }
 

package/dist/index.cjs

@@ -871,6 +871,17 @@
   		type: "*",
   		doc: "Contains the description of the raster data layers and the bands contained within the tiles."
   	},
+  	volatile: {
+  		type: "boolean",
+  		"default": false,
+  		doc: "A setting to determine whether a source's tiles are cached locally.",
+  		"sdk-support": {
+  			"basic functionality": {
+  				android: "9.3.0",
+  				ios: "5.10.0"
+  			}
+  		}
+  	},
   	"*": {
   		type: "*",
   		doc: "Other keys to configure the data source."
@@ -1122,6 +1133,17 @@
   					}
   				}
   			},
+  			"raster-particle": {
+  				doc: "Particle animation driven by textures such as wind maps.",
+  				"sdk-support": {
+  					"basic functionality": {
+  						js: "0.10.0",
+  						android: "2.0.1",
+  						ios: "2.0.0",
+  						macos: "0.1.0"
+  					}
+  				}
+  			},
   			hillshade: {
   				doc: "Client-side hillshading visualization based on DEM data. Currently, the implementation only supports Mapbox Terrain RGB and Mapzen Terrarium tiles.",
   				"sdk-support": {
@@ -1232,6 +1254,7 @@
   	"layout_fill-extrusion",
   	"layout_symbol",
   	"layout_raster",
+  	"layout_raster-particle",
   	"layout_hillshade",
   	"layout_background",
   	"layout_sky",
@@ -3588,7 +3611,7 @@
   			}
   		},
   		image: {
-  			doc: "Returns a [`ResolvedImage`](/mapbox-gl-js/style-spec/types/#resolvedimage) for use in [`icon-image`](/mapbox-gl-js/style-spec/layers/#layout-symbol-icon-image), `*-pattern` entries, and as a section in the [`'format'`](#types-format) expression. A [`'coalesce'`](#coalesce) expression containing `image` expressions will evaluate to the first listed image that is currently in the style. This validation process is synchronous and requires the image to have been added to the style before requesting it in the `'image'` argument.",
+  			doc: "Returns a [`ResolvedImage`](/mapbox-gl-js/style-spec/types/#resolvedimage) for use in [`icon-image`](/mapbox-gl-js/style-spec/layers/#layout-symbol-icon-image), `*-pattern` entries, and as a section in the [`'format'`](#types-format) expression. A [`'coalesce'`](#coalesce) expression containing `image` expressions will evaluate to the first listed image that is currently in the style. This validation process is synchronous and requires the image to have been added to the style before requesting it in the `'image'` argument. To implement crossfading between two images within a symbol layer using the [`icon-image-cross-fade`](/mapbox-gl-js/style-spec/layers/#paint-symbol-icon-image-cross-fade) attribute, include a second image as the second argument in the `'image'` expression.",
   			group: "Types",
   			"sdk-support": {
   				"basic functionality": {
@@ -4332,6 +4355,17 @@
   				}
   			}
   		},
+  		"raster-particle-speed": {
+  			doc: "Returns the length of the particle velocity vector. Can only be used in the `raster-particle-color` property.",
+  			group: "Raster Particle Animation",
+  			"sdk-support": {
+  				"basic functionality": {
+  					js: "3.3.0",
+  					android: "",
+  					ios: ""
+  				}
+  			}
+  		},
   		random: {
   			doc: "Returns a random value in the specified range (first two input numbers) based on a supplied seed (third input). The seed can be an expression or a constant number or string value.",
   			group: "Math",
@@ -6331,6 +6365,9 @@
   				"measure-light"
   			]
   		},
+  		requires: [
+  			"icon-image"
+  		],
   		"sdk-support": {
   			"basic functionality": {
   				js: "3.0.0",
@@ -6908,7 +6945,7 @@
   	},
   	"raster-elevation": {
   		type: "number",
-  		doc: "Specifies an uniform elevation from the ground, in meters. Only supported with image sources.",
+  		doc: "Specifies an uniform elevation from the ground, in meters.",
   		"default": 0,
   		minimum: 0,
   		transition: true,
@@ -7982,6 +8019,37 @@
   	layout_line: layout_line,
   	layout_symbol: layout_symbol,
   	layout_raster: layout_raster,
+  	"layout_raster-particle": {
+  	visibility: {
+  		type: "enum",
+  		values: {
+  			visible: {
+  				doc: "The layer is shown."
+  			},
+  			none: {
+  				doc: "The layer is not shown."
+  			}
+  		},
+  		"default": "visible",
+  		doc: "Whether this layer is displayed.",
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "0.10.0",
+  				android: "2.0.1",
+  				ios: "2.0.0"
+  			},
+  			"expressions support": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		},
+  		expression: {
+  			interpolated: false
+  		},
+  		"property-type": "constant"
+  	}
+  },
   	layout_hillshade: layout_hillshade,
   	filter: filter,
   	filter_symbol: filter_symbol,
@@ -8648,6 +8716,134 @@
   	paint_heatmap: paint_heatmap,
   	paint_symbol: paint_symbol,
   	paint_raster: paint_raster,
+  	"paint_raster-particle": {
+  	"raster-particle-array-band": {
+  		type: "string",
+  		required: false,
+  		"property-type": "data-constant",
+  		transition: false,
+  		doc: "Displayed band of raster array source layer",
+  		example: "band-name",
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "",
+  				android: "",
+  				ios: ""
+  			}
+  		}
+  	},
+  	"raster-particle-count": {
+  		type: "number",
+  		doc: "Defines the amount of particles per tile.",
+  		"default": 512,
+  		minimum: 1,
+  		transition: false,
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "",
+  				android: "",
+  				ios: ""
+  			}
+  		},
+  		"property-type": "data-constant"
+  	},
+  	"raster-particle-color": {
+  		type: "color",
+  		doc: "Defines a color map by which to colorize a raster particle layer, parameterized by the `[\"raster-particle-speed\"]` expression and evaluated at 256 uniformly spaced steps over the range specified by `raster-particle-max-speed`.",
+  		transition: false,
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "",
+  				android: "",
+  				ios: ""
+  			},
+  			"data-driven styling": {
+  			}
+  		},
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"raster-particle-speed"
+  			]
+  		},
+  		"property-type": "color-ramp"
+  	},
+  	"raster-particle-max-speed": {
+  		type: "number",
+  		doc: "Defines the maximum speed for particles. Velocities with magnitudes equal to or exceeding this value are clamped to the max value.",
+  		"default": 1,
+  		minimum: 1,
+  		transition: false,
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "",
+  				android: "",
+  				ios: ""
+  			}
+  		},
+  		"property-type": "data-constant"
+  	},
+  	"raster-particle-speed-factor": {
+  		type: "number",
+  		doc: "Defines a coefficient for the speed of particles’ motion.",
+  		"default": 0.2,
+  		minimum: 0,
+  		maximum: 1,
+  		transition: true,
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "",
+  				android: "",
+  				ios: ""
+  			}
+  		},
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"zoom"
+  			]
+  		},
+  		"property-type": "data-constant"
+  	},
+  	"raster-particle-fade-opacity-factor": {
+  		type: "number",
+  		doc: "Defines defines the opacity coefficient applied to the faded particles in each frame. In practice, this property controls the length of the particle tail.",
+  		"default": 0.98,
+  		minimum: 0,
+  		maximum: 1,
+  		transition: true,
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "",
+  				android: "",
+  				ios: ""
+  			}
+  		},
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"zoom"
+  			]
+  		},
+  		"property-type": "data-constant"
+  	},
+  	"raster-particle-reset-rate-factor": {
+  		type: "number",
+  		doc: "Defines a coefficient for a time period at which particles will restart at a random position, to avoid degeneration (empty areas without particles).",
+  		"default": 0.8,
+  		minimum: 0,
+  		maximum: 1,
+  		transition: false,
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "",
+  				android: "",
+  				ios: ""
+  			}
+  		},
+  		"property-type": "data-constant"
+  	}
+  },
   	paint_hillshade: paint_hillshade,
   	paint_background: paint_background,
   	paint_sky: paint_sky,
@@ -13245,6 +13441,125 @@
   }
   var Distance$1 = Distance;
 
+  //      
+  function coerceValue(type, value) {
+      switch (type) {
+      case 'string':
+          return toString(value);
+      case 'number':
+          return +value;
+      case 'boolean':
+          return !!value;
+      case 'color':
+          return Color$1.parse(value);
+      case 'formatted': {
+              return Formatted.fromString(toString(value));
+          }
+      case 'resolvedImage': {
+              return ResolvedImage.fromString(toString(value));
+          }
+      }
+      return value;
+  }
+  function clampToAllowedNumber(value, min, max, step) {
+      if (step !== undefined) {
+          value = step * Math.round(value / step);
+      }
+      if (min !== undefined && value < min) {
+          value = min;
+      }
+      if (max !== undefined && value > max) {
+          value = max;
+      }
+      return value;
+  }
+  class Config {
+      constructor(type, key, scope) {
+          this.type = type;
+          this.key = key;
+          this.scope = scope;
+      }
+      static parse(args, context) {
+          let type = context.expectedType;
+          if (type === null || type === undefined) {
+              type = ValueType;
+          }
+          if (args.length < 2 || args.length > 3) {
+              return context.error(`Invalid number of arguments for 'config' expression.`);
+          }
+          const configKey = context.parse(args[1], 1);
+          if (!(configKey instanceof Literal$1)) {
+              return context.error(`Key name of 'config' expression must be a string literal.`);
+          }
+          if (args.length >= 3) {
+              const configScope = context.parse(args[2], 2);
+              if (!(configScope instanceof Literal$1)) {
+                  return context.error(`Scope of 'config' expression must be a string literal.`);
+              }
+              return new Config(type, toString(configKey.value), toString(configScope.value));
+          }
+          return new Config(type, toString(configKey.value));
+      }
+      evaluate(ctx) {
+          const FQIDSeparator = '\x1F';
+          const configKey = [
+              this.key,
+              this.scope,
+              ctx.scope
+          ].filter(Boolean).join(FQIDSeparator);
+          const config = ctx.getConfig(configKey);
+          if (!config)
+              return null;
+          const {type, value, values, minValue, maxValue, stepValue} = config;
+          const defaultValue = config.default.evaluate(ctx);
+          let result = defaultValue;
+          if (value) {
+              // temporarily override scope to parent to evaluate config expressions passed from the parent
+              const originalScope = ctx.scope;
+              ctx.scope = (originalScope || '').split(FQIDSeparator).slice(1).join(FQIDSeparator);
+              result = value.evaluate(ctx);
+              ctx.scope = originalScope;
+          }
+          if (type) {
+              result = coerceValue(type, result);
+          }
+          if (result !== undefined && (minValue !== undefined || maxValue !== undefined || stepValue !== undefined)) {
+              if (typeof result === 'number') {
+                  result = clampToAllowedNumber(result, minValue, maxValue, stepValue);
+              } else if (Array.isArray(result)) {
+                  result = result.map(item => typeof item === 'number' ? clampToAllowedNumber(item, minValue, maxValue, stepValue) : item);
+              }
+          }
+          if (value !== undefined && result !== undefined && values && !values.includes(result)) {
+              // The result is not among the allowed values. Instead, use the default value from the option.
+              result = defaultValue;
+              if (type) {
+                  result = coerceValue(type, result);
+              }
+          }
+          if (type && type !== this.type || result !== undefined && typeOf(result) !== this.type) {
+              result = coerceValue(this.type.kind, result);
+          }
+          return result;
+      }
+      eachChild() {
+      }
+      outputDefined() {
+          return false;
+      }
+      serialize() {
+          const res = [
+              'config',
+              this.key
+          ];
+          if (this.scope) {
+              res.concat(this.key);
+          }
+          return res;
+      }
+  }
+  var Config$1 = Config;
+
   //      
   function isFeatureConstant(e) {
       if (e instanceof CompoundExpression$1) {
@@ -13289,10 +13604,8 @@
       return result;
   }
   function isConfigConstant(e) {
-      if (e instanceof CompoundExpression$1) {
-          if (e.name === 'config') {
-              return false;
-          }
+      if (e instanceof Config$1) {
+          return false;
       }
       let result = true;
       e.eachChild(arg => {
@@ -13494,8 +13807,6 @@
           return isConstant(expression.boundExpression);
       } else if (expression instanceof CompoundExpression$1 && expression.name === 'error') {
           return false;
-      } else if (expression instanceof CompoundExpression$1 && expression.name === 'config') {
-          return false;
       } else if (expression instanceof CollatorExpression) {
           // Although the results of a Collator expression with fixed arguments
           // generally shouldn't change between executions, we can't serialize them
@@ -13505,6 +13816,8 @@
           return false;
       } else if (expression instanceof Distance$1) {
           return false;
+      } else if (expression instanceof Config$1) {
+          return false;
       }
       const isTypeAnnotation = expression instanceof Coercion$1 || expression instanceof Assertion$1;
       let childrenConstant = true;
@@ -13534,7 +13847,8 @@
           'is-supported-script',
           'pitch',
           'distance-from-center',
-          'measure-light'
+          'measure-light',
+          'raster-particle-speed'
       ]);
   }
 
@@ -15018,7 +15332,9 @@
       // $FlowFixMe[method-unbinding]
       'within': Within$1,
       // $FlowFixMe[method-unbinding]
-      'distance': Distance$1
+      'distance': Distance$1,
+      // $FlowFixMe[method-unbinding]
+      'config': Config$1
   };
   function rgba(ctx, [r, g, b, a]) {
       r = r.evaluate(ctx);
@@ -15051,69 +15367,6 @@
       const v = obj[key];
       return typeof v === 'undefined' ? null : v;
   }
-  function coerceValue(type, value) {
-      switch (type) {
-      case 'string':
-          return String(value);
-      case 'number':
-          return +value;
-      case 'boolean':
-          return !!value;
-      case 'color':
-          return Color$1.parse(value);
-      }
-      return value;
-  }
-  function clampToAllowedNumber(value, min, max, step) {
-      if (step !== undefined) {
-          value = step * Math.round(value / step);
-      }
-      if (min !== undefined && value < min) {
-          value = min;
-      }
-      if (max !== undefined && value > max) {
-          value = max;
-      }
-      return value;
-  }
-  const FQIDSeparator = '\x1F';
-  function getConfig(ctx, key, scope) {
-      // Create a fully qualified key from the requested scope
-      // and the scope from the current evaluation context
-      key = [
-          key,
-          scope,
-          ctx.scope
-      ].filter(Boolean).join(FQIDSeparator);
-      const config = ctx.getConfig(key);
-      if (!config)
-          return null;
-      const {type, value, values, minValue, maxValue, stepValue} = config;
-      const defaultValue = config.default.evaluate(ctx);
-      let result = defaultValue;
-      if (value) {
-          // temporarily override scope to parent to evaluate config expressions passed from the parent
-          const originalScope = ctx.scope;
-          ctx.scope = (originalScope || '').split(FQIDSeparator).slice(1).join(FQIDSeparator);
-          result = value.evaluate(ctx);
-          ctx.scope = originalScope;
-      }
-      if (type)
-          result = coerceValue(type, result);
-      if (value !== undefined && result !== undefined && values && !values.includes(result)) {
-          result = defaultValue;
-          if (type)
-              result = coerceValue(type, result);
-      }
-      if (result !== undefined && (minValue !== undefined || maxValue !== undefined || stepValue !== undefined)) {
-          if (typeof result === 'number') {
-              result = clampToAllowedNumber(result, minValue, maxValue, stepValue);
-          } else if (Array.isArray(result)) {
-              result = result.map(item => typeof item === 'number' ? clampToAllowedNumber(item, minValue, maxValue, stepValue) : item);
-          }
-      }
-      return result;
-  }
   function binarySearch(v, a, i, j) {
       while (i <= j) {
           const m = i + j >> 1;
@@ -15231,22 +15484,6 @@
               ]
           ]
       },
-      'config': {
-          type: ValueType,
-          overloads: [
-              [
-                  [StringType],
-                  (ctx, [key]) => getConfig(ctx, key.evaluate(ctx))
-              ],
-              [
-                  [
-                      StringType,
-                      StringType
-                  ],
-                  (ctx, [key, scope]) => getConfig(ctx, key.evaluate(ctx), scope.evaluate(ctx))
-              ]
-          ]
-      },
       'feature-state': [
           ValueType,
           [StringType],
@@ -15302,6 +15539,11 @@
           [],
           ctx => ctx.globals.rasterValue || 0
       ],
+      'raster-particle-speed': [
+          NumberType,
+          [],
+          ctx => ctx.globals.rasterParticleSpeed || 0
+      ],
       'sky-radial-progress': [
           NumberType,
           [],
@@ -17459,18 +17701,10 @@ ${ JSON.stringify(filterExp, null, 2) }
        *  { command: 'removeImport', args: [importId] }
        */
       removeImport: 'removeImport',
-      /*
-       *  { command: 'setImportUrl', args: [importId, styleUrl] }
-       */
-      setImportUrl: 'setImportUrl',
-      /*
-       *  { command: 'setImportData', args: [importId, stylesheet] }
-       */
-      setImportData: 'setImportData',
-      /*
-       *  { command: 'setImportConfig', args: [importId, config] }
+      /**
+       * { command: 'updateImport', args: [importId, importSpecification | styleUrl] }
        */
-      setImportConfig: 'setImportConfig'
+      updateImport: 'updateImport'
   };
   function addSource(sourceId, after, commands) {
       commands.push({
@@ -17801,35 +18035,13 @@ ${ JSON.stringify(filterExp, null, 2) }
           const beforeImport = beforeIndex[afterImport.id];
           if (!beforeImport || deepEqual(beforeImport, afterImport))
               continue;
-          if (!deepEqual(beforeImport.config, afterImport.config)) {
-              commands.push({
-                  command: operations.setImportConfig,
-                  args: [
-                      afterImport.id,
-                      afterImport.config
-                  ]
-              });
-          }
-          if (!deepEqual(beforeImport.url, afterImport.url)) {
-              commands.push({
-                  command: operations.setImportUrl,
-                  args: [
-                      afterImport.id,
-                      afterImport.url
-                  ]
-              });
-          }
-          const beforeData = beforeImport && beforeImport.data;
-          const afterData = afterImport.data;
-          if (!deepEqual(beforeData, afterData)) {
-              commands.push({
-                  command: operations.setImportData,
-                  args: [
-                      afterImport.id,
-                      afterData
-                  ]
-              });
-          }
+          commands.push({
+              command: operations.updateImport,
+              args: [
+                  afterImport.id,
+                  afterImport
+              ]
+          });
       }
   }
   /**
@@ -18686,8 +18898,15 @@ ${ JSON.stringify(filterExp, null, 2) }
                   errors.push(new ValidationError(key, layer, `layer "${ layer.id }" must specify a "source-layer"`));
               } else if (sourceType === 'raster-dem' && type !== 'hillshade') {
                   errors.push(new ValidationError(key, layer.source, 'raster-dem source can only be used with layer type \'hillshade\'.'));
+              } else if (sourceType === 'raster-array' && ![
+                      'raster',
+                      'raster-particle'
+                  ].includes(type)) {
+                  errors.push(new ValidationError(key, layer.source, `raster-array source can only be used with layer type \'raster\'.`));
               } else if (type === 'line' && layer.paint && (layer.paint['line-gradient'] || layer.paint['line-trim-offset']) && (sourceType !== 'geojson' || !source.lineMetrics)) {
                   errors.push(new ValidationError(key, layer, `layer "${ layer.id }" specifies a line-gradient, which requires a GeoJSON source with \`lineMetrics\` enabled.`));
+              } else if (type === 'raster-particle' && sourceType !== 'raster-array') {
+                  errors.push(new ValidationError(key, layer.source, `layer "${ layer.id }" requires a \'raster-array\' source.`));
               }
           }
       }
@@ -18781,7 +19000,8 @@ ${ JSON.stringify(filterExp, null, 2) }
       if ([
               'vector',
               'raster',
-              'raster-dem'
+              'raster-dem',
+              'raster-array'
           ].includes(type)) {
           if (!value.url && !value.tiles) {
               errors.push(new ValidationWarning(key, value, 'Either "url" or "tiles" is required.'));
@@ -18791,6 +19011,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       case 'vector':
       case 'raster':
       case 'raster-dem':
+      case 'raster-array':
           errors = errors.concat(validateObject({
               key,
               value,
@@ -20419,6 +20640,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       'vector',
       'raster',
       'raster-dem',
+      'raster-array',
       'model',
       'batched-model'
   ]);
@@ -20435,7 +20657,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       ];
       errors.push(...getAllowedKeyErrors(source, sourceKeys, 'source'));
       /*
-       * "type" is required and must be one of "vector", "raster", "raster-dem"
+       * "type" is required and must be one of "vector", "raster", "raster-dem", "raster-array"
        */
       if (!acceptedSourceTypes.has(String(source.type))) {
           errors.push(new ValidationError(`sources[${ i }].type`, source.type, `Expected one of [${ Array.from(acceptedSourceTypes).join(', ') }]`));