Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
ansis committed Jan 7, 2020
1 parent f1ef082 commit c3b5801
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/style/pauseable_placement.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ class LayerPlacement {
_bucketParts: Array<BucketPart>;

constructor(styleLayer: SymbolStyleLayer) {
this._sortAcrossTiles = styleLayer.type === 'symbol' &&
styleLayer.layout.get('symbol-z-order') !== 'viewport-y' &&
this._sortAcrossTiles = styleLayer.layout.get('symbol-z-order') !== 'viewport-y' &&
styleLayer.layout.get('symbol-sort-key').constantOr(1) !== undefined;

this._currentTileIndex = 0;
Expand Down Expand Up @@ -49,13 +48,14 @@ class LayerPlacement {

while (this._currentPartIndex < bucketParts.length) {
const bucketPart = bucketParts[this._currentPartIndex];
placement.placeLayerBucket(bucketPart, this._seenCrossTileIDs, showCollisionBoxes);
placement.placeLayerBucketPart(bucketPart, this._seenCrossTileIDs, showCollisionBoxes);

this._currentPartIndex++;
if (shouldPausePlacement()) {
return true;
}
}
return false;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/symbol/placement.js
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ export class Placement {
}
}

placeLayerBucket(bucketPart: Object, seenCrossTileIDs: { [string | number]: boolean }, showCollisionBoxes: boolean) {
placeLayerBucketPart(bucketPart: Object, seenCrossTileIDs: { [string | number]: boolean }, showCollisionBoxes: boolean) {

const {
bucket,
Expand Down
2 changes: 1 addition & 1 deletion test/unit/data/symbol_bucket.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test('SymbolBucket', (t) => {
const parts = [];
placement.getBucketParts(parts, layer, tile, false);
for (const part of parts) {
placement.placeLayerBucket(part, {}, false);
placement.placeLayerBucketPart(part, {}, false);
}
};
const a = placement.collisionIndex.grid.keysLength();
Expand Down

0 comments on commit c3b5801

Please sign in to comment.