@mapbox/mapbox-gl-style-spec 13.28.0 → 14.0.0-beta.2

package/flow-typed/gl-matrix.js

@@ -24,7 +24,6 @@ declare module "gl-matrix" {
         dot(Vec3, Vec3): number,
         equals(Vec3, Vec3): boolean,
         exactEquals(Vec3, Vec3): boolean,
-
         clone<T: Vec3>(T): T,
         normalize<T: Vec3>(T, Vec3): T,
         add<T: Vec3>(T, Vec3, Vec3): T,
@@ -72,6 +71,7 @@ declare module "gl-matrix" {
         mul<T: Mat3>(T, Mat3, Mat3): T,
         multiply<T: Mat3>(T, Mat3, Mat3): T,
         adjoint<T: Mat3>(T, Mat3): T,
+        invert<T: Mat3>(T, Mat3): T,
         transpose<T: Mat3>(T, Mat3): T
     };
 
@@ -94,6 +94,7 @@ declare module "gl-matrix" {
         fromRotation<T: Mat4>(T, number, Vec3): T,
         translate<T: Mat4>(T, Mat4, Vec3): T,
         invert<T: Mat4>(T, Mat4): T,
+        transpose<T: Mat4>(T, Mat4): T,
         copy<T: Mat4>(T, Mat4): T,
         clone<T: Mat4>(T): T
     };
@@ -108,6 +109,7 @@ declare module "gl-matrix" {
         identity<T: Quat>(T): T,
         rotateX<T: Quat>(T, Quat, number): T,
         rotateY<T: Quat>(T, Quat, number): T,
-        rotateZ<T: Quat>(T, Quat, number): T
+        rotateZ<T: Quat>(T, Quat, number): T,
+        rotationTo<T:Quat>(T, Quat, Quat): T 
     }
 }

package/flow-typed/kdbush.js

@@ -0,0 +1,9 @@
+// @flow strict
+declare module 'kdbush' {
+    declare export default class KDBush {
+        constructor(numPoints: number, nodeSize?: number, arrayType?: Class<$ArrayBufferView>): KDBush;
+        add(x: number, y: number): number;
+        finish(): void;
+        range(minX: number, minY: number, maxX: number, maxY: number): Array<number>;
+    }
+}

package/function/convert.js

@@ -5,11 +5,22 @@ import assert from 'assert';
 import type {StylePropertySpecification} from '../style-spec.js';
 import type {ExpressionSpecification} from '../types.js';
 
