@mapbox/mapbox-gl-style-spec 14.17.0-beta.2 → 14.18.0-beta.1

package/expression/index.ts

@@ -150,13 +150,11 @@ export class StyleExpression {
             }
             return val;
         } catch (e) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            if (!this._warningHistory[e.message]) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                this._warningHistory[e.message] = true;
+            const error = e as Error;
+            if (!this._warningHistory[error.message]) {
+                this._warningHistory[error.message] = true;
                 if (typeof console !== 'undefined') {
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                    console.warn(`Failed to evaluate expression "${JSON.stringify(this.expression.serialize())}". ${e.message}`);
+                    console.warn(`Failed to evaluate expression "${JSON.stringify(this.expression.serialize())}". ${error.message}`);
                 }
             }
             return this._defaultValue;

package/function/index.ts

@@ -129,7 +129,7 @@ export function createFunction(parameters, propertySpec) {
         return {
             kind: 'composite',
             interpolationType,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+
             interpolationFactor: Interpolate.interpolationFactor.bind(undefined, interpolationType),
             // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
             zoomStops: featureFunctionStops.map(s => s[0]),
@@ -150,7 +150,7 @@ export function createFunction(parameters, propertySpec) {
         return {
             kind: 'camera',
             interpolationType,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+
             interpolationFactor: Interpolate.interpolationFactor.bind(undefined, interpolationType),
             // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
             zoomStops: parameters.stops.map(s => s[0]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
-  "version": "14.17.0-beta.2",
+  "version": "14.18.0-beta.1",
   "description": "a specification for mapbox gl styles",
   "author": "Mapbox",
   "license": "SEE LICENSE IN LICENSE.txt",

package/read_style.ts

@@ -8,8 +8,7 @@ export default function readStyle(style: string | Buffer | StyleSpecification):
         try {
             return (jsonlint as {parse: (input: string) => StyleSpecification}).parse(style.toString());
         } catch (e) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-            throw new ParsingError(e);
+            throw new ParsingError(e as Error);
         }
     }
 

package/reference/v8.json

@@ -593,6 +593,19 @@
           "ios": "11.0.0"
         }
       }
+    },
+    "shadow-draw-before-layer": {
+      "type": "string",
+      "property-type": "data-constant",
+      "doc": "Specify a layer before which shadows are drawn on the ground. If not specified, shadows are drawn after the last 3D layer. This property does not affect shadows on terrain.",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "3.18.0",
+          "android": "11.18.0",
+          "ios": "11.18.0"
+        }
+      },
+      "experimental": true
     }
   },
   "properties_light_ambient": {
@@ -1428,6 +1441,10 @@
        },
       "doc": "Type of model source to be added. From single models to represent 2D layers to 3D tiled models covering a wide area."
     },
+    "url": {
+      "type": "string",
+      "doc": "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`. Required if `tiles` is not provided."
+    },
     "maxzoom": {
       "type": "number",
       "default": 18,
@@ -1524,7 +1541,6 @@
             "android": "11.16.0",
             "ios": "11.16.0"
           },
-          "experimental": true,
           "private": true
         },
         "raster": {
@@ -1829,6 +1845,21 @@
             "vector"
           ]
         }]
+    },
+    "model-allow-density-reduction": {
+      "type": "boolean",
+      "default": true,
+      "transition": false,
+      "experimental": true,
+      "doc": "If true, the models will be reduced in density based on the zoom level. This is useful for large datasets that may be slow to render.",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "0.10.0",
+          "android": "2.0.1",
+          "ios": "2.0.0"
+        }
+      },
+      "property-type": "data-constant"
     }
   },
   "layout_clip": {
@@ -2167,6 +2198,7 @@
       },
       "default": "visible",
       "doc": "Whether this layer is displayed.",
