Remove dead code: no need to send placement parameters to the workers…

… anymore.
mapbox · Sep 19, 2017 · 6f53fe5 · 6f53fe5
1 parent 78a68c4
commit 6f53fe5
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 46 deletions.
diff --git a/src/geo/transform.js b/src/geo/transform.js
@@ -409,21 +409,6 @@ class Transform {
         return new Float32Array(posMatrix);
     }
 
-    /**
-     * Calculate the distance from the center of a tile to the camera
-     * These distances are in view-space dimensions derived from the size of the
-     * viewport, similar to this.cameraToCenterDistance
-     * If the tile is dead-center in the viewport, then cameraToTileDistance == cameraToCenterDistance
-     *
-     * @param {Tile} tile
-     */
-    cameraToTileDistance(tile: Object) {
-        const posMatrix = this.calculatePosMatrix(tile.coord, tile.sourceMaxZoom);
-        const tileCenter = [tile.tileSize / 2, tile.tileSize / 2, 0, 1];
-        vec4.transformMat4(tileCenter, tileCenter, posMatrix);
-        return tileCenter[3];
-    }
-
     _constrain() {
         if (!this.center || !this.width || !this.height || this._constraining) return;
 

diff --git a/src/source/geojson_source.js b/src/source/geojson_source.js
@@ -198,10 +198,6 @@ class GeoJSONSource extends Evented implements Source {
             source: this.id,
             pixelRatio: browser.devicePixelRatio,
             overscaling: tile.coord.z > this.maxzoom ? Math.pow(2, tile.coord.z - this.maxzoom) : 1,
-            angle: this.map.transform.angle,
-            pitch: this.map.transform.pitch,
-            cameraToCenterDistance: this.map.transform.cameraToCenterDistance,
-            cameraToTileDistance: this.map.transform.cameraToTileDistance(tile),
             showCollisionBoxes: this.map.showCollisionBoxes
         };
 

diff --git a/src/source/tile.js b/src/source/tile.js
@@ -62,10 +62,6 @@ class Tile {
     collisionIndex: ?CollisionIndex;
     featureIndex: ?FeatureIndex;
     redoWhenDone: boolean;
-    angle: number;
-    pitch: number;
-    cameraToCenterDistance: number;
-    cameraToTileDistance: number;
     showCollisionBoxes: boolean;
     placementSource: any;
     workerID: number;

diff --git a/src/source/vector_tile_source.js b/src/source/vector_tile_source.js
@@ -100,10 +100,6 @@ class VectorTileSource extends Evented implements Source {
             source: this.id,
             pixelRatio: browser.devicePixelRatio,
             overscaling: overscaling,
-            angle: this.map.transform.angle,
-            pitch: this.map.transform.pitch,
-            cameraToCenterDistance: this.map.transform.cameraToCenterDistance,
-            cameraToTileDistance: this.map.transform.cameraToTileDistance(tile),
             showCollisionBoxes: this.map.showCollisionBoxes
         };
 

diff --git a/src/source/worker_source.js b/src/source/worker_source.js
@@ -14,14 +14,6 @@ export type TileParameters = {
     uid: string,
 };
 
-export type PlacementConfig = {
-    angle: number,
-    pitch: number,
-    cameraToCenterDistance: number,
-    cameraToTileDistance: number,
-    showCollisionBoxes: boolean,
-};
-
 export type WorkerTileParameters = TileParameters & {
     coord: TileCoord,
     request: RequestParameters,
@@ -30,7 +22,8 @@ export type WorkerTileParameters = TileParameters & {
     tileSize: number,
     pixelRatio: number,
     overscaling: number,
-} & PlacementConfig;
+    showCollisionBoxes: boolean
+};
 
 export type WorkerTileResult = {
     buckets: Array<SerializedBucket>,

diff --git a/src/source/worker_tile.js b/src/source/worker_tile.js
@@ -29,10 +29,6 @@ class WorkerTile {
     tileSize: number;
     source: string;
     overscaling: number;
-    angle: number;
-    pitch: number;
-    cameraToCenterDistance: number;
-    cameraToTileDistance: number;
     showCollisionBoxes: boolean;
 
     status: 'parsing' | 'done';
@@ -52,10 +48,6 @@ class WorkerTile {
         this.tileSize = params.tileSize;
         this.source = params.source;
         this.overscaling = params.overscaling;
-        this.angle = params.angle;
-        this.pitch = params.pitch;
-        this.cameraToCenterDistance = params.cameraToCenterDistance;
-        this.cameraToTileDistance = params.cameraToTileDistance;
         this.showCollisionBoxes = params.showCollisionBoxes;
     }
 

diff --git a/test/unit/source/geojson_source.test.js b/test/unit/source/geojson_source.test.js
@@ -196,7 +196,7 @@ test('GeoJSONSource#update', (t) => {
 
         const source = new GeoJSONSource('id', {data: {}}, mockDispatcher);
         source.map = {
-            transform: { cameraToCenterDistance: 1, cameraToTileDistance: () => { return 1; } }
+            transform: {}
         };
 
         source.on('data', (e) => {

diff --git a/test/unit/source/vector_tile_source.test.js b/test/unit/source/vector_tile_source.test.js
@@ -9,7 +9,7 @@ const Evented = require('../../../src/util/evented');
 function createSource(options, transformCallback) {
     const source = new VectorTileSource('id', options, { send: function() {} }, options.eventedParent);
     source.onAdd({
-        transform: { angle: 0, pitch: 0, cameraToCenterDistance: 1, cameraToTileDistance: () => { return 1; }, showCollisionBoxes: false },
+        transform: { showCollisionBoxes: false },
         _transformRequest: transformCallback ? transformCallback : (url) => { return { url }; }
     });