@mapbox/mapbox-gl-style-spec 13.25.0 → 13.26.0

package/expression/definitions/number_format.js

@@ -28,8 +28,9 @@ declare class Intl$NumberFormat {
 }
 
 type NumberFormatOptions = {
-    style?: 'decimal' | 'currency' | 'percent';
+    style?: 'decimal' | 'currency' | 'percent' | 'unit';
     currency?: null | string;
+    unit?: null | string;
     minimumFractionDigits?: null | string;
     maximumFractionDigits?: null | string;
 };
@@ -39,18 +40,21 @@ export default class NumberFormat implements Expression {
     number: Expression;
     locale: Expression | null;   // BCP 47 language tag
     currency: Expression | null; // ISO 4217 currency code, required if style=currency
+    unit: Expression | null;     // Simple units sanctioned for use in ECMAScript, required if style=unit. https://tc39.es/proposal-unified-intl-numberformat/section6/locales-currencies-tz_proposed_out.html#sec-issanctionedsimpleunitidentifier
     minFractionDigits: Expression | null; // Default 0
     maxFractionDigits: Expression | null; // Default 3
 
     constructor(number: Expression,
                 locale: Expression | null,
                 currency: Expression | null,
+                unit: Expression | null,
                 minFractionDigits: Expression | null,
                 maxFractionDigits: Expression | null) {
         this.type = StringType;
         this.number = number;
         this.locale = locale;
         this.currency = currency;
+        this.unit = unit;
         this.minFractionDigits = minFractionDigits;
         this.maxFractionDigits = maxFractionDigits;
     }
@@ -78,6 +82,12 @@ export default class NumberFormat implements Expression {
             if (!currency) return null;
         }
 
+        let unit = null;
+        if (options['unit']) {
+            unit = context.parse(options['unit'], 1, StringType);
+            if (!unit) return null;
+        }
+
         let minFractionDigits = null;
         if (options['min-fraction-digits']) {
             minFractionDigits = context.parse(options['min-fraction-digits'], 1, NumberType);
@@ -90,14 +100,18 @@ export default class NumberFormat implements Expression {
             if (!maxFractionDigits) return null;
         }
 
-        return new NumberFormat(number, locale, currency, minFractionDigits, maxFractionDigits);
+        return new NumberFormat(number, locale, currency, unit, minFractionDigits, maxFractionDigits);
     }
 
     evaluate(ctx: EvaluationContext): string {
         return new Intl.NumberFormat(this.locale ? this.locale.evaluate(ctx) : [],
             {
-                style: this.currency ? "currency" : "decimal",
+                style:
+                    (this.currency && "currency") ||
+                    (this.unit && "unit") ||
+                    "decimal",
                 currency: this.currency ? this.currency.evaluate(ctx) : undefined,
+                unit: this.unit ? this.unit.evaluate(ctx) : undefined,
                 minimumFractionDigits: this.minFractionDigits ? this.minFractionDigits.evaluate(ctx) : undefined,
                 maximumFractionDigits: this.maxFractionDigits ? this.maxFractionDigits.evaluate(ctx) : undefined,
             }).format(this.number.evaluate(ctx));
@@ -111,6 +125,9 @@ export default class NumberFormat implements Expression {
         if (this.currency) {
             fn(this.currency);
         }
+        if (this.unit) {
+            fn(this.unit);
+        }
         if (this.minFractionDigits) {
             fn(this.minFractionDigits);
         }
@@ -131,6 +148,9 @@ export default class NumberFormat implements Expression {
         if (this.currency) {
             options['currency'] = this.currency.serialize();
         }
+        if (this.unit) {
+            options['unit'] = this.unit.serialize();
+        }
         if (this.minFractionDigits) {
             options['min-fraction-digits'] = this.minFractionDigits.serialize();
         }

package/expression/evaluation_context.js

@@ -35,7 +35,7 @@ class EvaluationContext {
     }
 
     id(): number | null {
-        return this.feature && 'id' in this.feature && this.feature.id ? this.feature.id : null;
+        return this.feature && this.feature.id !== undefined ? this.feature.id : null;
     }
 
     geometryType(): null | string {

package/flow-typed/gl-matrix.js

@@ -77,6 +77,7 @@ declare module "gl-matrix" {
         create(): Float32Array,
 
         fromScaling<T: Mat4>(T, Vec3): T,
+        fromTranslation<T: Mat4>(T, Vec3): T,
         fromQuat<T: Mat4>(T, Quat): T,
         ortho<T: Mat4>(T, number, number, number, number, number, number): T,
         perspective<T: Mat4>(T, number, number, number, number): T,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
   "description": "a specification for mapbox gl styles",
-  "version": "13.25.0",
+  "version": "13.26.0",
   "author": "Mapbox",
   "keywords": [
     "mapbox",
@@ -45,7 +45,7 @@
     "@mapbox/unitbezier": "^0.0.0",
     "csscolorparser": "~1.0.2",
     "json-stringify-pretty-compact": "^2.0.0",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "rw": "^1.3.3",
     "sort-object": "^0.3.2"
   },

package/reference/v8.json

@@ -877,6 +877,20 @@
         }
       },
       "property-type": "constant"
+    },
+    "fill-extrusion-edge-radius": {
+      "type": "number",
+      "private": true,
+      "default": 0,
+      "minimum": 0,
+      "maximum": 1,
+      "doc": "Radius of a fill extrusion edge in meters. If not zero, rounds extrusion edges for a smoother appearance.",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "v2.10.0"
+        }
+      },
+      "property-type": "constant"
     }
   },
   "layout_line": {
@@ -3046,7 +3060,7 @@
         }
       },
       "number-format": {
-        "doc": "Converts the input number into a string representation using the providing formatting rules. If set, the `locale` argument specifies the locale to use, as a BCP 47 language tag. If set, the `currency` argument specifies an ISO 4217 code to use for currency-style formatting. If set, the `min-fraction-digits` and `max-fraction-digits` arguments specify the minimum and maximum number of fractional digits to include.",
+        "doc": "Converts the input number into a string representation using the providing formatting rules. If set, the `locale` argument specifies the locale to use, as a BCP 47 language tag. If set, the `currency` argument specifies an ISO 4217 code to use for currency-style formatting. If set, the `unit` argument specifies a [simple ECMAScript unit](https://tc39.es/proposal-unified-intl-numberformat/section6/locales-currencies-tz_proposed_out.html#sec-issanctionedsimpleunitidentifier) to use for unit-style formatting. If set, the `min-fraction-digits` and `max-fraction-digits` arguments specify the minimum and maximum number of fractional digits to include.",
         "group": "Types",
         "sdk-support": {
           "basic functionality": {
@@ -3736,7 +3750,9 @@
         "sdk-support": {
           "basic functionality": {
             "js": "0.45.0",
-            "android": "6.6.0"
+            "android": "6.6.0",
+            "ios": "4.1.0",
+            "macos": "0.8.0"
           }
         }
       },
@@ -4655,6 +4671,51 @@
         ]
       },
       "property-type": "data-constant"
