improve types

CommanderStorm · CommanderStorm · commit 1abdb88f418b · 2026-04-16T20:34:12.000+02:00
diff --git a/src/geo/projection/globe_projection.ts b/src/geo/projection/globe_projection.ts
@@ -12,7 +12,7 @@ import {type CanonicalTileID} from '../../tile/tile_id';
 import {type Mesh} from '../../render/mesh';
 
 type ProjectionProps = {
-    type: DataConstantProperty<ProjectionDefinition>;
+    type: DataConstantProperty<ProjectionDefinitionSpecification>;
 };
 
 type ProjectionPossiblyEvaluated = {
diff --git a/src/style/style.ts b/src/style/style.ts
@@ -56,7 +56,9 @@ import type {
     DiffOperations,
     ProjectionSpecification,
     SkySpecification,
-    StateSpecification
+    StateSpecification,
+    AllPaintProperties,
+    AllLayoutProperties,
 } from '@maplibre/maplibre-gl-style-spec';
 import type {CanvasSourceSpecification} from '../source/canvas_source';
 import type {CustomLayerInterface} from './style_layer/custom_style_layer';
@@ -1315,7 +1317,7 @@ export class Style extends Evented {
         return clone(this.getLayer(layer).filter);
     }
 
-    setLayoutProperty(layerId: string, name: string, value: any,  options: StyleSetterOptions = {}) {
+    setLayoutProperty<K extends keyof AllLayoutProperties>(layerId: string, name: K, value: AllLayoutProperties[K],  options: StyleSetterOptions = {}) {
         this._checkLoaded();
 
         const layer = this.getLayer(layerId);
@@ -1336,7 +1338,7 @@ export class Style extends Evented {
      * @param name - the name of the layout property
      * @returns the property value
      */
-    getLayoutProperty(layerId: string, name: string) {
+    getLayoutProperty<K extends keyof AllLayoutProperties>(layerId: string, name: K): AllLayoutProperties[K] | undefined {
         const layer = this.getLayer(layerId);
         if (!layer) {
             this.fire(new ErrorEvent(new Error(`Cannot get style of non-existing layer "${layerId}".`)));
@@ -1346,7 +1348,7 @@ export class Style extends Evented {
         return layer.getLayoutProperty(name);
     }
 
-    setPaintProperty(layerId: string, name: string, value: any, options: StyleSetterOptions = {}) {
+    setPaintProperty<K extends keyof AllPaintProperties>(layerId: string, name: K, value: AllPaintProperties[K], options: StyleSetterOptions = {}) {
         this._checkLoaded();
 
         const layer = this.getLayer(layerId);
@@ -1360,14 +1362,14 @@ export class Style extends Evented {
         this._updatePaintProperty(layer, name, value, options);
     }
 
-    _updatePaintProperty(layer: StyleLayer, name: string, value: any, options: StyleSetterOptions = {}) {
+    _updatePaintProperty<K extends keyof AllPaintProperties>(layer: StyleLayer, name: K, value: AllPaintProperties[K], options: StyleSetterOptions = {}) {
         const requiresRelayout = layer.setPaintProperty(name, value, options);
         if (requiresRelayout) {
             this._updateLayer(layer);
         }
 
         if (isRasterStyleLayer(layer) && name === 'raster-fade-duration') {
-            this.tileManagers[layer.source].setRasterFadeDuration(value);
+            this.tileManagers[layer.source].setRasterFadeDuration(value as number);
         }
 
         this._changed = true;
@@ -1376,7 +1378,7 @@ export class Style extends Evented {
         this._serializedLayers = null;
     }
 
-    getPaintProperty(layer: string, name: string) {
+    getPaintProperty<K extends keyof AllPaintProperties>(layer: string, name: K): AllPaintProperties[K] {
         return this.getLayer(layer).getPaintProperty(name);
     }
 
diff --git a/src/style/style_layer.ts b/src/style/style_layer.ts
@@ -18,7 +18,9 @@ import type {
     LayerSpecification,
     FilterSpecification,
     VisibilitySpecification,
-    VisibilityExpression
+    VisibilityExpression,
+    AllPaintProperties,
+    AllLayoutProperties,
 } from '@maplibre/maplibre-gl-style-spec';
 import type {TransitionParameters, PropertyValue} from './properties';
 import {type EvaluationParameters} from './evaluation_parameters';
@@ -32,6 +34,8 @@ import {type mat4} from 'gl-matrix';
 import type {UnwrappedTileID} from '../tile/tile_id';
 import type {VectorTileFeatureLike} from '@maplibre/vt-pbf';
 
+type PaintPropertyEntry = { [K in keyof AllPaintProperties]: {name: K; value: AllPaintProperties[K]} }[keyof AllPaintProperties];
+
 export type QueryIntersectsFeatureParams = {
     /**
      * The geometry to check intersection with.
@@ -153,10 +157,10 @@ export abstract class StyleLayer extends Evented {
             this._transitionablePaint = new Transitionable(properties.paint, globalState);
 
             for (const property in layer.paint) {
-                this.setPaintProperty(property, layer.paint[property], {validate: false});
+                this.setPaintProperty(property as keyof AllPaintProperties, layer.paint[property as keyof typeof layer.paint], {validate: false});
             }
             for (const property in layer.layout) {
-                this.setLayoutProperty(property, layer.layout[property], {validate: false});
+                this.setLayoutProperty(property as keyof AllLayoutProperties, layer.layout[property as keyof typeof layer.layout], {validate: false});
             }
 
             this._transitioningPaint = this._transitionablePaint.untransitioned();
@@ -174,9 +178,9 @@ export abstract class StyleLayer extends Evented {
         return this._crossfadeParameters;
     }
 
-    getLayoutProperty(name: string) {
+    getLayoutProperty<K extends keyof AllLayoutProperties>(name: K): AllLayoutProperties[K] {
         if (name === 'visibility') {
-            return this.visibility;
+            return this.visibility as AllLayoutProperties[K];
         }
         if (this._transitionablePaint?.hasProperty(name)) {
             throw new Error(name + ERROR_PAINT_NOT_LAYOUT);
@@ -221,16 +225,16 @@ export abstract class StyleLayer extends Evented {
      * This is used to determine if layer needs to be repainted when global state property changes.
      *
      */
-    getPaintAffectingGlobalStateRefs(): globalThis.Map<string, Array<{name: string; value: any}>> {
-        const globalStateRefs = new globalThis.Map<string, Array<{name: string; value: any}>>();
+    getPaintAffectingGlobalStateRefs(): globalThis.Map<string, Array<PaintPropertyEntry>> {
+        const globalStateRefs = new globalThis.Map<string, Array<PaintPropertyEntry>>();
 
         if (this._transitionablePaint) {
             for (const propertyName in this._transitionablePaint._values) {
                 const value = this._transitionablePaint._values[propertyName].value;
 
                 for (const globalStateRef of value.getGlobalStateRefs()) {
                     const properties = globalStateRefs.get(globalStateRef) ?? [];
-                    properties.push({name: propertyName, value: value.value});
+                    properties.push({name: propertyName as keyof AllPaintProperties, value: value.value} as PaintPropertyEntry);
                     globalStateRefs.set(globalStateRef, properties);
                 }
             }
@@ -247,10 +251,10 @@ export abstract class StyleLayer extends Evented {
         return this._visibilityExpression.getGlobalStateRefs();
     }
 
-    setLayoutProperty(name: string, value: any, options: StyleSetterOptions = {}) {
+    setLayoutProperty<K extends keyof AllLayoutProperties>(name: K, value: AllLayoutProperties[K], options: StyleSetterOptions = {}) {
         if (name === 'visibility') {
-            this.visibility = value;
-            this._visibilityExpression.setValue(value);
+            this.visibility = value as VisibilitySpecification;
+            this._visibilityExpression.setValue(value as VisibilitySpecification);
             this.recalculateVisibility();
             return;
         }
@@ -265,23 +269,23 @@ export abstract class StyleLayer extends Evented {
         this._unevaluatedLayout.setValue(name, value);
     }
 
-    getPaintProperty(name: string) {
+    getPaintProperty<K extends keyof AllPaintProperties>(name: K): AllPaintProperties[K] {
         if (name.endsWith(TRANSITION_SUFFIX)) {
             const baseName = name.slice(0, -TRANSITION_SUFFIX.length);
             if (baseName === 'visibility' || this._unevaluatedLayout?.hasProperty(baseName)) {
                 throw new Error(name + ERROR_LAYOUT_NOT_PAINT);
             }
-            return this._transitionablePaint.getTransition(baseName);
+            return this._transitionablePaint.getTransition(baseName) as AllPaintProperties[K];
         } else {
-            if (name === 'visibility' || this._unevaluatedLayout?.hasProperty(name)) {
+            if (this._unevaluatedLayout?.hasProperty(name)) {
                 throw new Error(name + ERROR_LAYOUT_NOT_PAINT);
             }
-            return this._transitionablePaint.getValue(name);
+            return this._transitionablePaint.getValue(name) as AllPaintProperties[K];
         }
     }
 
-    setPaintProperty(name: string, value: unknown, options: StyleSetterOptions = {}) {
-        if (name === 'visibility' || (this._unevaluatedLayout?.hasProperty(name))) {
+    setPaintProperty<K extends keyof AllPaintProperties>(name: K, value: AllPaintProperties[K], options: StyleSetterOptions = {}) {
+        if (this._unevaluatedLayout?.hasProperty(name)) {
             this.fire(new ErrorEvent(new Error(name + ERROR_LAYOUT_NOT_PAINT)));
             return false;
         }
diff --git a/src/ui/map.ts b/src/ui/map.ts
@@ -60,6 +60,8 @@ import type {
     TerrainSpecification,
     ProjectionSpecification,
     SkySpecification,
+    AllPaintProperties,
+    AllLayoutProperties,
 } from '@maplibre/maplibre-gl-style-spec';
 import type {CanvasSourceSpecification} from '../source/canvas_source';
 import type {GeoJSONFeature, MapGeoJSONFeature} from '../util/vectortile_to_geojson';
@@ -2992,7 +2994,7 @@ export class Map extends Camera {
      * @see [Change a layer's color with buttons](https://maplibre.org/maplibre-gl-js/docs/examples/change-a-layers-color-with-buttons/)
      * @see [Create a draggable point](https://maplibre.org/maplibre-gl-js/docs/examples/create-a-draggable-point/)
      */
-    setPaintProperty(layerId: string, name: string, value: any, options: StyleSetterOptions = {}): this {
+    setPaintProperty<K extends keyof AllPaintProperties>(layerId: string, name: K, value: AllPaintProperties[K], options: StyleSetterOptions = {}): this {
         this.style.setPaintProperty(layerId, name, value, options);
         return this._update(true);
     }
@@ -3004,7 +3006,7 @@ export class Map extends Camera {
      * @param name - The name of a paint property to get.
      * @returns The value of the specified paint property.
      */
-    getPaintProperty(layerId: string, name: string) {
+    getPaintProperty<K extends keyof AllPaintProperties>(layerId: string, name: K): AllPaintProperties[K] {
         return this.style.getPaintProperty(layerId, name);
     }
 
@@ -3020,7 +3022,7 @@ export class Map extends Camera {
      * map.setLayoutProperty('my-layer', 'visibility', 'none');
      * ```
      */
-    setLayoutProperty(layerId: string, name: string, value: any, options: StyleSetterOptions = {}): this {
+    setLayoutProperty<K extends keyof AllLayoutProperties>(layerId: string, name: K, value: AllLayoutProperties[K], options: StyleSetterOptions = {}): this {
         this.style.setLayoutProperty(layerId, name, value, options);
         return this._update(true);
     }
@@ -3032,7 +3034,7 @@ export class Map extends Camera {
      * @param name - The name of the layout property to get.
      * @returns The value of the specified layout property.
      */
-    getLayoutProperty(layerId: string, name: string) {
+    getLayoutProperty<K extends keyof AllLayoutProperties>(layerId: string, name: K): AllLayoutProperties[K] | undefined {
         return this.style.getLayoutProperty(layerId, name);
     }
 
diff --git a/test/bench/benchmarks/terrain_render.ts b/test/bench/benchmarks/terrain_render.ts
@@ -14,34 +14,30 @@ export default class TerrainRender extends Benchmark {
                 height: 768,
                 center: [10.5, 46.9],
                 pitch: 60,
-                style: {
-                    version: 8,
-                    sources: {
-                        'terrain-rgb': {
-                            'type': 'raster-dem',
-                            'url': 'https://tiles.mapterhorn.com/tilejson.json'
-                        }
-                    },
-                    terrain: {
-                        source: 'terrain-rgb',
-                        exaggeration: 1
-                    },
-                    layers: [
-                        {
-                            'id': 'background',
-                            'type': 'background',
-                            'paint': {'background-color': '#f8f4f0'}
-                        }
-                    ]
-                },
+                style: 'https://tiles.openfreemap.org/styles/liberty',
                 idle: true
             });
+
+            this.map.addSource('terrain-dem', {
+                type: 'raster-dem',
+                url: 'https://tiles.mapterhorn.com/tilejson.json'
+            });
+            this.map.setTerrain({source: 'terrain-dem', exaggeration: 1.5});
+
+            // Wait for DEM tiles to load
+            await this.map.once('idle');
         } catch (error) {
             console.error(error);
         }
     }
 
+    _bearing: number = 0;
+
     bench() {
+        // Rotate the camera slightly each frame to force depth pre-pass to re-run
+        // and symbol layers to recalculate visibility against terrain depth
+        this._bearing = (this._bearing + 0.5) % 360;
+        this.map.setBearing(this._bearing);
         Benchmark.renderMap(this.map);
     }
 
