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

package/expression/types/image_variant.ts

@@ -18,7 +18,8 @@ export type StringifiedImageVariant = Brand<string, 'ImageVariant'>;
  */
 export type RasterizationOptions = {
     params?: Record<string, Color>;
-    transform?: DOMMatrix;
+    sx?: number;
+    sy?: number;
 };
 
 /**
@@ -28,55 +29,42 @@ export type RasterizationOptions = {
  *
  * @private
  */
-export class ImageVariant {
+export class ImageVariant implements RasterizationOptions {
     id: ImageId;
-    options: RasterizationOptions;
+    params?: Record<string, Color>;
+    sx: number;
+    sy: number;
 
     constructor(id: string | ImageIdSpec, options: RasterizationOptions = {}) {
         this.id = ImageId.from(id);
-        this.options = Object.assign({}, options);
-
-        if (!options.transform) {
-            this.options.transform = new DOMMatrix([1, 0, 0, 1, 0, 0]);
-        } else {
-            const {a, b, c, d, e, f} = options.transform;
-            this.options.transform = new DOMMatrix([a, b, c, d, e, f]);
-        }
+        this.params = options.params;
+        this.sx = options.sx || 1;
+        this.sy = options.sy || 1;
     }
 
     toString(): StringifiedImageVariant {
-        const {a, b, c, d, e, f} = this.options.transform;
-
-        const serialized = {
-            name: this.id.name,
-            iconsetId: this.id.iconsetId,
-            params: this.options.params,
-            transform: {a, b, c, d, e, f},
-        };
-
-        return JSON.stringify(serialized) as StringifiedImageVariant;
+        return JSON.stringify(this) as StringifiedImageVariant;
     }
 
     static parse(str: StringifiedImageVariant): ImageVariant | null {
-        let name, iconsetId, params, transform;
+        let id, params, sx, sy;
 
         try {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            ({name, iconsetId, params, transform} = JSON.parse(str) || {});
+            ({id, params, sx, sy} = JSON.parse(str) || {});
         } catch (e) {
             return null;
         }
 
-        if (!name) return null;
+        if (!id) return null;
 
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const {a, b, c, d, e, f} = transform || {};
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        return new ImageVariant({name, iconsetId}, {params, transform: new DOMMatrix([a, b, c, d, e, f])});
+        return new ImageVariant(id as ImageIdSpec, {params, sx, sy});
     }
 
-    scaleSelf(factor: number, yFactor?: number): this {
-        this.options.transform.scaleSelf(factor, yFactor);
+    scaleSelf(factor: number, yFactor: number = factor): this {
+        this.sx *= factor;
+        this.sy *= yFactor;
         return this;
     }
 }

package/package.json

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

package/reference/v8.json

@@ -846,7 +846,6 @@
         "length": 4,
         "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]`."
       },
-      "experimental": true,
       "doc": "An array of additional discrete geographic regions where tiles are available. When used alongside the `bounds` property, these regions act as an additional filter - Mapbox GL will only request tiles that are both within the `bounds` and any of the regions defined in `extra_bounds`. When used independently (without `bounds`), Mapbox GL will request tiles that fall within any of the regions in `extra_bounds`. This allows for more fine-grained control over tile requests, particularly when dealing with sparse data coverage."
     },
     "scheme": {
@@ -936,7 +935,6 @@
         "length": 4,
         "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]`."
       },
-      "experimental": true,
       "doc": "An array of additional discrete geographic regions where tiles are available. When used alongside the `bounds` property, these regions act as an additional filter - Mapbox GL will only request tiles that are both within the `bounds` and any of the regions defined in `extra_bounds`. When used independently (without `bounds`), Mapbox GL will request tiles that fall within any of the regions in `extra_bounds`. This allows for more fine-grained control over tile requests, particularly when dealing with sparse data coverage."
     },
     "minzoom": {
@@ -1028,7 +1026,6 @@
         "length": 4,
         "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]`."
       },
-      "experimental": true,
       "doc": "An array of additional discrete geographic regions where tiles are available. When used alongside the `bounds` property, these regions act as an additional filter - Mapbox GL will only request tiles that are both within the `bounds` and any of the regions defined in `extra_bounds`. When used independently (without `bounds`), Mapbox GL will request tiles that fall within any of the regions in `extra_bounds`. This allows for more fine-grained control over tile requests, particularly when dealing with sparse data coverage."
     },
     "minzoom": {
@@ -1121,7 +1118,6 @@
         "length": 4,
         "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]`."
       },
