@mapbox/mapbox-gl-style-spec 14.0.0-rc.2 → 14.1.0-beta.1

package/diff.js

@@ -38,6 +38,11 @@ export const operations: {[_: string]: string} = {
      */
     setLayoutProperty: 'setLayoutProperty',
 
+    /*
+     * { command: 'setSlot', args: ['layerId', slot] }
+     */
+    setSlot: 'setSlot',
+
     /*
      * { command: 'setFilter', args: ['layerId', filter] }
      */
@@ -151,7 +156,12 @@ export const operations: {[_: string]: string} = {
     /*
      *  { command: 'setImportData', args: [importId, stylesheet] }
      */
-    setImportData: 'setImportData'
+    setImportData: 'setImportData',
+
+    /*
+     *  { command: 'setImportConfig', args: [importId, config] }
+     */
+    setImportConfig: 'setImportConfig'
 };
 
 function addSource(sourceId: string, after: Sources, commands: Array<Command>) {
@@ -324,6 +334,9 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
         // layout, paint, filter, minzoom, maxzoom
         diffLayerPropertyChanges(beforeLayer.layout, afterLayer.layout, commands, layerId, null, operations.setLayoutProperty);
         diffLayerPropertyChanges(beforeLayer.paint, afterLayer.paint, commands, layerId, null, operations.setPaintProperty);
+        if (!isEqual(beforeLayer.slot, afterLayer.slot)) {
+            commands.push({command: operations.setSlot, args: [layerId, afterLayer.slot]});
+        }
         if (!isEqual(beforeLayer.filter, afterLayer.filter)) {
             commands.push({command: operations.setFilter, args: [layerId, afterLayer.filter]});
         }
@@ -335,7 +348,7 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
         for (prop in beforeLayer) {
             if (!beforeLayer.hasOwnProperty(prop)) continue;
             if (prop === 'layout' || prop === 'paint' || prop === 'filter' ||
-                prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom') continue;
+                prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom' || prop === 'slot') continue;
             if (prop.indexOf('paint.') === 0) {
                 diffLayerPropertyChanges(beforeLayer[prop], afterLayer[prop], commands, layerId, prop.slice(6), operations.setPaintProperty);
             } else if (!isEqual(beforeLayer[prop], afterLayer[prop])) {
@@ -345,7 +358,7 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
         for (prop in afterLayer) {
             if (!afterLayer.hasOwnProperty(prop) || beforeLayer.hasOwnProperty(prop)) continue;
             if (prop === 'layout' || prop === 'paint' || prop === 'filter' ||
-                prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom') continue;
+                prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom' || prop === 'slot') continue;
             if (prop.indexOf('paint.') === 0) {
                 diffLayerPropertyChanges(beforeLayer[prop], afterLayer[prop], commands, layerId, prop.slice(6), operations.setPaintProperty);
             } else if (!isEqual(beforeLayer[prop], afterLayer[prop])) {
@@ -411,6 +424,10 @@ 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]});
         }
@@ -445,7 +462,7 @@ export function diffImports(before: Array<ImportSpecification> = [], after: Arra
 export default function diffStyles(before: StyleSpecification, after: StyleSpecification): Array<Command> {
     if (!before) return [{command: operations.setStyle, args: [after]}];
 
-    let commands = [];
+    let commands: Array<Command> = [];
 
     try {
         // Handle changes to top-level properties
@@ -470,6 +487,10 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
         if (!isEqual(before.glyphs, after.glyphs)) {
             commands.push({command: operations.setGlyphs, args: [after.glyphs]});
         }
+        // Handle changes to `imports` before other mergable top-level properties
+        if (!isEqual(before.imports, after.imports)) {
+            diffImports(before.imports, after.imports, commands);
+        }
         if (!isEqual(before.transition, after.transition)) {
             commands.push({command: operations.setTransition, args: [after.transition]});
         }
@@ -533,9 +554,6 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
 
         // Handle changes to `layers`
         diffLayers(beforeLayers, after.layers, commands);
-
-        // Handle changes to `imports`
-        diffImports(before.imports, after.imports, commands);
     } catch (e) {
         // fall back to setStyle
         console.warn('Unable to compute style diff:', e);

package/dist/index.cjs

@@ -95,7 +95,15 @@
   					"shadow-intensity": 0.2
   				}
   			}
-  		]
+  		],
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0",
+  				macos: "11.0.0"
+  			}
+  		}
   	},
   	terrain: {
   		type: "terrain",
@@ -562,6 +570,7 @@
   	"source_vector",
   	"source_raster",
   	"source_raster_dem",
+  	"source_raster_array",
   	"source_geojson",
   	"source_video",
   	"source_image",
@@ -808,6 +817,67 @@
   		doc: "Other keys to configure the data source."
   	}
   };
