Fix some TypeScript suppressions (internal-6322)

GitOrigin-RevId: 0faff52ef1a09b3e45902e77edb1673cc88368b6

Author: stepankuzmin

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

@@ -593,7 +593,7 @@ class Tiled3dModelBucket implements Bucket {
         hidden: boolean;
         verticalScale: number;
     } | null | undefined {
-        const candidates = [];
+        const candidates: number[] = [];
 
         const tmpVertex = [0, 0, 0];
 
@@ -620,7 +620,6 @@ class Tiled3dModelBucket implements Bucket {
             const heightValue = mesh.heightmap[heightmapIndex];
             if (heightValue < 0 && nodeInfo.node.footprint) {
                 // unpopulated cell. If it is in the building footprint, return undefined height
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 nodeInfo.node.footprint.grid.query(new Point(x, y), new Point(x, y), candidates);
                 if (candidates.length > 0) {
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -629,8 +628,7 @@ class Tiled3dModelBucket implements Bucket {
                 continue;
             }
             if (nodeInfo.hiddenByReplacement) return; // better luck with the next source
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            return {height: heightValue, maxHeight: nodeInfo.feature.properties["height"], hidden: false, verticalScale: nodeInfo.evaluatedScale[2]};
+            return {height: heightValue, maxHeight: nodeInfo.feature.properties["height"] as number, hidden: false, verticalScale: nodeInfo.evaluatedScale[2]};
         }
     }
 }
@@ -669,7 +667,7 @@ function addPBRVertex(vertexArray: FeatureVertexArray, color: number, colorMix:
     const emissionMultiplierValueStart = clamp(heightBasedEmissionMultiplierParams[2], 0, 1);
     const emissionMultiplierValueFinish = clamp(heightBasedEmissionMultiplierParams[3], 0, 1);
 
-    let a3, b0, b1, b2;
+    let a3: number, b0: number, b1: number, b2: number;
 
     if (emissionMultiplierStart !== emissionMultiplierFinish && zMax !== zMin &&
         emissionMultiplierFinish !== emissionMultiplierStart) {
@@ -687,13 +685,11 @@ function addPBRVertex(vertexArray: FeatureVertexArray, color: number, colorMix:
         b2 = 1;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     vertexArray.emplaceBack(a0, a1, a2, a3, b0, b1, b2);
     if (lightsFeatureArray) {
         const size = lightsFeatureArray.length;
         lightsFeatureArray.clear();
         for (let j = 0; j < size; j++) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             lightsFeatureArray.emplaceBack(a0, a1, a2, a3, b0, b1, b2);
         }
     }
@@ -708,11 +704,8 @@ function updateNodeFeatureVertices(nodeInfo: Tiled3dModelFeature, doorLightChang
         if (!mesh.featureData) continue;
         // initialize featureArray
         mesh.featureArray = new FeatureVertexArray();
-        // @ts-expect-error - TS2339 - Property 'length' does not exist on type 'ArrayBufferView'.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         mesh.featureArray.reserve(mesh.featureData.length);
         let pendingDoorLightUpdate = doorLightChanged;
-        // @ts-expect-error - TS2488 - Type 'ArrayBufferView' must have a '[Symbol.iterator]()' method that returns an iterator.
         for (const feature of mesh.featureData) {
             // V1 and V2 tiles have a different bit structure
             // In V2, meshopt compression forces to use values less than 2^24 to not lose any information

3d-style/data/model.ts

@@ -84,7 +84,7 @@ export type Mesh = {
     texcoordBuffer: VertexBuffer;
     colorArray: StructArray;
     colorBuffer: VertexBuffer;
-    featureData: ArrayBufferView;
+    featureData: Uint32Array | Float32Array;
     featureArray: FeatureVertexArray;
     pbrBuffer: VertexBuffer;
     material: Material;

3d-style/source/model_loader.ts

@@ -72,11 +72,9 @@ class Tiled3dWorkerTile {
         load3DTile(data)
             .then(gltf => {
                 if (!gltf) return callback(new Error('Could not parse tile'));
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-                const hasMapboxMeshFeatures = (gltf.json.extensionsUsed && gltf.json.extensionsUsed.includes('MAPBOX_mesh_features')) ||
-                                            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                const hasMapboxMeshFeatures: boolean = (gltf.json.extensionsUsed && gltf.json.extensionsUsed.includes('MAPBOX_mesh_features')) ||
                                             (gltf.json.asset.extras && gltf.json.asset.extras['MAPBOX_mesh_features']);
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+
                 const hasMeshoptCompression = gltf.json.extensionsUsed && gltf.json.extensionsUsed.includes('EXT_meshopt_compression');
 
                 const parameters = new EvaluationParameters(this.zoom, {brightness: this.brightness, worldview: this.worldview});
@@ -87,7 +85,7 @@ class Tiled3dWorkerTile {
                         layer.recalculate(parameters, []);
                         // Nodes are created per layer which allows styling when multiple model layers are referencing the same source
                         const nodes = process3DTile(gltf, 1.0 / tileToMeter(params.tileID.canonical));
-                        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+
                         const bucket = new Tiled3dModelBucket(family as Array<ModelStyleLayer>, nodes, tileID, hasMapboxMeshFeatures, hasMeshoptCompression, this.brightness, featureIndex, this.worldview);
                         // Upload to GPU without waiting for evaluation if we are in diffuse path
                         if (!hasMapboxMeshFeatures) bucket.needsUpload = true;
@@ -109,8 +107,7 @@ class Tiled3dWorkerTile {
                     brightness: null,
                 });
             })
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
-            .catch((err) => callback(new Error(err.message)));
+            .catch((err: Error) => callback(new Error(err.message)));
     }
 }