-function convertLiteral(value) {
+type Stop = [{zoom: number, value: string | number | boolean}, mixed];
+
+type FunctionParameters = {
+    stops: Array<Stop>;
+    base: number;
+    property: string;
+    type: 'identity' | 'exponential' | 'interval' | 'categorical';
+    colorSpace: 'rgb' | 'lab' | 'hcl';
+    default: mixed;
+};
+
+function convertLiteral(value: mixed) {
     return typeof value === 'object' ? ['literal', value] : value;
 }
 
-export default function convertFunction(parameters: any, propertySpec: StylePropertySpecification): ExpressionSpecification {
+export default function convertFunction(parameters: FunctionParameters, propertySpec: StylePropertySpecification): ExpressionSpecification {
     let stops = parameters.stops;
     if (!stops) {
         // identity function
@@ -36,7 +47,7 @@ export default function convertFunction(parameters: any, propertySpec: StyleProp
     }
 }
 
-function convertIdentityFunction(parameters, propertySpec): Array<mixed> {
+function convertIdentityFunction(parameters: FunctionParameters, propertySpec: StylePropertySpecification): Array<mixed> {
     const get = ['get', parameters.property];
 
     if (parameters.default === undefined) {
@@ -60,7 +71,7 @@ function convertIdentityFunction(parameters, propertySpec): Array<mixed> {
     }
 }
 
-function getInterpolateOperator(parameters) {
+function getInterpolateOperator(parameters: FunctionParameters) {
     switch (parameters.colorSpace) {
     case 'hcl': return 'interpolate-hcl';
     case 'lab': return 'interpolate-lab';
@@ -68,7 +79,7 @@ function getInterpolateOperator(parameters) {
     }
 }
 
-function convertZoomAndPropertyFunction(parameters, propertySpec, stops) {
+function convertZoomAndPropertyFunction(parameters: FunctionParameters, propertySpec: StylePropertySpecification, stops: Array<Stop>) {
     const featureFunctionParameters = {};
     const featureFunctionStops = {};
     const zoomStops = [];
@@ -116,12 +127,12 @@ function convertZoomAndPropertyFunction(parameters, propertySpec, stops) {
     }
 }
 
-function coalesce(a, b) {
+function coalesce(a: mixed, b: mixed) {
     if (a !== undefined) return a;
     if (b !== undefined) return b;
 }
 
-function getFallback(parameters, propertySpec) {
+function getFallback(parameters: FunctionParameters, propertySpec: StylePropertySpecification) {
     const defaultValue = convertLiteral(coalesce(parameters.default, propertySpec.default));
 
     /*
@@ -136,7 +147,7 @@ function getFallback(parameters, propertySpec) {
     return defaultValue;
 }
 
-function convertPropertyFunction(parameters, propertySpec, stops) {
+function convertPropertyFunction(parameters: FunctionParameters, propertySpec: StylePropertySpecification, stops: Array<Stop>) {
     const type = getFunctionType(parameters, propertySpec);
     const get = ['get', parameters.property];
     if (type === 'categorical' && typeof stops[0][0] === 'boolean') {
@@ -189,7 +200,7 @@ function convertPropertyFunction(parameters, propertySpec, stops) {
     }
 }
 
-function convertZoomFunction(parameters, propertySpec, stops, input = ['zoom']) {
+function convertZoomFunction(parameters: FunctionParameters, propertySpec: StylePropertySpecification, stops: Array<Stop>, input: Array<string> = ['zoom']) {
     const type = getFunctionType(parameters, propertySpec);
     let expression;
     let isStep = false;
@@ -213,7 +224,7 @@ function convertZoomFunction(parameters, propertySpec, stops, input = ['zoom'])
     return expression;
 }
 
-function fixupDegenerateStepCurve(expression) {
+function fixupDegenerateStepCurve(expression: ExpressionSpecification) {
     // degenerate step curve (i.e. a constant function): add a noop stop
     if (expression[0] === 'step' && expression.length === 3) {
         expression.push(0);
@@ -221,7 +232,7 @@ function fixupDegenerateStepCurve(expression) {
     }
 }
 
-function appendStopPair(curve, input, output, isStep) {
+function appendStopPair(curve: ExpressionSpecification, input: mixed, output: mixed, isStep: boolean) {
     // Skip duplicate stop values. They were not validated for functions, but they are for expressions.
     // https://github.com/mapbox/mapbox-gl-js/issues/4107
     if (curve.length > 3 && input === curve[curve.length - 2]) {
@@ -234,7 +245,7 @@ function appendStopPair(curve, input, output, isStep) {
     curve.push(output);
 }
 
-function getFunctionType(parameters, propertySpec) {
+function getFunctionType(parameters: FunctionParameters, propertySpec: StylePropertySpecification): string {
     if (parameters.type) {
         return parameters.type;
     } else {

package/group_by_layout.js

@@ -4,7 +4,7 @@ import type {LayerSpecification} from './types.js';
 
 import refProperties from './util/ref_properties.js';
 
-function stringify(obj) {
+function stringify(obj: any) {
     if (typeof obj === 'number' || typeof obj === 'boolean' || typeof obj === 'string' || obj === undefined || obj === null)
         return JSON.stringify(obj);
 
@@ -23,7 +23,7 @@ function stringify(obj) {
     return `${str}}`;
 }
 
-function getKey(layer) {
+function getKey(layer: LayerSpecification) {
     let key = '';
     for (const k of refProperties) {
         key += `/${stringify((layer: any)[k])}`;

package/migrate/expressions.js

@@ -27,6 +27,9 @@ export default function(style: StyleSpecification): StyleSpecification {
     eachProperty(style, {paint: true, layout: true}, ({path, value, reference, set}) => {
         if (isExpression(value)) return;
         if (typeof value === 'object' && !Array.isArray(value)) {
+            // $FlowFixMe[prop-missing]
+            // $FlowFixMe[incompatible-call]
+            // $FlowFixMe[incompatible-variance]
             set(convertFunction(value, reference));
             converted.push(path.join('.'));
         } else if (reference.tokens && typeof value === 'string') {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
   "description": "a specification for mapbox gl styles",
-  "version": "13.28.0",
+  "version": "14.0.0-beta.2",
   "author": "Mapbox",
   "keywords": [
     "mapbox",
     "mapbox-gl",
     "mapbox-gl-js"
   ],
-  "license": "ISC",
+  "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.cjs",
   "module": "./dist/index.es.js",
   "type": "module",
@@ -47,7 +47,10 @@
     "json-stringify-pretty-compact": "^2.0.0",
     "minimist": "^1.2.6",
     "rw": "^1.3.3",
-    "sort-object": "^0.3.2"
+    "sort-object": "^0.3.2",
+    "quickselect": "^2.0.0",
+    "tinyqueue": "^2.0.3",
+    "cheap-ruler": "^3.0.1"
   },
   "sideEffects": false
 }