diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-04-27 17:18:29 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-05-03 14:17:25 -0700 |
| commit | 27b21363e62c105db0b040b4c5a5ef31170ebd30 (patch) | |
| tree | 65e3b174fcf583378450252e2a322dbc79ee1a79 /test/gl | |
| parent | 60ac08afae3d3ca0e94ce4f1ce7dfb98c25e2345 (diff) | |
| download | qtlocation-mapboxgl-27b21363e62c105db0b040b4c5a5ef31170ebd30.tar.gz | |
[core] Only run placement for first layer per SymbolBucket
Native version of mapbox/mapbox-gl-js#6548.
Port of mapbox/mapbox-gl-js#6550.
Prevents symbols that share the same layout properties from colliding against each other.
Bump GL JS pin to get regression test.
Rename "bucketName" -> "bucketLeaderID" to make it clearer what it represents.
Diffstat (limited to 'test/gl')
| -rw-r--r-- | test/gl/bucket.test.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp index 8393fd130d..9b28b2e01a 100644 --- a/test/gl/bucket.test.cpp +++ b/test/gl/bucket.test.cpp @@ -110,10 +110,11 @@ TEST(Buckets, SymbolBucket) { bool sdfIcons = false; bool iconsNeedLinear = false; bool sortFeaturesByY = false; + std::string bucketLeaderID = "test"; std::vector<SymbolInstance> symbolInstances; gl::Context context; - SymbolBucket bucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, std::move(symbolInstances) }; + SymbolBucket bucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(symbolInstances) }; ASSERT_FALSE(bucket.hasIconData()); ASSERT_FALSE(bucket.hasTextData()); ASSERT_FALSE(bucket.hasCollisionBoxData()); |