v3.8.0-beta.1

.circleci/config.yml

@@ -71,6 +71,12 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - test-usvg:
+          requires:
+            - setup-playwright
+          filters:
+            tags:
+              only: /.*/
       - test-csp:
           requires:
             - setup-playwright
@@ -365,6 +371,22 @@ jobs:
       - store_test_results:
           path: test/unit/test-results.xml
 
+  test-usvg:
+    <<: *linux-defaults
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run usvg tests
+          command: |
+            tar xvzf test/usvg/test-suite.tar.gz -C test/usvg/
+            npm run test-usvg
+          no_output_timeout: 5m
+      - store_artifacts:
+          path: test/usvg/vitest
+      - store_test_results:
+          path: test/usvg/test-results.xml
+
   test-query:
     <<: *linux-defaults
     steps:

.eslintrc

@@ -9,7 +9,7 @@
     "parserOptions": {
         "projectService": {
             "defaultProject": "./tsconfig.json",
-            "allowDefaultProject": ["*.js"]
+            "allowDefaultProject": ["*.js", "debug/*", "build/*"]
         }
     },
     "plugins": [

.gitignore

@@ -37,3 +37,9 @@ vitest.config.js.*
 
 tsconfig.tsbuildinfo
 bundle-analysis.html
+
+# tmp usvg ignores
+test/usvg/vitest/
+test/usvg/test-suite/
+test/usvg/test-results.xml
+src/data/usvg/usvg_pb_renderer.js

3d-style/data/bucket/model_bucket.ts

@@ -39,12 +39,13 @@ import type {TileFootprint} from '../../../3d-style/util/conflation';
 
 class ModelFeature {
     feature: EvaluationFeature;
+    featureStates: FeatureState;
     instancedDataOffset: number;
     instancedDataCount: number;
 
-    rotation: Array<number>;
-    scale: Array<number>;
-    translation: Array<number>;
+    rotation: vec3;
+    scale: vec3;
+    translation: vec3;
 
     constructor(feature: EvaluationFeature, offset: number) {
         this.feature = feature;
@@ -83,9 +84,7 @@ class ModelBucket implements Bucket {
     stateDependentLayerIds: Array<string>;
     hasPattern: boolean;
 
-    instancesPerModel: {
-        string: PerModelAttributes;
-    };
+    instancesPerModel: Record<string, PerModelAttributes>;
 
     uploaded: boolean;
 
@@ -128,7 +127,6 @@ class ModelBucket implements Bucket {
 
         this.stateDependentLayerIds = this.layers.filter((l) => l.isStateDependent()).map((l) => l.id);
         this.hasPattern = false;
-        // @ts-expect-error - TS2741 - Property 'string' is missing in type '{}' but required in type '{ string: PerModelAttributes; }'.
         this.instancesPerModel = {};
         this.validForExaggeration = 0;
         this.maxVerticalOffset = 0;
@@ -419,8 +417,7 @@ class ModelBucket implements Bucket {
         const color = layer.paint.get('model-color').evaluate(evaluationFeature, featureState, canonical);
 
         color.a = layer.paint.get('model-color-mix-intensity').evaluate(evaluationFeature, featureState, canonical);
-        // @ts-expect-error - TS2322 - Type '[]' is not assignable to type 'mat4'.
-        const rotationScaleYZFlip: mat4 = [];
+        const rotationScaleYZFlip = [] as unknown as mat4;
         if (this.maxVerticalOffset < translation[2]) this.maxVerticalOffset = translation[2];
         this.maxScale = Math.max(Math.max(this.maxScale, scale[0]), Math.max(scale[1], scale[2]));
 

3d-style/data/model.ts

@@ -174,15 +174,13 @@ export function calculateModelMatrix(matrix: mat4, model: Readonly<Model>, state
             if (state.elevation) {
                 elevation = state.elevation.getAtPointOrZero(new MercatorCoordinate(projectedPoint.x / worldSize, projectedPoint.y / worldSize), 0.0);
             }
-            // @ts-expect-error - TS2345 - Argument of type 'number[] | Float32Array | Float64Array' is not assignable to parameter of type 'ReadonlyMat4'.
             const mercProjPos = vec4.transformMat4([] as any, [projectedPoint.x, projectedPoint.y, elevation, 1.0], state.projMatrix);
             const mercProjectionScale = mercProjPos[3] / state.cameraToCenterDistance;
             const viewMetersPerPixel = getMetersPerPixelAtLatitude(state.center.lat, zoom);
             scaleXY = mercProjectionScale;
             scaleZ = mercProjectionScale * viewMetersPerPixel;
         } else if (state.projection.name === 'globe') {
             const globeMatrix = convertModelMatrixForGlobe(matrix, state);
-            // @ts-expect-error - TS2345 - Argument of type 'number[] | Float32Array | Float64Array' is not assignable to parameter of type 'ReadonlyMat4'.
             const worldViewProjection = mat4.multiply([] as any, state.projMatrix, globeMatrix);
             const globeProjPos =  [0, 0, 0, 1];
             vec4.transformMat4(globeProjPos as [number, number, number, number], globeProjPos as [number, number, number, number], worldViewProjection);
@@ -209,32 +207,30 @@ export function calculateModelMatrix(matrix: mat4, model: Readonly<Model>, state
 
     // When applying physics (rotation) we need to insert rotation matrix
     // between model rotation and transforms above. Keep the intermediate results.
-    const modelMatrixBeforeRotationScaleYZFlip = [...matrix];
+    const modelMatrixBeforeRotationScaleYZFlip = [...matrix] as mat4;
 
     const orientation = model.orientation;
 
-    // @ts-expect-error - TS2322 - Type '[]' is not assignable to type 'mat4'.
-    const rotationScaleYZFlip: mat4 = [];
-    rotationScaleYZFlipMatrix(rotationScaleYZFlip,
-                          [orientation[0] + rotation[0],
-                              orientation[1] + rotation[1],
-                              orientation[2] + rotation[2]],
-                           scale);
-    // @ts-expect-error - TS2345 - Argument of type '[number]' is not assignable to parameter of type 'ReadonlyMat4'. | TS2352 - Conversion of type 'mat4' to type '[]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-    mat4.multiply(matrix, modelMatrixBeforeRotationScaleYZFlip as [number], rotationScaleYZFlip as []);
+    const rotationScaleYZFlip = [] as unknown as mat4;
+    rotationScaleYZFlipMatrix(
+        rotationScaleYZFlip,
+        [
+            orientation[0] + rotation[0],
+            orientation[1] + rotation[1],
+            orientation[2] + rotation[2]
+        ],
+        scale
+    );
+    mat4.multiply(matrix, modelMatrixBeforeRotationScaleYZFlip, rotationScaleYZFlip);
 
     if (applyElevation && state.elevation) {
         let elevate = 0;
-        const rotateOnTerrain = [];
+        const rotateOnTerrain = [] as unknown as quat;
         if (followTerrainSlope && state.elevation) {
-            // @ts-expect-error - TS2345 - Argument of type 'any[]' is not assignable to parameter of type 'quat'.
             elevate = positionModelOnTerrain(rotateOnTerrain, state, model.aabb, matrix, position);
-            // @ts-expect-error - TS2345 - Argument of type '[]' is not assignable to parameter of type 'ReadonlyQuat'.
-            const rotationOnTerrain = mat4.fromQuat([] as any, rotateOnTerrain as []);
-            // @ts-expect-error - TS2345 - Argument of type '[]' is not assignable to parameter of type 'ReadonlyMat4'. | TS2352 - Conversion of type 'mat4' to type '[]' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-            const appendRotation = mat4.multiply([] as any, rotationOnTerrain, rotationScaleYZFlip as []);
-            // @ts-expect-error - TS2345 - Argument of type '[number]' is not assignable to parameter of type 'ReadonlyMat4'.
-            mat4.multiply(matrix, modelMatrixBeforeRotationScaleYZFlip as [number], appendRotation);
+            const rotationOnTerrain = mat4.fromQuat([] as unknown as mat4, rotateOnTerrain);
+            const appendRotation = mat4.multiply([] as any, rotationOnTerrain, rotationScaleYZFlip);
+            mat4.multiply(matrix, modelMatrixBeforeRotationScaleYZFlip, appendRotation);
         } else {
             elevate = state.elevation.getAtPointOrZero(new MercatorCoordinate(projectedPoint.x / worldSize, projectedPoint.y / worldSize), 0.0);
         }
@@ -261,8 +257,7 @@ export default class Model {
         this.nodes = nodes;
         this.uploaded = false;
         this.aabb = new Aabb([Infinity, Infinity, Infinity], [-Infinity, -Infinity, -Infinity]);
-        // @ts-expect-error - TS2322 - Type '[]' is not assignable to type 'mat4'.
-        this.matrix = [];
+        this.matrix = [] as unknown as mat4;
     }
 
     _applyTransformations(node: Node, parentMatrix: mat4) {