Globe - transform+projection changes

src/data/bucket/symbol_bucket.test.ts

@@ -6,7 +6,6 @@ import {SymbolBucket} from './symbol_bucket';
 import {CollisionBoxArray} from '../../data/array_types.g';
 import {performSymbolLayout} from '../../symbol/symbol_layout';
 import {Placement} from '../../symbol/placement';
-import {Transform} from '../../geo/transform';
 import {CanonicalTileID, OverscaledTileID} from '../../source/tile_id';
 import {Tile} from '../../source/tile';
 import {CrossTileSymbolIndex} from '../../symbol/cross_tile_symbol_index';
@@ -18,19 +17,17 @@ import {IndexedFeature, PopulateParameters} from '../bucket';
 import {StyleImage} from '../../style/style_image';
 import glyphs from '../../../test/unit/assets/fontstack-glyphs.json' with {type: 'json'};
 import {StyleGlyph} from '../../style/style_glyph';
-import {MercatorProjection} from '../../geo/projection/mercator';
 import {SubdivisionGranularitySetting} from '../../render/subdivision_granularity_settings';
+import {MercatorTransform} from '../../geo/projection/mercator_transform';
 
 // Load a point feature from fixture tile.
 const vt = new VectorTile(new Protobuf(fs.readFileSync(path.resolve(__dirname, '../../../test/unit/assets/mbsv5-6-18-23.vector.pbf'))));
 const feature = vt.layers.place_label.feature(10);
 
 /*eslint new-cap: 0*/
 const collisionBoxArray = new CollisionBoxArray();
-const transform = new Transform();
-transform.width = 100;
-transform.height = 100;
-transform.cameraToCenterDistance = 100;
+const transform = new MercatorTransform();
+transform.resize(100, 100);
 
 const stacks = {'Test': glyphs} as any as {
     [_: string]: {
@@ -66,7 +63,7 @@ describe('SymbolBucket', () => {
         const bucketA = bucketSetup() as any as SymbolBucket;
         const bucketB = bucketSetup() as any as SymbolBucket;
         const options = {iconDependencies: {}, glyphDependencies: {}} as PopulateParameters;
-        const placement = new Placement(transform, new MercatorProjection(), undefined as any, 0, true);
+        const placement = new Placement(transform, undefined as any, 0, true);
         const tileID = new OverscaledTileID(0, 0, 0, 0, 0);
         const crossTileSymbolIndex = new CrossTileSymbolIndex();
 

src/data/bucket/symbol_bucket.ts

@@ -37,7 +37,6 @@ import {register} from '../../util/web_worker_transfer';
 import {EvaluationParameters} from '../../style/evaluation_parameters';
 import {Formatted, ResolvedImage} from '@maplibre/maplibre-gl-style-spec';
 import {rtlWorkerPlugin} from '../../source/rtl_text_plugin_worker';
-import {mat4} from 'gl-matrix';
 import {getOverlapMode} from '../../style/style_layer/overlap_mode';
 import type {CanonicalTileID} from '../../source/tile_id';
 import type {
@@ -348,8 +347,6 @@ export class SymbolBucket implements Bucket {
     featureSortOrder: Array<number>;
 
     collisionCircleArray: Array<number>;
-    placementInvProjMatrix: mat4;
-    placementViewportMatrix: mat4;
 
     text: SymbolBuffers;
     icon: SymbolBuffers;
@@ -377,8 +374,6 @@ export class SymbolBucket implements Bucket {
         this.sortKeyRanges = [];
 
         this.collisionCircleArray = [];
-        this.placementInvProjMatrix = mat4.identity([] as any);
-        this.placementViewportMatrix = mat4.identity([] as any);
 
         const layer = this.layers[0];
         const unevaluatedLayoutValues = layer._unevaluatedLayout._values;

src/data/feature_index.ts

@@ -21,13 +21,13 @@ import {mat4} from 'gl-matrix';
 
 import type {StyleLayer} from '../style/style_layer';
 import type {FeatureFilter, FeatureState, FilterSpecification, PromoteIdSpecification} from '@maplibre/maplibre-gl-style-spec';
-import type {Transform} from '../geo/transform';
+import type {ITransform} from '../geo/transform_interface';
 import type {VectorTileFeature, VectorTileLayer} from '@mapbox/vector-tile';
 
 type QueryParameters = {
     scale: number;
     pixelPosMatrix: mat4;
-    transform: Transform;
+    transform: ITransform;
     tileSize: number;
     queryGeometry: Array<Point>;
     cameraQueryGeometry: Array<Point>;

src/geo/edge_insets.ts

@@ -4,7 +4,7 @@ import {clamp} from '../util/util';
 
 /**
  * An `EdgeInset` object represents screen space padding applied to the edges of the viewport.
- * This shifts the apprent center or the vanishing point of the map. This is useful for adding floating UI elements
+ * This shifts the apparent center or the vanishing point of the map. This is useful for adding floating UI elements
  * on top of the map and having the vanishing point shift as UI elements resize.
  *
  * @group Geography and Geometry