+  var source_raster_array = {
+  	type: {
+  		required: true,
+  		type: "enum",
+  		values: {
+  			"raster-array": {
+  				doc: "A raster array source"
+  			}
+  		},
+  		doc: "The type of the source."
+  	},
+  	url: {
+  		type: "string",
+  		doc: "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`."
+  	},
+  	tiles: {
+  		type: "array",
+  		value: "string",
+  		doc: "An array of one or more tile source URLs, as in the TileJSON spec."
+  	},
+  	bounds: {
+  		type: "array",
+  		value: "number",
+  		length: 4,
+  		"default": [
+  			-180,
+  			-85.051129,
+  			180,
+  			85.051129
+  		],
+  		doc: "An array containing the longitude and latitude of the southwest and northeast corners of the source's bounding box in the following order: `[sw.lng, sw.lat, ne.lng, ne.lat]`. When this property is included in a source, no tiles outside of the given bounds are requested by Mapbox GL."
+  	},
+  	minzoom: {
+  		type: "number",
+  		"default": 0,
+  		doc: "Minimum zoom level for which tiles are available, as in the TileJSON spec."
+  	},
+  	maxzoom: {
+  		type: "number",
+  		"default": 22,
+  		doc: "Maximum zoom level for which tiles are available, as in the TileJSON spec. Data from tiles at the maxzoom are used when displaying the map at higher zoom levels."
+  	},
+  	tileSize: {
+  		type: "number",
+  		"default": 512,
+  		units: "pixels",
+  		doc: "The minimum visual size to display tiles for this layer. Only configurable for raster layers."
+  	},
+  	attribution: {
+  		type: "string",
+  		doc: "Contains an attribution to be displayed when the map is shown to a user."
+  	},
+  	rasterLayers: {
+  		type: "*",
+  		doc: "Contains the description of the raster data layers and the bands contained within the tiles."
+  	},
+  	"*": {
+  		type: "*",
+  		doc: "Other keys to configure the data source."
+  	}
+  };
   var source_geojson = {
   	type: {
   		required: true,
@@ -1784,7 +1854,7 @@
   	"symbol-z-elevate": {
   		type: "boolean",
   		"default": false,
-  		doc: "Position symbol on buildings (both fill extrusions and models) roof tops. In order to have minimal impact on performance, this is supported only when `fill-extrusion-height` is not zoom-dependent and not edited after initial bucket creation. For fading in buildings when zooming in, fill-extrusion-vertical-scale should be used and symbols would raise with building roofs. Symbols are sorted by elevation, except in case when `viewport-y` sorting or `symbol-sort-key` are applied.",
+  		doc: "Position symbol on buildings (both fill extrusions and models) rooftops. In order to have minimal impact on performance, this is supported only when `fill-extrusion-height` is not zoom-dependent and remains unchanged. For fading in buildings when zooming in, fill-extrusion-vertical-scale should be used and symbols would raise with building rooftops. Symbols are sorted by elevation, except in cases when `viewport-y` sorting or `symbol-sort-key` are applied.",
   		"sdk-support": {
   			"basic functionality": {
   				js: "3.0.0",
@@ -7055,6 +7125,66 @@
   			]
   		},
   		"property-type": "data-constant"
+  	},
+  	"raster-emissive-strength": {
+  		type: "number",
+  		"default": 0,
+  		minimum: 0,
+  		transition: true,
+  		units: "intensity",
+  		doc: "Controls the intensity of light emitted on the source features.",
+  		requires: [
+  			"lights"
+  		],
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		},
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"zoom",
+  				"measure-light"
+  			]
+  		},
+  		"property-type": "data-constant"
+  	},
+  	"raster-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: "3.1.0",
+  				android: "11.1.0",
+  				ios: "11.1.0"
+  			}
+  		}
+  	},
+  	"raster-elevation": {
+  		type: "number",
+  		doc: "Specifies an uniform elevation from the ground, in meters. Only supported with image sources.",
+  		"default": 0,
+  		minimum: 0,
+  		transition: true,
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.1.0"
+  			}
+  		},
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"zoom"
+  			]
+  		},
+  		"property-type": "data-constant"
   	}
   };
   var paint_hillshade = {
@@ -7204,7 +7334,10 @@
   		minimum: 0,
   		transition: true,
   		units: "intensity",
-  		doc: "Controls the intensity of light emitted on the source features. This property works only with 3D light, i.e. when `lights` root property is defined.",
+  		doc: "Controls the intensity of light emitted on the source features.",
+  		requires: [
+  			"lights"
+  		],
   		"sdk-support": {
   			"basic functionality": {
   				js: "3.0.0",
@@ -8015,7 +8148,7 @@
   				}
   			},
   			directional: {
-  				doc: "A light that has a direction and is located at infinite, so its rays are parallel. Simulates the sun light and it can cast shadows",
+  				doc: "A light that has a direction and is located at infinite distance, so its rays are parallel. It simulates the sun light and can cast shadows.",
   				"sdk-support": {
   					"basic functionality": {
   						js: "3.0.0",
@@ -8025,7 +8158,7 @@
   				}
   			},
   			flat: {
-  				doc: "A global directional light source which is only applied on 3D layers and hillshade layers. Using this type disables other light sources.",
+  				doc: "A global directional light source which is only applied on 3D and hillshade layers. Using this type disables other light sources.",
   				"sdk-support": {
   					"basic functionality": {
   						js: "3.0.0",
@@ -8046,6 +8179,7 @@
   	source_vector: source_vector,
   	source_raster: source_raster,
   	source_raster_dem: source_raster_dem,
+  	source_raster_array: source_raster_array,
   	source_geojson: source_geojson,
   	source_video: source_video,
   	source_image: source_image,
@@ -8486,7 +8620,7 @@
   			]
   		},
   		transition: true,
-  		doc: "Shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to height of one floor and brings the most plausible results for buildings. This property works only with legacy light. When 3D light is enabled `fill-extrusion-ambient-occlusion-wall-radius` and `fill-extrusion-ambient-occlusion-ground-radius` are used instead.",
+  		doc: "Shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to height of one floor and brings the most plausible results for buildings. This property works only with legacy light. When 3D lights are enabled `fill-extrusion-ambient-occlusion-wall-radius` and `fill-extrusion-ambient-occlusion-ground-radius` are used instead.",
   		requires: [
   			"fill-extrusion-edge-radius",
   			{
@@ -8798,6 +8932,32 @@
   			}
   		},
   		"property-type": "data-constant"
+  	},
+  	"fill-extrusion-emissive-strength": {
+  		type: "number",
+  		"default": 0,
+  		minimum: 0,
+  		transition: true,
+  		units: "intensity",
+  		doc: "Controls the intensity of light emitted on the source features.",
+  		requires: [
+  			"lights"
+  		],
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		},
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"zoom",
+  				"measure-light"
+  			]
+  		},
+  		"property-type": "data-constant"
   	}
   },
   	paint_line: paint_line,
