maplibre-gl 2.1.6 → 2.1.7

package/src/style/style_layer/raster_style_layer.ts

@@ -4,7 +4,7 @@ import properties, {RasterPaintPropsPossiblyEvaluated} from './raster_style_laye
 import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
 
 import type {RasterPaintProps} from './raster_style_layer_properties.g';
-import type {LayerSpecification} from '../../style-spec/types';
+import type {LayerSpecification} from '../../style-spec/types.g';
 
 class RasterStyleLayer extends StyleLayer {
     _transitionablePaint: Transitionable<RasterPaintProps>;

package/src/style/style_layer/symbol_style_layer.ts

@@ -24,7 +24,7 @@ import {
 import type {BucketParameters} from '../../data/bucket';
 import type {SymbolLayoutProps, SymbolPaintProps} from './symbol_style_layer_properties.g';
 import type EvaluationParameters from '../evaluation_parameters';
-import type {LayerSpecification} from '../../style-spec/types';
+import type {LayerSpecification} from '../../style-spec/types.g';
 import type {Feature, SourceExpression, CompositeExpression} from '../../style-spec/expression';
 import type {Expression} from '../../style-spec/expression/expression';
 import type {CanonicalTileID} from '../../source/tile_id';

package/src/style/style_layer.test.ts

@@ -2,7 +2,7 @@ import createStyleLayer from './create_style_layer';
 import FillStyleLayer from './style_layer/fill_style_layer';
 import {extend} from '../util/util';
 import Color from '../style-spec/util/color';
-import {LayerSpecification} from '../style-spec/types';
+import {LayerSpecification} from '../style-spec/types.g';
 import EvaluationParameters from './evaluation_parameters';
 import {TransitionParameters} from './properties';
 import BackgroundStyleLayer from './style_layer/background_style_layer';

package/src/style/style_layer.ts

@@ -23,7 +23,7 @@ import type Transform from '../geo/transform';
 import type {
     LayerSpecification,
     FilterSpecification
-} from '../style-spec/types';
+} from '../style-spec/types.g';
 import type {CustomLayerInterface} from './style_layer/custom_style_layer';
 import type Map from '../ui/map';
 import type {StyleSetterOptions} from './style';

package/src/style/style_layer_index.ts

@@ -5,7 +5,7 @@ import featureFilter from '../style-spec/feature_filter';
 import groupByLayout from '../style-spec/group_by_layout';
 
 import type {TypedStyleLayer} from './style_layer/typed_style_layer';
-import type {LayerSpecification} from '../style-spec/types';
+import type {LayerSpecification} from '../style-spec/types.g';
 
 export type LayerConfigs = {[_: string]: LayerSpecification};
 export type Family<Layer extends TypedStyleLayer> = Array<Layer>;

package/src/style-spec/expression/index.ts

@@ -21,7 +21,7 @@ import type {Expression} from './expression';
 import type {StylePropertySpecification} from '../style-spec';
 import type {Result} from '../util/result';
 import type {InterpolationType} from './definitions/interpolate';
-import type {PropertyValueSpecification} from '../types';
+import type {PropertyValueSpecification} from '../types.g';
 import type {FormattedSection} from './types/formatted';
 import type Point from '@mapbox/point-geometry';
 import type {CanonicalTileID} from '../../source/tile_id';

package/src/style-spec/feature_filter/convert.ts

@@ -1,6 +1,6 @@
 import {isExpressionFilter} from './index';
 
-import type {FilterSpecification} from '../types';
+import type {FilterSpecification} from '../types.g';
 
 type ExpectedTypes = {[_: string]: 'string' | 'number' | 'boolean'};
 

package/src/style-spec/feature_filter/feature_filter.test.ts

@@ -5,7 +5,7 @@ import Point from '@mapbox/point-geometry';
 import MercatorCoordinate from '../../geo/mercator_coordinate';
 import EXTENT from '../../data/extent';
 import {CanonicalTileID} from '../../source/tile_id';
-import {FilterSpecification} from '../types';
+import {FilterSpecification} from '../types.g';
 import {Feature} from '../expression';
 
 describe('filter', () => {

package/src/style-spec/migrate/expressions.ts

@@ -3,7 +3,7 @@ import {isExpression} from '../expression';
 import convertFunction, {convertTokenString} from '../function/convert';
 import convertFilter from '../feature_filter/convert';
 
-import type {FilterSpecification, LayerSpecification, StyleSpecification} from '../types';
+import type {FilterSpecification, LayerSpecification, StyleSpecification} from '../types.g';
 
 /**
  * Migrate the given style object in place to use expressions. Specifically,

package/src/style-spec/visit.ts

@@ -6,7 +6,7 @@ import type {
     LayerSpecification,
     PropertyValueSpecification,
     DataDrivenPropertyValueSpecification
-} from './types';
+} from './types.g';
 
 function getPropertyReference(propertyName): StylePropertySpecification {
     for (let i = 0; i < Reference.layout.length; i++) {

package/src/ui/control/logo_control.test.ts

@@ -98,9 +98,9 @@ describe('LogoControl', () => {
             map.on('sourcedata', (e) => {
                 if (e.isSourceLoaded && e.sourceId === 'source2' && e.sourceDataType === 'metadata') {
                     expect(map.getContainer().querySelectorAll('.maplibregl-ctrl-logo')).toHaveLength(1);
+                    done();
                 }
             });
-            done();
         });
 
     });

package/src/ui/events.ts

@@ -6,7 +6,7 @@ import {extend} from '../util/util';
 
 import type Map from './map';
 import type LngLat from '../geo/lng_lat';
-import {SourceSpecification} from '../style-spec/types';
+import {SourceSpecification} from '../style-spec/types.g';
 
 export type MapLayerMouseEvent = MapMouseEvent & { features?: GeoJSON.Feature[] };
 

package/src/ui/map.test.ts

@@ -6,7 +6,7 @@ import {OverscaledTileID} from '../source/tile_id';
 import {Event, ErrorEvent} from '../util/evented';
 import simulate from '../../test/unit/lib/simulate_interaction';
 import {fixedLngLat, fixedNum} from '../../test/unit/lib/fixed';
-import {LayerSpecification, SourceSpecification, StyleSpecification} from '../style-spec/types';
+import {LayerSpecification, SourceSpecification, StyleSpecification} from '../style-spec/types.g';
 import {RequestTransformFunction} from '../util/request_manager';
 import {extend} from '../util/util';
 import {LngLatBoundsLike} from '../geo/lng_lat_bounds';

package/src/ui/map.ts

@@ -52,7 +52,7 @@ import type {
     StyleSpecification,
     LightSpecification,
     SourceSpecification
-} from '../style-spec/types';
+} from '../style-spec/types.g';
 import {Callback} from '../types/callback';
 import type {ControlPosition, IControl} from './control/control';
 
@@ -917,7 +917,12 @@ class Map extends Camera {
         return this._rotating || this.handlers.isRotating();
     }
 
-    _createDelegatedListener(type: MapEvent, layerId: any, listener: any) {
+    _createDelegatedListener(type: MapEvent, layerId: string, listener: Listener):
+    {
+        layer: string;
+        listener: Listener;
+        delegates: {[type in keyof MapEventType]?: (e: any) => void};
+    } {
         if (type === 'mouseenter' || type === 'mouseover') {
             let mousein = false;
             const mousemove = (e) => {
@@ -1078,14 +1083,14 @@ class Map extends Camera {
             return super.on(type, layerIdOrListener as Listener);
         }
 
-        const delegatedListener = this._createDelegatedListener(type, layerIdOrListener, listener);
+        const delegatedListener = this._createDelegatedListener(type, layerIdOrListener as string, listener);
 
         this._delegatedListeners = this._delegatedListeners || {};
         this._delegatedListeners[type] = this._delegatedListeners[type] || [];
         this._delegatedListeners[type].push(delegatedListener);
 
         for (const event in delegatedListener.delegates) {
-            this.on(event as any, delegatedListener.delegates[event]);
+            this.on(event as MapEvent, delegatedListener.delegates[event]);
         }
 
         return this;
@@ -1133,10 +1138,10 @@ class Map extends Camera {
             return super.once(type, layerIdOrListener as Listener);
         }
 
-        const delegatedListener = this._createDelegatedListener(type, layerIdOrListener, listener);
+        const delegatedListener = this._createDelegatedListener(type, layerIdOrListener as string, listener);
 
         for (const event in delegatedListener.delegates) {
-            this.once(event as any, delegatedListener.delegates[event]);
+            this.once(event as MapEvent, delegatedListener.delegates[event]);
         }
 
         return this;