-      "experimental": true,
       "doc": "An array of additional discrete geographic regions where tiles are available. When used alongside the `bounds` property, these regions act as an additional filter - Mapbox GL will only request tiles that are both within the `bounds` and any of the regions defined in `extra_bounds`. When used independently (without `bounds`), Mapbox GL will request tiles that fall within any of the regions in `extra_bounds`. This allows for more fine-grained control over tile requests, particularly when dealing with sparse data coverage."
     },
     "minzoom": {
@@ -3624,6 +3620,7 @@
       "requires": [
         "text-field"
       ],
+      "appearance": true,
       "sdk-support": {
         "basic functionality": {
           "js": "0.10.0",
@@ -4021,6 +4018,7 @@
       "requires": [
         "text-field"
       ],
+      "appearance": true,
       "sdk-support": {
         "basic functionality": {
           "js": "0.10.0",
@@ -4152,6 +4150,7 @@
           "!": "text-radial-offset"
         }
       ],
+      "appearance": true,
       "sdk-support": {
         "basic functionality": {
           "js": "0.10.0",
@@ -8728,6 +8727,11 @@
           "js": "3.0.0",
           "android": "11.0.0",
           "ios": "11.0.0"
+        },
+        "data-driven styling": {
+          "js": "3.17.0",
+          "android": "11.17.0",
+          "ios": "11.17.0"
         }
       },
       "expression": {
@@ -8737,7 +8741,7 @@
           "measure-light"
         ]
       },
-      "property-type": "data-constant"
+      "property-type": "data-driven"
     },
     "line-border-width": {
       "type": "number",
@@ -10722,7 +10726,8 @@
       "expression": {
         "interpolated": true,
         "parameters": [
-          "zoom"
+          "zoom",
+          "measure-light"
         ]
       },
       "property-type": "data-constant"

package/types.ts

@@ -429,9 +429,6 @@ export type VectorSourceSpecification = {
     "url"?: string,
     "tiles"?: Array<string>,
     "bounds"?: [number, number, number, number],
-    /**
-     * @experimental This property is experimental and subject to change in future versions.
-     */
     "extra_bounds"?: Array<[number, number, number, number]>,
     "scheme"?: "xyz" | "tms",
     "minzoom"?: number,
@@ -447,9 +444,6 @@ export type RasterSourceSpecification = {
     "url"?: string,
     "tiles"?: Array<string>,
     "bounds"?: [number, number, number, number],
-    /**
-     * @experimental This property is experimental and subject to change in future versions.
-     */
     "extra_bounds"?: Array<[number, number, number, number]>,
     "minzoom"?: number,
     "maxzoom"?: number,
@@ -465,9 +459,6 @@ export type RasterDEMSourceSpecification = {
     "url"?: string,
     "tiles"?: Array<string>,
     "bounds"?: [number, number, number, number],
-    /**
-     * @experimental This property is experimental and subject to change in future versions.
-     */
     "extra_bounds"?: Array<[number, number, number, number]>,
     "minzoom"?: number,
     "maxzoom"?: number,
@@ -486,9 +477,6 @@ export type RasterArraySourceSpecification = {
     "url"?: string,
     "tiles"?: Array<string>,
     "bounds"?: [number, number, number, number],
-    /**
-     * @experimental This property is experimental and subject to change in future versions.
-     */
     "extra_bounds"?: Array<[number, number, number, number]>,
     "minzoom"?: number,
     "maxzoom"?: number,
@@ -754,7 +742,7 @@ export type LineLayerSpecification = {
         "line-trim-color"?: PropertyValueSpecification<ColorSpecification>,
         "line-trim-color-transition"?: TransitionSpecification,
         "line-trim-color-use-theme"?: PropertyValueSpecification<string>,
-        "line-emissive-strength"?: PropertyValueSpecification<number>,
+        "line-emissive-strength"?: DataDrivenPropertyValueSpecification<number>,
         "line-emissive-strength-transition"?: TransitionSpecification,
         "line-border-width"?: DataDrivenPropertyValueSpecification<number>,
         "line-border-width-transition"?: TransitionSpecification,