maplibre-gl 2.1.6 → 2.1.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "maplibre-gl",
   "description": "BSD licensed community fork of mapbox-gl, a WebGL interactive maps library",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "main": "dist/maplibre-gl.js",
   "style": "dist/maplibre-gl.css",
   "license": "BSD-3-Clause",
@@ -94,7 +94,6 @@
     "eslint-plugin-react": "^7.28.0",
     "gl": "^5.0.0",
     "glob": "^7.2.0",
-    "husky": "^7.0.4",
     "is-builtin-module": "^3.1.0",
     "jest": "^27.5.1",
     "jest-canvas-mock": "^2.3.1",

package/src/css/maplibre-gl.css

@@ -13,8 +13,8 @@
     top: 0;
 }
 
-.maplibregl-map:-webkit-full-screen,
-.mapboxgl-map:-webkit-full-screen {
+.maplibregl-map:fullscreen,
+.mapboxgl-map:fullscreen {
     width: 100%;
     height: 100%;
 }
@@ -23,8 +23,6 @@
 .maplibregl-ctrl-group button.maplibregl-ctrl-compass,
 .mapboxgl-canvas-container.mapboxgl-interactive,
 .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
-    cursor: -webkit-grab;
-    cursor: -moz-grab;
     cursor: grab;
     -moz-user-select: none;
     -webkit-user-select: none;
@@ -41,8 +39,6 @@
 .maplibregl-ctrl-group button.maplibregl-ctrl-compass:active,
 .mapboxgl-canvas-container.mapboxgl-interactive:active,
 .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active {
-    cursor: -webkit-grabbing;
-    cursor: -moz-grabbing;
     cursor: grabbing;
 }
 
@@ -117,8 +113,6 @@
 
 .maplibregl-ctrl-group:not(:empty),
 .mapboxgl-ctrl-group:not(:empty) {
-    -moz-box-shadow: 0 0 2px rgb(0 0 0 / 10%);
-    -webkit-box-shadow: 0 0 2px rgb(0 0 0 / 10%);
     box-shadow: 0 0 0 2px rgb(0 0 0 / 10%);
 }
 
@@ -398,10 +392,6 @@
 
 .maplibregl-ctrl button.maplibregl-ctrl-geolocate.maplibregl-ctrl-geolocate-waiting .maplibregl-ctrl-icon,
 .mapboxgl-ctrl button.mapboxgl-ctrl-geolocate.mapboxgl-ctrl-geolocate-waiting .mapboxgl-ctrl-icon {
-    -webkit-animation: maplibregl-spin 2s infinite linear;
-    -moz-animation: maplibregl-spin 2s infinite linear;
-    -o-animation: maplibregl-spin 2s infinite linear;
-    -ms-animation: maplibregl-spin 2s infinite linear;
     animation: maplibregl-spin 2s infinite linear;
 }
 
@@ -449,24 +439,24 @@
     }
 }
 
-@-webkit-keyframes maplibregl-spin {
-    0% { -webkit-transform: rotate(0deg); }
-    100% { -webkit-transform: rotate(360deg); }
+@keyframes maplibregl-spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
 }
 
-@-moz-keyframes maplibregl-spin {
-    0% { -moz-transform: rotate(0deg); }
-    100% { -moz-transform: rotate(360deg); }
+@keyframes maplibregl-spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
 }
 
-@-o-keyframes maplibregl-spin {
-    0% { -o-transform: rotate(0deg); }
-    100% { -o-transform: rotate(360deg); }
+@keyframes maplibregl-spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
 }
 
