Skip to content

Commit cec0a86

Browse files
nicozinkgithub-actions[bot]
authored andcommitted
Check conflation region against layer index to enable clip layer (internal-8892)
GitOrigin-RevId: ff22f1e84ceb468c817ff5c313d083aa8c22174b
1 parent 0d641c0 commit cec0a86

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

3d-style/data/bucket/building_bucket.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import Point from '@mapbox/point-geometry';
3939
import {VectorTileFeature} from '@mapbox/vector-tile';
4040
const vectorTileFeatureTypes = VectorTileFeature.types;
4141
import {waitForBuildingGen, getBuildingGen} from '../../util/loaders';
42-
import {footprintTrianglesIntersect, regionsEquals, ReplacementOrderBuilding, type Region, type ReplacementSource} from '../../source/replacement_source';
42+
import {footprintTrianglesIntersect, regionsEquals, type Region, type ReplacementSource} from '../../source/replacement_source';
4343
import TriangleGridIndex from '../../../src/util/triangle_grid_index';
4444
import earcut from 'earcut';
4545
import assert from 'assert';
@@ -1365,7 +1365,7 @@ export class BuildingBucket implements BucketWithGroundEffect {
13651365

13661366
// Hide all centroids that are overlapping with footprints from the replacement source
13671367
for (const region of this.activeReplacements) {
1368-
if ((region.order <= ReplacementOrderBuilding)) continue; // fill-extrusions always get removed. This will be separated (similar to symbol and model) in future.
1368+
if ((region.order < layerIndex)) continue;
13691369

13701370
// Apply slight padding to footprints. This reduces false positives where two adjacent lines
13711371
// would be reported overlapping due to limited precision (16 bit) of tile units.

test/ignores/all.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,6 @@ const skip = [
279279
"render-tests/building/terrain/terrain-unsupported",
280280
"render-tests/building/globe-unsupported",
281281

282-
// Ignore procedural buiding clip layer render tests for now.
283-
"render-tests/building/clip-layer/default",
284-
"render-tests/building/clip-layer/lower-order-clipping-skipped",
285-
"render-tests/building/clip-layer/with-FE-and-landmarks",
286-
287282
// Not implemented, https://mapbox.atlassian.net/browse/GLJS-1591
288283
"render-tests/slots/inner-slot-before-outer",
289284
"render-tests/slots/mixed-slot-order-with-imports",

0 commit comments

Comments
 (0)