+      "private": true,      
       "sdk-support": {
         "basic functionality": {
           "js": "3.16.0",
@@ -2183,7 +2215,6 @@
       "type": "boolean",
       "default": false,
       "doc": "Whether to render facade details on the buildings.",
-      "experimental": true,
       "private": true,
       "sdk-support": {
         "basic functionality": {
@@ -2211,7 +2242,7 @@
       "maximum": 200,
       "default": 3,
       "doc": "Number of floors created when building-facade is enabled.",
-      "experimental": true,
+      "private": true,
       "property-type": "data-driven",
       "sdk-support": {
         "basic functionality": {
@@ -2241,7 +2272,7 @@
       "maximum": 20.0,
       "default": 3.1,
       "doc": "Width of a floor. Think of this as measure how wide each unit should be. This effectively determines the number of units per each floor. Note that this does not affect the ground level facades (i.e. number of windows).",
-      "experimental": true,
+      "private": true,
       "property-type": "data-driven",
       "sdk-support": {
         "basic functionality": {
@@ -2273,7 +2304,7 @@
       "maximum": 1.0,
       "default": [0.9, 0.9],
       "doc": "Given as fractions, specifies the percentage of unit area covered by windows when building-facade is enabled. Note that the area of a unit is ultimately determined by `building-facade-unit-width` and `building-facade-floors`.",
-      "experimental": true,
+      "private": true,
       "property-type": "data-driven",
       "sdk-support": {
         "basic functionality": {
@@ -2324,7 +2355,6 @@
       },
       "default": "flat",
       "doc": "Roof type to use for the procedural buildings.",
-      "experimental": true,
       "private": true,
       "sdk-support": {
         "basic functionality": {
@@ -2353,7 +2383,6 @@
       "units": "meters",
       "doc": "The height of the procedural buildings.",
       "transition": true,
-      "experimental": true,
       "private": true,
       "sdk-support": {
         "basic functionality": {
@@ -2382,7 +2411,6 @@
       "requires": [
         "building-height"
       ],
-      "experimental": true,
       "private": true,
       "sdk-support": {
         "basic functionality": {
@@ -2404,7 +2432,7 @@
     "building-flood-light-wall-radius": {
       "property-type": "data-driven",
       "type": "number",
-      "experimental": true,
+      "private": true,
       "units": "meters",
       "default": 0,
       "minimum": 0,
@@ -2436,7 +2464,7 @@
     "building-flood-light-ground-radius": {
       "property-type": "data-driven",
       "type": "number",
-      "experimental": true,
+      "private": true,
       "units": "meters",
       "default": 0,
       "doc": "The extent of the flood light effect on the ground beneath the buildings in meters.",
@@ -2467,7 +2495,7 @@
     "building-flip-roof-orientation": {
       "property-type": "data-driven",
       "type": "boolean",
-      "experimental": true,
+      "private": true,
       "units": "meters",
       "default": false,
       "doc": "Flips the orientation of the roofs for the buildings. This only affects simple geometries. Namely buildings whose footprints form a quadrilateral. By default (false), the roof ridge takes the direction of the longer edge of the quadrilateral.",
@@ -7915,7 +7943,6 @@
       "maximum": 1,
       "doc": "The opacity of the entire procedural buildings layer. This is rendered on a per-layer, not per-feature, basis, and data-driven styling is not available.",
       "transition": true,
-      "experimental": true,
       "private": true,
       "sdk-support": {
         "basic functionality": {
@@ -7938,7 +7965,6 @@
       "default": 0,
       "minimum": 0,
       "maximum": 1,
-      "experimental": true,
       "private": true,
       "expression": {
         "interpolated": false,
@@ -7961,7 +7987,6 @@
       "default": 0,
       "minimum": 0,
       "maximum": 1,
-      "experimental": true,
       "private": true,
       "expression": {
         "interpolated": true,
@@ -7982,7 +8007,6 @@
     "building-ambient-occlusion-ground-radius": {
       "property-type": "data-constant",
       "type": "number",
-      "experimental": true,
       "private": true,
       "default": 3.0,
       "minimum": 0,
@@ -8005,7 +8029,6 @@
     "building-ambient-occlusion-ground-attenuation": {
       "property-type": "data-constant",
       "type": "number",
-      "experimental": true,
       "private": true,
       "default": 0.69,
       "minimum": 0.0,
@@ -8029,7 +8052,6 @@
     "building-vertical-scale": {
       "property-type": "data-constant",
       "type": "number",
-      "experimental": true,
       "private": true,
       "default": 1.0,
       "minimum": 0.0,
@@ -8054,7 +8076,6 @@
       "default": true,
       "doc": "Enable/Disable shadow casting for this layer",
       "transition": false,
-      "experimental": true,
       "private": true,
       "sdk-support": {
         "basic functionality": {
@@ -8069,7 +8090,6 @@
       "type": "color",
       "default": "rgba(193, 154, 127, 1)",
       "doc": "Color buildings. This can be styled using different building parts (e.g. window, wall, roof).",
-      "experimental": true,
       "private": true,
       "use-theme": true,
       "transition": false,
@@ -8102,7 +8122,6 @@
       "maximum": 5,
       "units": "intensity",
       "doc": "Controls the intensity of light emitted on the source features. 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).",
-      "experimental": true,
       "private": true,
       "sdk-support": {
         "basic functionality": {
@@ -8132,7 +8151,7 @@
       "minimum": 0,
       "maximum": 1,
       "doc": "Given as a fraction specifies the likelihood for the facades to be emissive when building-facade is enabled. A value of 0.0 means the window will never be emissive, while a value of 1.0 means the window will always be emissive. This can be used to create variations on a building where some windows are lit and some are not.",
-      "experimental": true,
+      "private": true,
       "property-type": "data-constant",
       "sdk-support": {
         "basic functionality": {
@@ -8151,6 +8170,7 @@
     },
     "building-cutoff-fade-range": {
       "type": "number",
+      "private": true,      
       "default": 0.0,
       "minimum": 0.0,
       "maximum": 1.0,
@@ -8171,7 +8191,7 @@
     "building-flood-light-color": {
       "property-type": "data-constant",
       "type": "color",
-      "experimental": true,
+      "private": true,
       "default": "#ffffff",
       "doc": "The color of the flood light effect on the walls of the buildings.",
       "requires": [
@@ -8197,7 +8217,7 @@
     "building-flood-light-intensity": {
       "property-type": "data-constant",
       "type": "number",
-      "experimental": true,
+      "private": true,
       "default": 0.0,
       "minimum": 0.0,
       "maximum": 1.0,
@@ -8224,7 +8244,7 @@
     "building-flood-light-ground-attenuation": {
       "property-type": "data-constant",
       "type": "number",
-      "experimental": true,
+      "private": true,
       "default": 0.69,
       "minimum": 0.0,
       "maximum": 1.0,

package/style-spec.ts

@@ -17,6 +17,8 @@ import {eachSource, eachLayer, eachProperty} from './visit';
 import validate from './validate_style';
 import validateMapboxApiSupported from './validate_mapbox_api_supported';
 
+export type * from './types';
+
 type ExpressionType = 'data-driven' | 'color-ramp' | 'data-constant' | 'constant';
 
 type ExpressionParameter =
@@ -32,7 +34,7 @@ type ExpressionParameter =
     | 'distance-from-center'
     | 'raster-particle-speed';
 
-export type ExpressionSpecification = {
+export type PropertyExpressionSpecification = {
     interpolated: boolean,
     parameters?: ExpressionParameter[],
     relaxZoomRestriction?: boolean
@@ -43,7 +45,7 @@ export type ArrayPropertySpecification =
         type: 'array';
         'property-type': ExpressionType;
         value: 'enum';
-        expression?: ExpressionSpecification,
+        expression?: PropertyExpressionSpecification,
         transition?: boolean,
         default?: string[],
         length?: number,
@@ -59,7 +61,7 @@ export type ArrayPropertySpecification =
         type: 'array';
         'property-type': ExpressionType;
         value: 'number';
-        expression?: ExpressionSpecification;
+        expression?: PropertyExpressionSpecification;
         transition?: boolean;
         default?: number[];
         minimum?: number;
@@ -77,7 +79,7 @@ export type ArrayPropertySpecification =
         type: 'array';
         'property-type': ExpressionType;
         value: 'string';
-        expression?: ExpressionSpecification;
+        expression?: PropertyExpressionSpecification;
         transition?: boolean;
         default?: string[];
         length?: number;
@@ -94,7 +96,7 @@ export type ArrayPropertySpecification =
 export type BooleanPropertySpecification = {
     type: 'boolean';
     'property-type': ExpressionType;
-    expression?: ExpressionSpecification;
+    expression?: PropertyExpressionSpecification;
     transition?: boolean;
     default?: boolean;
     overridable?: boolean;
@@ -108,7 +110,7 @@ export type BooleanPropertySpecification = {
 export type ColorPropertySpecification = {
     type: 'color';
     'property-type': ExpressionType;
-    expression?: ExpressionSpecification;
+    expression?: PropertyExpressionSpecification;
     transition?: boolean;
     default?: string;
     'use-theme'?: boolean;
@@ -123,7 +125,7 @@ export type ColorPropertySpecification = {
 export type EnumPropertySpecification = {
     type: 'enum';
     'property-type': ExpressionType;
-    expression?: ExpressionSpecification;
+    expression?: PropertyExpressionSpecification;
     transition?: boolean;
     default?: string;
     values?: {[_: string]: unknown};
@@ -137,7 +139,7 @@ export type EnumPropertySpecification = {
 export type FormattedPropertySpecification = {
     type: 'formatted';
     'property-type': ExpressionType;
-    expression?: ExpressionSpecification;
+    expression?: PropertyExpressionSpecification;
     transition?: boolean;
     default?: string;
     tokens?: boolean;
@@ -150,7 +152,7 @@ export type FormattedPropertySpecification = {
 export type NumberPropertySpecification = {
     type: 'number';
     'property-type': ExpressionType;
-    expression?: ExpressionSpecification;
+    expression?: PropertyExpressionSpecification;
     transition?: boolean;
     default?: number;
     minimum?: number;
@@ -167,7 +169,7 @@ export type NumberPropertySpecification = {
 export type ResolvedImagePropertySpecification = {
     type: 'resolvedImage';
     'property-type': ExpressionType;
-    expression?: ExpressionSpecification;
+    expression?: PropertyExpressionSpecification;
     transition?: boolean;
     default?: string;
     tokens?: boolean;
@@ -181,7 +183,7 @@ export type ResolvedImagePropertySpecification = {
 export type StringPropertySpecification = {
     type: 'string';
     'property-type': ExpressionType;
-    expression?: ExpressionSpecification;
+    expression?: PropertyExpressionSpecification;
     transition?: boolean;
     default?: string;
     tokens?: boolean;

package/test.js

@@ -28,7 +28,6 @@ try {
         execSync(command).toString();
     }
 } catch (error) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    console.log(error.message);
+    console.log(/** @type {Error} */ (error).message);
     process.exit(1);
 }