@mapbox/mapbox-gl-style-spec 14.16.0-beta.1 → 14.16.0-beta.3

package/dist/index.d.ts

@@ -441,14 +441,17 @@ type ImportSpecification = {
 	"color-theme"?: ColorThemeSpecification | null | undefined;
 };
 type IndoorSpecification = {
+	[_: string]: IndoorSourceSpecification;
+};
+type IndoorSourceSpecification = {
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
-	"floorplanFeaturesetId"?: ExpressionSpecification;
+	"sourceId"?: string;
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
-	"buildingFeaturesetId"?: ExpressionSpecification;
+	"sourceLayers"?: Array<string>;
 };
 type ConfigSpecification = {
 	[_: string]: unknown;
@@ -2061,6 +2064,7 @@ interface GlobalProperties {
 	accumulated?: Value;
 	brightness?: number;
 	worldview?: string;
+	activeFloors?: Set<string>;
 }
 declare class StyleExpression {
 	expression: Expression;
@@ -2073,6 +2077,7 @@ declare class StyleExpression {
 		[_: string]: unknown;
 	};
 	configDependencies: Set<string>;
+	isIndoorDependent: boolean;
 	constructor(expression: Expression, propertySpec?: StylePropertySpecification, scope?: string, options?: ConfigOptions, iconImageUseTheme?: string);
 	evaluateWithoutErrorHandling(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection, featureTileCoord?: Point, featureDistanceData?: FeatureDistanceData): any;
 	evaluate(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection, featureTileCoord?: Point, featureDistanceData?: FeatureDistanceData, iconImageUseTheme?: string): any;
@@ -2083,6 +2088,7 @@ declare class ZoomConstantExpression<Kind extends EvaluationKind> {
 	kind: Kind;
 	isStateDependent: boolean;
 	configDependencies: Set<string>;
+	isIndoorDependent: boolean;
 	_styleExpression: StyleExpression;
 	isLightConstant: boolean | null | undefined;
 	isLineProgressConstant: boolean | null | undefined;
@@ -2094,6 +2100,7 @@ declare class ZoomDependentExpression<Kind extends EvaluationKind> {
 	kind: Kind;
 	zoomStops: Array<number>;
 	isStateDependent: boolean;
+	isIndoorDependent: boolean;
 	isLightConstant: boolean | null | undefined;
 	isLineProgressConstant: boolean | null | undefined;
 	configDependencies: Set<string>;
@@ -2107,11 +2114,13 @@ declare class ZoomDependentExpression<Kind extends EvaluationKind> {
 type ConstantExpression = {
 	kind: "constant";
 	configDependencies: Set<string>;
+	isIndoorDependent: boolean;
 	readonly evaluate: <T = unknown>(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection, iconImageUseTheme?: string) => T;
 };
 type SourceExpression = {
 	kind: "source";
 	isStateDependent: boolean;
+	isIndoorDependent: boolean;
 	isLightConstant: boolean | null | undefined;
 	isLineProgressConstant: boolean | null | undefined;
 	configDependencies: Set<string>;
@@ -2120,6 +2129,7 @@ type SourceExpression = {
 type CameraExpression = {
 	kind: "camera";
 	isStateDependent: boolean;
+	isIndoorDependent: boolean;
 	configDependencies: Set<string>;
 	readonly evaluate: <T = unknown>(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[]) => T;
 	readonly interpolationFactor: (input: number, lower: number, upper: number) => number;
@@ -2129,6 +2139,7 @@ type CameraExpression = {
 interface CompositeExpression {
 	kind: "composite";
 	isStateDependent: boolean;
+	isIndoorDependent: boolean;
 	isLightConstant: boolean | null | undefined;
 	isLineProgressConstant: boolean | null | undefined;
 	configDependencies: Set<string>;

package/dist/index.es.js

@@ -127,6 +127,7 @@ var $root = {
 	},
 	indoor: {
 		type: "indoor",
+		"private": true,
 		experimental: true,
 		doc: "Controls the behaviour of indoor features."
 	},
@@ -5599,6 +5600,19 @@ var expression_name = {
 				}
 			}
 		},
+		"is-active-floor": {
+			doc: "Experimental. Returns `true` if the input floor id belongs to one of the active indoor floors, `false` otherwise. In case of array of strings, returns `true` if any of the input floor ids belongs to one of the active indoor floors, `false` otherwise. Only supported in filters.",
+			group: "Indoor",
+			experimental: true,
+			"private": true,
+			"sdk-support": {
+				"basic functionality": {
+					js: "3.16.0",
+					android: "11.16.0",
+					ios: "11.16.0"
+				}
+			}
+		},
 		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",
@@ -6458,26 +6472,29 @@ var colorTheme = {
 		}
 	}
 };
-var indoor = {
-	floorplanFeaturesetId: {
+var indoor_source = {
+	sourceId: {
 		type: "string",
-		doc: "An ID of a featureset to be used to query indoor floorplans.",
+		doc: "Source ID of a source to be used to retrieve indoor data.",
 		experimental: true,
+		"private": true,
 		transition: false,
-		"property-type": "data-constant",
-		expression: {
-			interpolated: false
-		}
+		"property-type": "data-constant"
 	},
-	buildingFeaturesetId: {
-		type: "string",
-		doc: "An ID of a featureset to be used to add interactivity for building selection.",
+	sourceLayers: {
+		type: "array",
+		value: "string",
+		doc: "An array of source layers to be used to retrieve indoor data.",
 		experimental: true,
+		"private": true,
 		transition: false,
-		"property-type": "data-constant",
-		expression: {
-			interpolated: false
-		}
+		"property-type": "data-constant"
+	}
+};
+var indoor = {
+	"*": {
+		type: "indoor_source",
+		doc: "Specification of an indoor source - sourceId and sourceLayer required for vector source, for GeoJSON sourceLayers should be omitted."
 	}
 };
 var light = {
@@ -10895,6 +10912,7 @@ var v8 = {
 	rain: rain,
 	camera: camera,
 	colorTheme: colorTheme,
+	indoor_source: indoor_source,
 	indoor: indoor,
 	light: light,
 	projection: projection,
@@ -16581,23 +16599,6 @@ function isStateConstant(e) {
     });
     return result;
 }
-function getConfigDependencies(e) {
-    if (e instanceof Config) {
-        const singleConfig = /* @__PURE__ */
-        new Set([e.key]);
-        return singleConfig;
-    }
-    let result = /* @__PURE__ */
-    new Set();
-    e.eachChild(arg => {
-        result = /* @__PURE__ */
-        new Set([
-            ...result,
-            ...getConfigDependencies(arg)
-        ]);
-    });
-    return result;
-}
 function isGlobalPropertyConstant(e, properties) {
     if (e instanceof CompoundExpression && properties.indexOf(e.name) >= 0) {
         return false;
@@ -18576,6 +18577,21 @@ CompoundExpression.register(expressions, {
         [],
         ctx => ctx.globals.worldview || ''
     ],
+    'is-active-floor': [
+        BooleanType,
+        varargs(StringType),
+        (ctx, args) => {
+            const hasActiveFloors = ctx.globals.activeFloors && ctx.globals.activeFloors.size > 0;
+            if (!hasActiveFloors) {
+                return false;
+            }
+            const floorIds = ctx.globals.activeFloors;
+            return args.some(arg => {
+                const value = arg.evaluate(ctx);
+                return floorIds.has(value);
+            });
+        }
+    ],
     'id': [
         ValueType,
         [],
@@ -19069,6 +19085,36 @@ CompoundExpression.register(expressions, {
     ]
 });
 
+function getConfigDependencies(e) {
+    if (e instanceof Config) {
+        const singleConfig = /* @__PURE__ */
+        new Set([e.key]);
+        return singleConfig;
+    }
+    let result = /* @__PURE__ */
+    new Set();
+    e.eachChild(arg => {
+        result = /* @__PURE__ */
+        new Set([
+            ...result,
+            ...getConfigDependencies(arg)
+        ]);
+    });
+    return result;
+}
+function isIndoorDependent(e) {
+    if (e instanceof CompoundExpression && e.name === 'is-active-floor') {
+        return true;
+    }
+    let result = false;
+    e.eachChild(arg => {
+        if (!result && isIndoorDependent(arg)) {
+            result = true;
+        }
+    });
+    return result;
+}
+
 function success(value) {
     return {
         result: 'success',
@@ -19322,6 +19368,7 @@ class StyleExpression {
         this._defaultValue = propertySpec ? getDefaultValue(propertySpec) : null;
         this._enumValues = propertySpec && propertySpec.type === 'enum' ? propertySpec.values : null;
         this.configDependencies = getConfigDependencies(expression);
+        this.isIndoorDependent = isIndoorDependent(expression);
     }
     evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection, featureTileCoord, featureDistanceData) {
         this._evaluator.globals = globals;
@@ -19383,6 +19430,7 @@ class ZoomConstantExpression {
         this.isLineProgressConstant = isLineProgressConstant;
         this.isStateDependent = kind !== 'constant' && !isStateConstant(expression.expression);
         this.configDependencies = getConfigDependencies(expression.expression);
+        this.isIndoorDependent = isIndoorDependent(expression.expression);
     }
     evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection) {
         return this._styleExpression.evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection);
@@ -19397,6 +19445,7 @@ class ZoomDependentExpression {
         this.zoomStops = zoomStops;
         this._styleExpression = expression;
         this.isStateDependent = kind !== 'camera' && !isStateConstant(expression.expression);
+        this.isIndoorDependent = isIndoorDependent(expression.expression);
         this.isLightConstant = isLightConstant;
         this.isLineProgressConstant = isLineProgressConstant;
         this.configDependencies = getConfigDependencies(expression.expression);
@@ -19495,6 +19544,7 @@ function normalizePropertyExpression(value, specification, scope, options, iconI
             kind: 'constant',
             configDependencies: /* @__PURE__ */
             new Set(),
+            isIndoorDependent: false,
             evaluate: () => constant
         };
     }
@@ -21593,14 +21643,12 @@ function validateNonExpressionFilter(options) {
     case '<':
     case '<=':
     case '>':
-    // @ts-expect-error - falls through
     case '>=':
         if (value.length >= 2 && unbundle(value[1]) === '$type') {
             errors.push(new ValidationError(key, value, `"$type" cannot be use with operator "${ value[0] }"`));
         }
     /* falls through */
     case '==':
-    // @ts-expect-error - falls through
     case '!=':
         if (value.length !== 3) {
             errors.push(new ValidationError(key, value, `filter array for operator "${ value[0] }" must have 3 elements`));
@@ -21662,16 +21710,16 @@ function validateProperty(options, propertyType) {
         return [];
     const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
     if (useThemeMatch && layerSpec[useThemeMatch[1]]) {
-        if (isExpression(value)) {
+        if (isExpression(deepUnbundle(value))) {
             const errors2 = [];
             return errors2.concat(validate({
-                key: options.key,
+                key,
                 value,
                 valueSpec: {
-                    'type': 'string',
-                    'expression': {
-                        'interpolated': false,
-                        'parameters': [
+                    type: 'string',
+                    expression: {
+                        interpolated: false,
+                        parameters: [
                             'zoom',
                             'feature'
                         ]
@@ -21736,7 +21784,6 @@ Use an identity property function instead: ${ example }.`)];
     return errors.concat(validate({
         key: options.key,
         value,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         valueSpec,
         style,
         styleSpec,
@@ -21768,7 +21815,7 @@ function validateAppearance(options) {
             }, options2))
         }
     });
-    if (name !== 'hidden' && !condition) {
+    if (name !== 'hidden' && condition === void 0) {
         errors.push(new ValidationError(options.key, 'name', `Appearance with name different than "hidden" must have a condition`));
     }
     return errors;
@@ -21792,7 +21839,6 @@ function validateProperties(options) {
             layer,
             layerType,
             value: properties[propertyKey],
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             valueSpec: propertyType === 'paint' ? paintProperties[propertyKey] : layoutProperties[propertyKey]
         });
         errors.push(...validateProperty(propertyValidationOptions, propertyType));