+    },
+    "fill-extrusion-ambient-occlusion-intensity": {
+      "property-type": "data-constant",
+      "type": "number",
+      "private": true,
+      "default": 0.0,
+      "minimum": 0,
+      "maximum": 1,
+      "expression": {
+        "interpolated": true,
+        "parameters": [
+          "zoom"
+        ]
+      },
+      "transition": true,
+      "doc": "Controls the intensity of ambient occlusion (AO) shading. Current AO implementation is a low-cost best-effort approach that shades area near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "2.10.0",
+          "android": "10.7.0",
+          "ios": "10.7.0"
+        }
+      }
+    },
+    "fill-extrusion-ambient-occlusion-radius": {
+      "property-type": "data-constant",
+      "type": "number",
+      "private": true,
+      "default": 3.0,
+      "minimum": 0,
+      "expression": {
+        "interpolated": true,
+        "parameters": [
+          "zoom"
+        ]
+      },
+      "transition": true,
+      "doc": "The radius of ambient occlusion (AO) shading, in meters. Current AO implementation is a low-cost best-effort approach that shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to hight of one floor and brings the most plausible results for buildings.",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "2.10.0",
+          "android": "10.7.0",
+          "ios": "10.7.0"
+        }
+      }
     }
   },
   "paint_line": {

package/types.js

@@ -367,7 +367,8 @@ export type FillExtrusionLayerSpecification = {|
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
     "layout"?: {|
-        "visibility"?: "visible" | "none"
+        "visibility"?: "visible" | "none",
+        "fill-extrusion-edge-radius"?: number
     |},
     "paint"?: {|
         "fill-extrusion-opacity"?: PropertyValueSpecification<number>,
@@ -377,7 +378,9 @@ export type FillExtrusionLayerSpecification = {|
         "fill-extrusion-pattern"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>,
         "fill-extrusion-height"?: DataDrivenPropertyValueSpecification<number>,
         "fill-extrusion-base"?: DataDrivenPropertyValueSpecification<number>,
-        "fill-extrusion-vertical-gradient"?: PropertyValueSpecification<boolean>
+        "fill-extrusion-vertical-gradient"?: PropertyValueSpecification<boolean>,
+        "fill-extrusion-ambient-occlusion-intensity"?: PropertyValueSpecification<number>,
+        "fill-extrusion-ambient-occlusion-radius"?: PropertyValueSpecification<number>
     |}
 |}