-@-ms-keyframes maplibregl-spin {
-    0% { -ms-transform: rotate(0deg); }
-    100% { -ms-transform: rotate(360deg); }
+@keyframes maplibregl-spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
 }
 
 @keyframes maplibregl-spin {
@@ -662,7 +652,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
     position: absolute;
     top: 0;
     left: 0;
-    display: -webkit-flex;
     display: flex;
     will-change: transform;
     pointer-events: none;
@@ -674,7 +663,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 .mapboxgl-popup-anchor-top,
 .mapboxgl-popup-anchor-top-left,
 .mapboxgl-popup-anchor-top-right {
-    -webkit-flex-direction: column;
     flex-direction: column;
 }
 
@@ -684,19 +672,16 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 .mapboxgl-popup-anchor-bottom,
 .mapboxgl-popup-anchor-bottom-left,
 .mapboxgl-popup-anchor-bottom-right {
-    -webkit-flex-direction: column-reverse;
     flex-direction: column-reverse;
 }
 
 .maplibregl-popup-anchor-left,
 .mapboxgl-popup-anchor-left {
-    -webkit-flex-direction: row;
     flex-direction: row;
 }
 
 .maplibregl-popup-anchor-right,
 .mapboxgl-popup-anchor-right {
-    -webkit-flex-direction: row-reverse;
     flex-direction: row-reverse;
 }
 
@@ -710,7 +695,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 
 .maplibregl-popup-anchor-top .maplibregl-popup-tip,
 .mapboxgl-popup-anchor-top .mapboxgl-popup-tip {
-    -webkit-align-self: center;
     align-self: center;
     border-top: none;
     border-bottom-color: #fff;
@@ -718,7 +702,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 
 .maplibregl-popup-anchor-top-left .maplibregl-popup-tip,
 .mapboxgl-popup-anchor-top-left .mapboxgl-popup-tip {
-    -webkit-align-self: flex-start;
     align-self: flex-start;
     border-top: none;
     border-left: none;
@@ -727,7 +710,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 
 .maplibregl-popup-anchor-top-right .maplibregl-popup-tip,
 .mapboxgl-popup-anchor-top-right .mapboxgl-popup-tip {
-    -webkit-align-self: flex-end;
     align-self: flex-end;
     border-top: none;
     border-right: none;
@@ -736,7 +718,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 
 .maplibregl-popup-anchor-bottom .maplibregl-popup-tip,
 .mapboxgl-popup-anchor-bottom .mapboxgl-popup-tip {
-    -webkit-align-self: center;
     align-self: center;
     border-bottom: none;
     border-top-color: #fff;
@@ -744,7 +725,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 
 .maplibregl-popup-anchor-bottom-left .maplibregl-popup-tip,
 .mapboxgl-popup-anchor-bottom-left .mapboxgl-popup-tip {
-    -webkit-align-self: flex-start;
     align-self: flex-start;
     border-bottom: none;
     border-left: none;
@@ -753,7 +733,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 
 .maplibregl-popup-anchor-bottom-right .maplibregl-popup-tip,
 .mapboxgl-popup-anchor-bottom-right .mapboxgl-popup-tip {
-    -webkit-align-self: flex-end;
     align-self: flex-end;
     border-bottom: none;
     border-right: none;
@@ -762,7 +741,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 
 .maplibregl-popup-anchor-left .maplibregl-popup-tip,
 .mapboxgl-popup-anchor-left .mapboxgl-popup-tip {
-    -webkit-align-self: center;
     align-self: center;
     border-left: none;
     border-right-color: #fff;
@@ -770,7 +748,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
 
 .maplibregl-popup-anchor-right .maplibregl-popup-tip,
 .mapboxgl-popup-anchor-right .mapboxgl-popup-tip {
-    -webkit-align-self: center;
     align-self: center;
     border-right: none;
     border-left-color: #fff;
@@ -867,9 +844,6 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
     height: 15px;
     border-radius: 50%;
     position: absolute;
-    -webkit-animation: maplibregl-user-location-dot-pulse 2s infinite;
-    -moz-animation: maplibregl-user-location-dot-pulse 2s infinite;
-    -ms-animation: maplibregl-user-location-dot-pulse 2s infinite;
     animation: maplibregl-user-location-dot-pulse 2s infinite;
 }
 
@@ -887,16 +861,16 @@ a.mapboxgl-ctrl-logo.mapboxgl-compact {
     box-shadow: 0 0 3px rgb(0 0 0 / 35%);
 }
 
-@-webkit-keyframes maplibregl-user-location-dot-pulse {
-    0%   { -webkit-transform: scale(1); opacity: 1; }
-    70%  { -webkit-transform: scale(3); opacity: 0; }
-    100% { -webkit-transform: scale(1); opacity: 0; }
+@keyframes maplibregl-user-location-dot-pulse {
+    0%   { transform: scale(1); opacity: 1; }
+    70%  { transform: scale(3); opacity: 0; }
+    100% { transform: scale(1); opacity: 0; }
 }
 
-@-ms-keyframes maplibregl-user-location-dot-pulse {
-    0%   { -ms-transform: scale(1); opacity: 1; }
-    70%  { -ms-transform: scale(3); opacity: 0; }
-    100% { -ms-transform: scale(1); opacity: 0; }
+@keyframes maplibregl-user-location-dot-pulse {
+    0%   { transform: scale(1); opacity: 1; }
+    70%  { transform: scale(3); opacity: 0; }
+    100% { transform: scale(1); opacity: 0; }
 }
 
 @keyframes maplibregl-user-location-dot-pulse {

package/src/data/bucket/fill_bucket.test.ts

@@ -7,7 +7,7 @@ import Point from '@mapbox/point-geometry';
 import segment from '../segment';
 import FillBucket from './fill_bucket';
 import FillStyleLayer from '../../style/style_layer/fill_style_layer';
-import {LayerSpecification} from '../../style-spec/types';
+import {LayerSpecification} from '../../style-spec/types.g';
 import EvaluationParameters from '../../style/evaluation_parameters';
 import ZoomHistory from '../../style/zoom_history';
 import {BucketFeature, BucketParameters} from '../bucket';

package/src/data/bucket/line_bucket.test.ts

@@ -6,7 +6,7 @@ import Point from '@mapbox/point-geometry';
 import segment from '../segment';
 import LineBucket from './line_bucket';
 import LineStyleLayer from '../../style/style_layer/line_style_layer';
-import {LayerSpecification} from '../../style-spec/types';
+import {LayerSpecification} from '../../style-spec/types.g';
 import EvaluationParameters from '../../style/evaluation_parameters';
 import {BucketFeature, BucketParameters} from '../bucket';
 

package/src/data/feature_index.ts

@@ -21,7 +21,7 @@ import {mat4} from 'gl-matrix';
 import type StyleLayer from '../style/style_layer';
 import type {FeatureFilter} from '../style-spec/feature_filter';
 import type Transform from '../geo/transform';
-import type {FilterSpecification, PromoteIdSpecification} from '../style-spec/types';
+import type {FilterSpecification, PromoteIdSpecification} from '../style-spec/types.g';
 import type {FeatureState} from '../style-spec/expression';
 import type {VectorTileFeature, VectorTileLayer} from '@mapbox/vector-tile';
 

package/src/render/glyph_manager.ts

@@ -196,6 +196,22 @@ export default class GlyphManager {
         }
 
         const char = tinySDF.draw(String.fromCharCode(id));
+
+        /**
+         * TinySDF's "top" is the distance from the alphabetic baseline to the top of the glyph.
+         * Server-generated fonts specify "top" relative to an origin above the em box (the origin
+         * comes from FreeType, but I'm unclear on exactly how it's derived)
+         * ref: https://github.com/mapbox/sdf-glyph-foundry
+         *
+         * Server fonts don't yet include baseline information, so we can't line up exactly with them
+         * (and they don't line up with each other)
+         * ref: https://github.com/mapbox/node-fontnik/pull/160
+         *
+         * To approximately align TinySDF glyphs with server-provided glyphs, we use this baseline adjustment
+         * factor calibrated to be in between DIN Pro and Arial Unicode (but closer to Arial Unicode)
+         */
+        const topAdjustment = 27;
+
         return {
             id,
             bitmap: new AlphaImage({width: char.width || 30, height: char.height || 30}, char.data),
@@ -203,7 +219,7 @@ export default class GlyphManager {
                 width: char.glyphWidth || 24,
                 height: char.glyphHeight || 24,
                 left: char.glyphLeft || 0,
-                top: char.glyphTop || -8,
+                top: char.glyphTop - topAdjustment || -8,
                 advance: char.glyphAdvance || 24
             }
         };

package/src/render/uniform_binding.ts

@@ -7,7 +7,7 @@ type $ObjMap<T extends {}, F extends (v: any) => any> = {
     [K in keyof T]: F extends (v: T[K]) => infer R ? R : never;
 };
 
-export type UniformValues<Us extends any> = $ObjMap<Us, <V>(u: Uniform<V>) => V>;
+export type UniformValues<Us extends {}> = $ObjMap<Us, <V>(u: Uniform<V>) => V>;
 export type UniformLocations = {[_: string]: WebGLUniformLocation};
 
 abstract class Uniform<T> {

package/src/source/geojson_source.ts

@@ -11,7 +11,7 @@ import type Dispatcher from '../util/dispatcher';
 import type Tile from './tile';
 import type Actor from '../util/actor';
 import type {Callback} from '../types/callback';
-import type {GeoJSONSourceSpecification, PromoteIdSpecification} from '../style-spec/types';
+import type {GeoJSONSourceSpecification, PromoteIdSpecification} from '../style-spec/types.g';
 import type {MapSourceDataType} from '../ui/events';
 
 export type GeoJSONSourceOptions = GeoJSONSourceSpecification & {

package/src/source/geojson_worker_source.test.ts

@@ -2,7 +2,7 @@ import GeoJSONWorkerSource, {LoadGeoJSONParameters} from './geojson_worker_sourc
 import StyleLayerIndex from '../style/style_layer_index';
 import {OverscaledTileID} from './tile_id';
 import perf from '../util/performance';
-import {LayerSpecification} from '../style-spec/types';
+import {LayerSpecification} from '../style-spec/types.g';
 import Actor from '../util/actor';
 import {WorkerTileParameters} from './worker_source';
 import {setPerformance} from '../util/test/util';

package/src/source/image_source.ts

@@ -18,7 +18,7 @@ import type VertexBuffer from '../gl/vertex_buffer';
 import type {
     ImageSourceSpecification,
     VideoSourceSpecification
-} from '../style-spec/types';
+} from '../style-spec/types.g';
 
 export type Coordinates = [[number, number], [number, number], [number, number], [number, number]];
 

package/src/source/query_features.ts

@@ -3,7 +3,7 @@ import type StyleLayer from '../style/style_layer';
 import type CollisionIndex from '../symbol/collision_index';
 import type Transform from '../geo/transform';
 import type {RetainedQueryData} from '../symbol/placement';
-import type {FilterSpecification} from '../style-spec/types';
+import type {FilterSpecification} from '../style-spec/types.g';
 import type Point from '@mapbox/point-geometry';
 import assert from 'assert';
 import {mat4} from 'gl-matrix';

package/src/source/raster_dem_tile_source.ts

@@ -12,7 +12,7 @@ import type {Source} from './source';
 import type Dispatcher from '../util/dispatcher';
 import type Tile from './tile';
 import type {Callback} from '../types/callback';
-import type {RasterDEMSourceSpecification} from '../style-spec/types';
+import type {RasterDEMSourceSpecification} from '../style-spec/types.g';
 
 class RasterDEMTileSource extends RasterTileSource implements Source {
     encoding: 'mapbox' | 'terrarium';

package/src/source/raster_tile_source.ts

@@ -18,7 +18,7 @@ import type {Cancelable} from '../types/cancelable';
 import type {
     RasterSourceSpecification,
     RasterDEMSourceSpecification
-} from '../style-spec/types';
+} from '../style-spec/types.g';
 
 class RasterTileSource extends Evented implements Source {
     type: 'raster' | 'raster-dem';

package/src/source/source.ts

@@ -84,7 +84,7 @@ import video from '../source/video_source';
 import image from '../source/image_source';
 import canvas from '../source/canvas_source';
 
-import type {SourceSpecification} from '../style-spec/types';
+import type {SourceSpecification} from '../style-spec/types.g';
 
 const sourceTypes = {
     vector,

package/src/source/source_cache.test.ts

@@ -436,6 +436,18 @@ describe('SourceCache / Source lifecycle', () => {
         sourceCache.onAdd(undefined);
     });
 
+    test('loaded() false after source begins loading following error', done => {
+        const sourceCache = createSourceCache({error: 'Error loading source'}).on('error', () => {
+            sourceCache.on('dataloading', () => {
+                expect(sourceCache.loaded()).toBeFalsy();
+                done();
+            });
+            sourceCache.getSource().fire(new Event('dataloading'));
+        });
+
+        sourceCache.onAdd(undefined);
+    });
+
     test('reloads tiles after a data event where source is updated', () => {
         const transform = new Transform();
         transform.resize(511, 511);

package/src/source/source_cache.ts

@@ -20,7 +20,7 @@ import type Dispatcher from '../util/dispatcher';
 import type Transform from '../geo/transform';
 import type {TileState} from './tile';
 import type {Callback} from '../types/callback';
-import type {SourceSpecification} from '../style-spec/types';
+import type {SourceSpecification} from '../style-spec/types.g';
 
 /**
  * `SourceCache` is responsible for
@@ -84,6 +84,10 @@ class SourceCache extends Evented {
             }
         });
 
+        this.on('dataloading', () => {
+            this._sourceErrored = false;
+        });
+
         this.on('error', () => {
             this._sourceErrored = true;
         });

package/src/source/tile.ts

@@ -29,7 +29,7 @@ import type Framebuffer from '../gl/framebuffer';
 import type Transform from '../geo/transform';
 import type {LayerFeatureStates} from './source_state';
 import type {Cancelable} from '../types/cancelable';
-import type {FilterSpecification} from '../style-spec/types';
+import type {FilterSpecification} from '../style-spec/types.g';
 import type Point from '@mapbox/point-geometry';
 import {mat4} from 'gl-matrix';
 import type {VectorTileLayer} from '@mapbox/vector-tile';

package/src/source/vector_tile_source.ts

@@ -13,7 +13,7 @@ import type Dispatcher from '../util/dispatcher';
 import type Tile from './tile';
 import type {Callback} from '../types/callback';
 import type {Cancelable} from '../types/cancelable';
-import type {VectorSourceSpecification, PromoteIdSpecification} from '../style-spec/types';
+import type {VectorSourceSpecification, PromoteIdSpecification} from '../style-spec/types.g';
 
 /**
  * A source containing vector tiles in [Mapbox Vector Tile format](https://docs.mapbox.com/vector-tiles/reference/).

package/src/source/video_source.ts

@@ -10,7 +10,7 @@ import ValidationError from '../style-spec/error/validation_error';
 import type Map from '../ui/map';
 import type Dispatcher from '../util/dispatcher';
 import type {Evented} from '../util/evented';
-import type {VideoSourceSpecification} from '../style-spec/types';
+import type {VideoSourceSpecification} from '../style-spec/types.g';
 
 /**
  * A data source containing video.

package/src/source/worker.test.ts

@@ -1,6 +1,6 @@
 import {fakeServer} from 'nise';
 import Worker from './worker';
-import {LayerSpecification} from '../style-spec/types';
+import {LayerSpecification} from '../style-spec/types.g';
 import {Cancelable} from '../types/cancelable';
 import {WorkerGlobalScopeInterface} from '../util/web_worker';
 import {CanonicalTileID, OverscaledTileID} from './tile_id';

package/src/source/worker.ts

@@ -19,7 +19,7 @@ import type {
 
 import type {WorkerGlobalScopeInterface} from '../util/web_worker';
 import type {Callback} from '../types/callback';
-import type {LayerSpecification} from '../style-spec/types';
+import type {LayerSpecification} from '../style-spec/types.g';
 import type {PluginState} from './rtl_text_plugin';
 
 /**

package/src/source/worker_source.ts

@@ -9,7 +9,7 @@ import type {CollisionBoxArray} from '../data/array_types.g';
 import type DEMData from '../data/dem_data';
 import type {StyleGlyph} from '../style/style_glyph';
 import type {StyleImage} from '../style/style_image';
-import type {PromoteIdSpecification} from '../style-spec/types';
+import type {PromoteIdSpecification} from '../style-spec/types.g';
 
 export type TileParameters = {
     source: string;

package/src/source/worker_tile.ts

@@ -24,7 +24,7 @@ import type {
     WorkerTileParameters,
     WorkerTileCallback,
 } from '../source/worker_source';
-import type {PromoteIdSpecification} from '../style-spec/types';
+import type {PromoteIdSpecification} from '../style-spec/types.g';
 import type {VectorTile} from '@mapbox/vector-tile';
 
 class WorkerTile {

package/src/style/create_style_layer.ts

@@ -10,7 +10,7 @@ import raster from './style_layer/raster_style_layer';
 import CustomStyleLayer from './style_layer/custom_style_layer';
 import type {CustomLayerInterface} from './style_layer/custom_style_layer';
 
-import type {LayerSpecification} from '../style-spec/types';
+import type {LayerSpecification} from '../style-spec/types.g';
 
 const subclasses = {
     circle,

package/src/style/evaluation_parameters.ts

@@ -2,7 +2,7 @@ import ZoomHistory from './zoom_history';
 import {isStringInSupportedScript} from '../util/script_detection';
 import {plugin as rtlTextPlugin} from '../source/rtl_text_plugin';
 
-import type {TransitionSpecification} from '../style-spec/types';
+import type {TransitionSpecification} from '../style-spec/types.g';
 
 export type CrossfadeParameters = {
     fromScale: number;

package/src/style/light.test.ts

@@ -3,7 +3,7 @@ import styleSpec from '../style-spec/reference/latest';
 import Color from '../style-spec/util/color';
 import {sphericalToCartesian} from '../util/util';
 import EvaluationParameters from './evaluation_parameters';
-import {LightSpecification} from '../style-spec/types';
+import {LightSpecification} from '../style-spec/types.g';
 import {TransitionParameters} from './properties';
 
 const spec = styleSpec.light;

package/src/style/light.ts

@@ -21,7 +21,7 @@ import type {
     TransitionParameters
 } from './properties';
 
-import type {LightSpecification} from '../style-spec/types';
+import type {LightSpecification} from '../style-spec/types.g';
 
 type LightPosition = {
     x: number;

package/src/style/properties.ts

@@ -10,7 +10,7 @@ import {StylePropertySpecification} from '../style-spec/style-spec';
 import {
     TransitionSpecification,
     PropertyValueSpecification
-} from '../style-spec/types';
+} from '../style-spec/types.g';
 
 import {
     normalizePropertyExpression,

package/src/style/style.test.ts

@@ -15,7 +15,7 @@ import {OverscaledTileID} from '../source/tile_id';
 import {fakeXhr, fakeServer} from 'nise';
 import {WorkerGlobalScopeInterface} from '../util/web_worker';
 import EvaluationParameters from './evaluation_parameters';
-import {LayerSpecification, GeoJSONSourceSpecification, FilterSpecification, SourceSpecification} from '../style-spec/types';
+import {LayerSpecification, GeoJSONSourceSpecification, FilterSpecification, SourceSpecification} from '../style-spec/types.g';
 import {SourceClass} from '../source/source';
 import GeoJSONSource from '../source/geojson_source';
 

package/src/style/style.ts

@@ -57,7 +57,7 @@ import type {
     StyleSpecification,
     LightSpecification,
     SourceSpecification
-} from '../style-spec/types';
+} from '../style-spec/types.g';
 import type {CustomLayerInterface} from './style_layer/custom_style_layer';
 import type {Validator} from './validate_style';
 import type {OverscaledTileID} from '../source/tile_id';

package/src/style/style_layer/background_style_layer.ts

@@ -4,7 +4,7 @@ import properties, {BackgroundPaintPropsPossiblyEvaluated} from './background_st
 import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
 
 import type {BackgroundPaintProps} from './background_style_layer_properties.g';
-import type {LayerSpecification} from '../../style-spec/types';
+import type {LayerSpecification} from '../../style-spec/types.g';
 
 class BackgroundStyleLayer extends StyleLayer {
     _transitionablePaint: Transitionable<BackgroundPaintProps>;

package/src/style/style_layer/circle_style_layer.ts

@@ -11,7 +11,7 @@ import type {FeatureState} from '../../style-spec/expression';
 import type Transform from '../../geo/transform';
 import type {Bucket, BucketParameters} from '../../data/bucket';
 import type {CircleLayoutProps, CirclePaintProps} from './circle_style_layer_properties.g';
-import type {LayerSpecification} from '../../style-spec/types';
+import type {LayerSpecification} from '../../style-spec/types.g';
 import type {VectorTileFeature} from '@mapbox/vector-tile';
 
 class CircleStyleLayer extends StyleLayer {

package/src/style/style_layer/custom_style_layer.ts

@@ -2,7 +2,7 @@ import StyleLayer from '../style_layer';
 import type Map from '../../ui/map';
 import assert from 'assert';
 import {mat4} from 'gl-matrix';
-import {LayerSpecification} from '../../style-spec/types';
+import {LayerSpecification} from '../../style-spec/types.g';
 
 type CustomRenderMethod = (gl: WebGLRenderingContext, matrix: mat4) => void;
 

package/src/style/style_layer/fill_extrusion_style_layer.ts

@@ -11,7 +11,7 @@ import type {FeatureState} from '../../style-spec/expression';
 import type {BucketParameters} from '../../data/bucket';
 import type {FillExtrusionPaintProps} from './fill_extrusion_style_layer_properties.g';
 import type Transform from '../../geo/transform';
-import type {LayerSpecification} from '../../style-spec/types';
+import type {LayerSpecification} from '../../style-spec/types.g';
 import type {VectorTileFeature} from '@mapbox/vector-tile';
 
 export class Point3D extends Point {

package/src/style/style_layer/fill_style_layer.ts

@@ -12,7 +12,7 @@ import type Point from '@mapbox/point-geometry';
 import type {FillLayoutProps, FillPaintProps} from './fill_style_layer_properties.g';
 import type EvaluationParameters from '../evaluation_parameters';
 import type Transform from '../../geo/transform';
-import type {LayerSpecification} from '../../style-spec/types';
+import type {LayerSpecification} from '../../style-spec/types.g';
 import type {VectorTileFeature} from '@mapbox/vector-tile';
 
 class FillStyleLayer extends StyleLayer {

package/src/style/style_layer/heatmap_style_layer.ts

@@ -9,7 +9,7 @@ import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
 import type Texture from '../../render/texture';
 import type Framebuffer from '../../gl/framebuffer';
 import type {HeatmapPaintProps} from './heatmap_style_layer_properties.g';
-import type {LayerSpecification} from '../../style-spec/types';
+import type {LayerSpecification} from '../../style-spec/types.g';
 
 class HeatmapStyleLayer extends StyleLayer {
 

package/src/style/style_layer/hillshade_style_layer.ts

@@ -4,7 +4,7 @@ import properties, {HillshadePaintPropsPossiblyEvaluated} from './hillshade_styl
 import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
 
 import type {HillshadePaintProps} from './hillshade_style_layer_properties.g';
-import type {LayerSpecification} from '../../style-spec/types';
+import type {LayerSpecification} from '../../style-spec/types.g';
 
 class HillshadeStyleLayer extends StyleLayer {
     _transitionablePaint: Transitionable<HillshadePaintProps>;

package/src/style/style_layer/line_style_layer.ts

@@ -14,7 +14,7 @@ import type {FeatureState, ZoomConstantExpression} from '../../style-spec/expres
 import type {Bucket, BucketParameters} from '../../data/bucket';
 import type {LineLayoutProps, LinePaintProps} from './line_style_layer_properties.g';
 import type Transform from '../../geo/transform';
-import type {LayerSpecification} from '../../style-spec/types';
+import type {LayerSpecification} from '../../style-spec/types.g';
 import type {VectorTileFeature} from '@mapbox/vector-tile';
 
 class LineFloorwidthProperty extends DataDrivenProperty<number> {