@@ -18624,6 +18784,10 @@ ${ JSON.stringify(filterExp, null, 2) }
        * { command: 'setLayoutProperty', args: ['layerId', 'prop', value] }
        */
       setLayoutProperty: 'setLayoutProperty',
+      /*
+       * { command: 'setSlot', args: ['layerId', slot] }
+       */
+      setSlot: 'setSlot',
       /*
        * { command: 'setFilter', args: ['layerId', filter] }
        */
@@ -18715,7 +18879,11 @@ ${ JSON.stringify(filterExp, null, 2) }
       /*
        *  { command: 'setImportData', args: [importId, stylesheet] }
        */
-      setImportData: 'setImportData'
+      setImportData: 'setImportData',
+      /*
+       *  { command: 'setImportConfig', args: [importId, config] }
+       */
+      setImportConfig: 'setImportConfig'
   };
   function addSource(sourceId, after, commands) {
       commands.push({
@@ -18920,6 +19088,15 @@ ${ JSON.stringify(filterExp, null, 2) }
           // layout, paint, filter, minzoom, maxzoom
           diffLayerPropertyChanges(beforeLayer.layout, afterLayer.layout, commands, layerId, null, operations.setLayoutProperty);
           diffLayerPropertyChanges(beforeLayer.paint, afterLayer.paint, commands, layerId, null, operations.setPaintProperty);
+          if (!deepEqual(beforeLayer.slot, afterLayer.slot)) {
+              commands.push({
+                  command: operations.setSlot,
+                  args: [
+                      layerId,
+                      afterLayer.slot
+                  ]
+              });
+          }
           if (!deepEqual(beforeLayer.filter, afterLayer.filter)) {
               commands.push({
                   command: operations.setFilter,
@@ -18943,7 +19120,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           for (prop in beforeLayer) {
               if (!beforeLayer.hasOwnProperty(prop))
                   continue;
-              if (prop === 'layout' || prop === 'paint' || prop === 'filter' || prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom')
+              if (prop === 'layout' || prop === 'paint' || prop === 'filter' || prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom' || prop === 'slot')
                   continue;
               if (prop.indexOf('paint.') === 0) {
                   diffLayerPropertyChanges(beforeLayer[prop], afterLayer[prop], commands, layerId, prop.slice(6), operations.setPaintProperty);
@@ -18961,7 +19138,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           for (prop in afterLayer) {
               if (!afterLayer.hasOwnProperty(prop) || beforeLayer.hasOwnProperty(prop))
                   continue;
-              if (prop === 'layout' || prop === 'paint' || prop === 'filter' || prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom')
+              if (prop === 'layout' || prop === 'paint' || prop === 'filter' || prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom' || prop === 'slot')
                   continue;
               if (prop.indexOf('paint.') === 0) {
                   diffLayerPropertyChanges(beforeLayer[prop], afterLayer[prop], commands, layerId, prop.slice(6), operations.setPaintProperty);
@@ -19037,6 +19214,15 @@ ${ 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,
@@ -19128,6 +19314,10 @@ ${ JSON.stringify(filterExp, null, 2) }
                   args: [after.glyphs]
               });
           }
+          // Handle changes to `imports` before other mergable top-level properties
+          if (!deepEqual(before.imports, after.imports)) {
+              diffImports(before.imports, after.imports, commands);
+          }
           if (!deepEqual(before.transition, after.transition)) {
               commands.push({
                   command: operations.setTransition,
@@ -19211,8 +19401,6 @@ ${ JSON.stringify(filterExp, null, 2) }
           }
           // Handle changes to `layers`
           diffLayers(beforeLayers, after.layers, commands);
-          // Handle changes to `imports`
-          diffImports(before.imports, after.imports, commands);
       } catch (e) {
           // fall back to setStyle
           console.warn('Unable to compute style diff:', e);