Skip to content

Commit f07d98c

Browse files
stepankuzmingithub-actions[bot]
stepankuzmin
authored and
github-actions[bot]
committed
Add more type annotations
GitOrigin-RevId: 231e174cc5d525e55ad2d5ebb281e0d17c9e429f
1 parent 8ded4ad commit f07d98c

41 files changed

Lines changed: 135 additions & 247 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ class ModelBucket implements Bucket {
556556
const color = Object.assign({}, layer.paint.get('model-color').evaluate(evaluationFeature, featureState, canonical));
557557
color.a = layer.paint.get('model-color-mix-intensity').evaluate(evaluationFeature, featureState, canonical);
558558

559-
const rotationScaleYZFlip = [];
559+
const rotationScaleYZFlip: mat4 = [];
560560
if (this.maxVerticalOffset < translation[2]) this.maxVerticalOffset = translation[2];
561561

562562
// Track per model and per bucket maximum scaling as well as per instance translation
@@ -605,23 +605,14 @@ class ModelBucket implements Bucket {
605605
const roadElevationContribution = perModelVertexArray.instancesRoadElevation ? perModelVertexArray.instancesRoadElevation[instanceOffset] : 0;
606606
va[offset + 6] = translation[2] + roadElevationContribution + terrainElevationContribution;
607607
// Elements [7..16] Instance modelMatrix holds combined rotation and scale 3x3,
608-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
609608
va[offset + 7] = rotationScaleYZFlip[0];
610-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
611609
va[offset + 8] = rotationScaleYZFlip[1];
612-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
613610
va[offset + 9] = rotationScaleYZFlip[2];
614-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
615611
va[offset + 10] = rotationScaleYZFlip[4];
616-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
617612
va[offset + 11] = rotationScaleYZFlip[5];
618-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
619613
va[offset + 12] = rotationScaleYZFlip[6];
620-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
621614
va[offset + 13] = rotationScaleYZFlip[8];
622-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
623615
va[offset + 14] = rotationScaleYZFlip[9];
624-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
625616
va[offset + 15] = rotationScaleYZFlip[10];
626617
perModelVertexArray.instancesEvaluatedElevation[instanceOffset] = translation[2];
627618
}

‎3d-style/render/draw_model.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ function drawInstancedNode(painter: Painter, layer: ModelStyleLayer, node: Model
940940
const dynamicBuffers = [];
941941
let program: Program<ModelUniformsType | ModelDepthUniformsType>;
942942
let uniformValues: UniformValues<ModelUniformsType | ModelDepthUniformsType>;
943-
let colorMode;
943+
let colorMode: ColorMode;
944944

945945
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
946946
const useInstancing = !isGlobe && (modelInstances.instancedDataArray.length > minimumInstanceCount);
@@ -1006,7 +1006,6 @@ function drawInstancedNode(painter: Painter, layer: ModelStyleLayer, node: Model
10061006
if (useInstancing) {
10071007
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
10081008
dynamicBuffers.push(modelInstances.instancedDataBuffer);
1009-
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
10101009
program.draw(painter, context.gl.TRIANGLES, depthMode, StencilMode.disabled, colorMode, cullFaceMode,
10111010
uniformValues, layer.id, mesh.vertexBuffer, mesh.indexBuffer, mesh.segments, layer.paint, painter.transform.zoom,
10121011
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
@@ -1017,7 +1016,6 @@ function drawInstancedNode(painter: Painter, layer: ModelStyleLayer, node: Model
10171016
for (let i = 0; i < modelInstances.instancedDataArray.length; ++i) {
10181017
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
10191018
uniformValues[instanceUniform] = new Float32Array(modelInstances.instancedDataArray.arrayBuffer, i * 64, 16);
1020-
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
10211019
program.draw(painter, context.gl.TRIANGLES, depthMode, StencilMode.disabled, colorMode, cullFaceMode,
10221020
uniformValues, layer.id, mesh.vertexBuffer, mesh.indexBuffer, mesh.segments, layer.paint, painter.transform.zoom,
10231021
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -1094,7 +1092,9 @@ function drawBatchedModels(painter: Painter, source: SourceCache, layer: ModelSt
10941092
// Keyed by ID to deduplicate footprints across tiles
10951093
const footprints = new Map<string, {node: ModelNode, mvp: mat4}>();
10961094

1097-
let start, end, step;
1095+
let start: number;
1096+
let end: number;
1097+
let step: number;
10981098
// When front cutoff is enabled the tiles are iterated in back to front order
10991099
if (frontCutoffEnabled) {
11001100
start = coords.length - 1;
@@ -1110,9 +1110,7 @@ function drawBatchedModels(painter: Painter, source: SourceCache, layer: ModelSt
11101110
const cameraPosTileCoord = vec3.create();
11111111
const cameraPointTileCoord = new Point(0.0, 0.0);
11121112

1113-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
11141113
for (let i = start; i !== end; i += step) {
1115-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
11161114
const coord = coords[i];
11171115
const tile = source.getTile(coord);
11181116
const bucket = tile.getBucket(layer) as Tiled3dModelBucket | null | undefined;
@@ -1332,7 +1330,7 @@ function drawBatchedModels(painter: Painter, source: SourceCache, layer: ModelSt
13321330
}
13331331

13341332
const material = mesh.material;
1335-
let occlusionTextureTransform;
1333+
let occlusionTextureTransform: [number, number, number, number] | undefined;
13361334
// Handle Texture transform
13371335
if (material.occlusionTexture && material.occlusionTexture.offsetScale) {
13381336
occlusionTextureTransform = material.occlusionTexture.offsetScale;
@@ -1370,7 +1368,6 @@ function drawBatchedModels(painter: Painter, source: SourceCache, layer: ModelSt
13701368
emissiveStrength,
13711369
layer,
13721370
[0, 0, 0],
1373-
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
13741371
occlusionTextureTransform
13751372
);
13761373

‎3d-style/render/shadow_renderer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,8 +723,8 @@ function createLightMatrix(
723723
const farMinusNear = far - near;
724724
const farPlusNear = far + near;
725725

726-
let centerDepth;
727-
let radius;
726+
let centerDepth: number;
727+
let radius: number;
728728
if (k2 > farMinusNear / farPlusNear) {
729729
centerDepth = far;
730730
radius = far * k;

‎src/data/bucket/line_bucket.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -362,30 +362,27 @@ class LineBucket implements Bucket {
362362

363363
if (dashPropertyValue.kind === 'constant' && capPropertyValue.kind === 'constant') continue;
364364

365-
let dashArray, cap;
365+
let dashArray: Array<number>;
366+
let cap: string;
366367

367368
if (dashPropertyValue.kind === 'constant') {
368369
dashArray = dashPropertyValue.value;
369370
if (!dashArray) continue;
370371

371372
} else {
372-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
373373
dashArray = dashPropertyValue.evaluate({zoom}, feature);
374374
}
375375

376376
if (capPropertyValue.kind === 'constant') {
377377
cap = capPropertyValue.value;
378378

379379
} else {
380-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
381380
cap = capPropertyValue.evaluate({zoom}, feature);
382381
}
383382

384-
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
385383
lineAtlas.addDash(dashArray, cap);
386384

387385
// save positions for paint array
388-
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
389386
feature.patterns[layer.id] = [lineAtlas.getKey(dashArray, cap)];
390387
}
391388

‎src/data/feature_index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class FeatureIndex {
155155
}
156156

157157
const result: QueryResult = {};
158-
let previousIndex;
158+
let previousIndex: number | undefined;
159159
for (let k = 0; k < matching.length; k++) {
160160
const index = matching[k];
161161

‎src/data/feature_position_map.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export default class FeaturePositionMap {
7272
// so TypedArray vs Array distinction that TS points out doesn't matter
7373
map.ids = obj.ids as unknown as number[];
7474
map.positions = obj.positions as unknown as number[];
75-
let prev;
75+
let prev: number | undefined;
7676
for (const id of map.ids) {
7777
if (id !== prev) map.uniqueIds.push(id);
7878
prev = id;

‎src/geo/projection/far_z.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function farthestPixelDistanceOnSphere(tr: Transform, pixelsPerMeter: num
6868
const pointOnGlobe = [];
6969
const ray = new Ray(cameraPosition, dir);
7070

71-
let pixelDistance;
71+
let pixelDistance: number;
7272
if (ray.closestPointOnSphere(globeCenter, globeRadius, pointOnGlobe)) {
7373
const p0 = vec3.add([], pointOnGlobe, globeCenter);
7474
const p1 = vec3.sub([], p0, cameraPosition);

‎src/geo/projection/projection.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ export default class Projection {
124124
}
125125

126126
createTileMatrix(tr: Transform, worldSize: number, id: UnwrappedTileID): mat4 {
127-
let scale, scaledX, scaledY;
127+
let scale: number;
128+
let scaledX: number;
129+
let scaledY: number;
128130
const canonical = id.canonical;
129131
const posMatrix = mat4.identity(new Float64Array(16));
130132

‎src/geo/transform.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1745,7 +1745,8 @@ class Transform {
17451745
get pixelsPerMeterRatio(): number { return this.pixelsPerMeter / mercatorZfromAltitude(1, this.center.lat) / this.worldSize; }
17461746

17471747
setLocationAtPoint(lnglat: LngLat, point: Point) {
1748-
let x, y;
1748+
let x: number;
1749+
let y: number;
17491750
const centerPoint = this.centerPoint;
17501751

17511752
if (this.projection.name === 'globe') {

‎src/render/draw_fill.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ import type VertexBuffer from '../gl/vertex_buffer';
3333
import type {ElevationType} from '../../3d-style/elevation/elevation_constants';
3434
import type Transform from '../geo/transform';
3535
import type Program from './program';
36+
import type {DrawMode} from './program';
3637
import type {DepthPrePass} from './painter';
3738
import type MercatorCoordinate from '../geo/mercator_coordinate';
3839
import type {UniformValues} from './uniform_binding';
3940
import type SegmentVector from '../data/segment';
41+
import type IndexBuffer from '../gl/index_buffer';
4042
import type ProgramConfiguration from '../data/program_configuration';
4143
import type {
4244
FillUniformsType,
@@ -375,7 +377,9 @@ function drawFillTiles(params: DrawFillParams, elevatedGeometry: boolean, multip
375377
let programName: 'fillPattern' | 'fill' | 'fillOutlinePattern' | 'fillOutline';
376378
let uniformValues: UniformValues<FillUniformsType | FillPatternUniformsType>;
377379

378-
let drawMode, indexBuffer, segments;
380+
let drawMode: DrawMode;
381+
let indexBuffer: IndexBuffer;
382+
let segments: SegmentVector;
379383
if (!isOutline) {
380384
programName = image ? 'fillPattern' : 'fill';
381385
drawMode = gl.TRIANGLES;
@@ -473,10 +477,8 @@ function drawFillTiles(params: DrawFillParams, elevatedGeometry: boolean, multip
473477
activeDepthMode = depthModeFor3D;
474478
}
475479

476-
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
477480
program.draw(painter, drawMode, activeDepthMode,
478481
stencilModeOverride ? stencilModeOverride : painter.stencilModeForClipping(coord), colorMode, CullFaceMode.disabled, uniformValues,
479-
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
480482
layer.id, bufferData.layoutVertexBuffer, indexBuffer, segments,
481483
layer.paint, painter.transform.zoom, programConfiguration, dynamicBuffers);
482484
}

0 commit comments

Comments
 (0)