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

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]});
         }

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",
@@ -313,7 +321,14 @@
   		example: [
   			90,
   			40
-  		]
+  		],
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		}
   	},
   	color: {
   		type: "color",
@@ -326,7 +341,14 @@
   			]
   		},
   		transition: true,
-  		doc: "Color of the directional light."
+  		doc: "Color of the directional light.",
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		}
   	},
   	intensity: {
   		type: "number",
@@ -341,7 +363,14 @@
   			]
   		},
   		transition: true,
-  		doc: "A multiplier for the color of the directional light."
+  		doc: "A multiplier for the color of the directional light.",
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		}
   	},
   	"cast-shadows": {
   		type: "boolean",
@@ -351,7 +380,14 @@
   		expression: {
   			interpolated: false
   		},
-  		"property-type": "data-constant"
+  		"property-type": "data-constant",
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		}
   	},
   	"shadow-intensity": {
   		type: "number",
@@ -366,7 +402,14 @@
   			]
   		},
   		doc: "Determines the shadow strength, affecting the shadow receiver surfaces final color. Values near 0.0 reduce the shadow contribution to the final color. Values near to 1.0 make occluded surfaces receive almost no directional light. Designed to be used mostly for transitioning between values 0 and 1.",
-  		transition: true
+  		transition: true,
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		}
   	}
   };
   var properties_light_ambient = {
@@ -381,7 +424,14 @@
   			]
   		},
   		transition: true,
-  		doc: "Color of the ambient light."
+  		doc: "Color of the ambient light.",
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		}
   	},
   	intensity: {
   		type: "number",
@@ -396,7 +446,14 @@
   			]
   		},
   		transition: true,
-  		doc: "A multiplier for the color of the ambient light."
+  		doc: "A multiplier for the color of the ambient light.",
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
+  			}
+  		}
   	}
   };
   var properties_light_flat = {
@@ -423,10 +480,9 @@
   		example: "map",
   		"sdk-support": {
   			"basic functionality": {
-  				js: "0.27.0",
-  				android: "5.1.0",
-  				ios: "3.6.0",
-  				macos: "0.5.0"
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
   			}
   		}
   	},
@@ -455,10 +511,9 @@
   		],
   		"sdk-support": {
   			"basic functionality": {
-  				js: "0.27.0",
-  				android: "5.1.0",
-  				ios: "3.6.0",
-  				macos: "0.5.0"
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
   			}
   		}
   	},
@@ -476,10 +531,9 @@
   		doc: "Color tint for lighting extruded geometries.",
   		"sdk-support": {
   			"basic functionality": {
-  				js: "0.27.0",
-  				android: "5.1.0",
-  				ios: "3.6.0",
-  				macos: "0.5.0"
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
   			}
   		}
   	},
@@ -499,10 +553,9 @@
   		doc: "Intensity of lighting (on a scale from 0 to 1). Higher numbers will present as more extreme contrast.",
   		"sdk-support": {
   			"basic functionality": {
-  				js: "0.27.0",
-  				android: "5.1.0",
-  				ios: "3.6.0",
-  				macos: "0.5.0"
+  				js: "3.0.0",
+  				android: "11.0.0",
+  				ios: "11.0.0"
   			}
   		}
   	}
@@ -1228,6 +1281,7 @@
   	},
   	"model-id": {
   		type: "string",
+  		"default": "",
   		doc: "Model to render.",
   		"property-type": "data-driven",
   		expression: {
@@ -1738,7 +1792,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",
@@ -7158,7 +7212,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",
@@ -7787,7 +7844,7 @@
   		"default": 0,
   		minimum: 0,
   		maximum: 5,
-  		units: "number",
+  		units: "intensity",
   		doc: "Strength of the emission. There is no emission for value 0. For value 1.0, only emissive component (no shading) is displayed and values above 1.0 produce light contribution to surrounding area, for some of the parts (e.g. doors). Expressions that depend on measure-light are not supported when using GeoJSON or vector tile as the model layer source.",
   		expression: {
   			interpolated: true,
@@ -7969,7 +8026,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",
@@ -7979,7 +8036,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",
@@ -8440,7 +8497,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",
   			{
@@ -18578,6 +18635,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] }
        */
@@ -18669,7 +18730,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({
@@ -18874,6 +18939,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,
@@ -18897,7 +18971,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);
@@ -18915,7 +18989,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);
@@ -18991,6 +19065,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,
@@ -19270,6 +19353,11 @@ ${ JSON.stringify(filterExp, null, 2) }
           value: importSpec,
           valueSpec: styleSpec.import
       }));
+      // Empty string is reserved for the root style id
+      if (unbundle(importSpec.id) === '') {
+          const key = `${ options.key }.id`;
+          errors.push(new ValidationError(key, importSpec, `import id can't be an empty string`));
+      }
       if (data) {
           const key = `${ options.key }.data`;
           errors = errors.concat(validateStyle$2(data, styleSpec, { key }));
@@ -20169,13 +20257,17 @@ ${ JSON.stringify(filterExp, null, 2) }
                   return errors;
               }
               for (const propertyKey in properties) {
-                  errors = errors.concat(validate({
-                      key: propertyKey,
-                      value: properties[propertyKey],
-                      valueSpec: lightPropertySpec[propertyKey],
-                      style,
-                      styleSpec
-                  }));
+                  if (!lightPropertySpec[propertyKey]) {
+                      errors = errors.concat([new ValidationWarning(options.key, properties[propertyKey], `unknown property "${ propertyKey }"`)]);
+                  } else {
+                      errors = errors.concat(validate({
+                          key: propertyKey,
+                          value: properties[propertyKey],
+                          valueSpec: lightPropertySpec[propertyKey],
+                          style,
+                          styleSpec
+                      }));
+                  }
               }
           } else {
               const transitionMatch = key.match(/^(.*)-transition$/);