From 7ad7d335a12a9c08315e360be23f8c5f3975d687 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Wed, 15 Nov 2017 11:44:42 -0500 Subject: add unit test for CrossTileSymbolIndex --- cmake/test-files.cmake | 3 +- test/text/cross_tile_symbol_index.cpp | 84 +++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 test/text/cross_tile_symbol_index.cpp diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index f291650238..7b9c204bb7 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -22,8 +22,8 @@ set(MBGL_TEST_FILES # gl test/gl/bucket.test.cpp - test/gl/object.test.cpp test/gl/context.test.cpp + test/gl/object.test.cpp # include/mbgl test/include/mbgl/test.hpp @@ -111,6 +111,7 @@ set(MBGL_TEST_FILES test/style/style_parser.test.cpp # text + test/text/cross_tile_symbol_index.cpp test/text/glyph_loader.test.cpp test/text/glyph_pbf.test.cpp test/text/quads.test.cpp diff --git a/test/text/cross_tile_symbol_index.cpp b/test/text/cross_tile_symbol_index.cpp new file mode 100644 index 0000000000..ea755a4b99 --- /dev/null +++ b/test/text/cross_tile_symbol_index.cpp @@ -0,0 +1,84 @@ +#include +#include +#include + +using namespace mbgl; + +SymbolInstance makeSymbolInstance(float x, float y, std::u16string key) { + GeometryCoordinates line; + GlyphPositionMap gpm; + const std::pair shaping(Shaping{}, Shaping{}); + style::SymbolLayoutProperties::Evaluated layout_; + IndexedSubfeature subfeature(0, "", "", 0); + Anchor anchor(x, y, 0, 0); + return {anchor, line, shaping, {}, layout_, 0, 0, 0, 0, style::SymbolPlacementType::Point, {{0, 0}}, 0, 0, {{0, 0}}, gpm, subfeature, 0, key, 0 }; +} + + +TEST(CrossTileSymbolLayerIndex, addBucket) { + + CrossTileSymbolLayerIndex index; + + style::SymbolLayoutProperties::PossiblyEvaluated layout; + bool sdfIcons = false; + bool iconsNeedLinear = false; + bool sortFeaturesByY = false; + + + OverscaledTileID mainID(6, 0, 6, 8, 8); + std::vector mainInstances; + mainInstances.push_back(makeSymbolInstance(1000, 1000, u"Detroit")); + mainInstances.push_back(makeSymbolInstance(2000, 2000, u"Toronto")); + SymbolBucket mainBucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, std::move(mainInstances) }; + index.addBucket(mainID, mainBucket); + + // Assigned new IDs + ASSERT_EQ(mainBucket.symbolInstances.at(0).crossTileID, 1u); + ASSERT_EQ(mainBucket.symbolInstances.at(1).crossTileID, 2u); + + + OverscaledTileID childID(7, 0, 7, 16, 16); + std::vector childInstances; + childInstances.push_back(makeSymbolInstance(2000, 2000, u"Detroit")); + childInstances.push_back(makeSymbolInstance(2000, 2000, u"Windsor")); + childInstances.push_back(makeSymbolInstance(3000, 3000, u"Toronto")); + childInstances.push_back(makeSymbolInstance(4001, 4001, u"Toronto")); + SymbolBucket childBucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, std::move(childInstances) }; + index.addBucket(childID, childBucket); + + // matched parent tile + ASSERT_EQ(childBucket.symbolInstances.at(0).crossTileID, 1u); + // does not match because of different key + ASSERT_EQ(childBucket.symbolInstances.at(1).crossTileID, 3u); + // does not match because of different location + ASSERT_EQ(childBucket.symbolInstances.at(2).crossTileID, 4u); + // matches with a slightly different location + ASSERT_EQ(childBucket.symbolInstances.at(3).crossTileID, 2u); + + OverscaledTileID parentID(5, 0, 5, 4, 4); + std::vector parentInstances; + parentInstances.push_back(makeSymbolInstance(500, 500, u"Detroit")); + SymbolBucket parentBucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, std::move(parentInstances) }; + index.addBucket(parentID, parentBucket); + + // matched child tile + ASSERT_EQ(parentBucket.symbolInstances.at(0).crossTileID, 1u); + + std::unordered_set currentIDs; + currentIDs.insert(mainBucket.bucketInstanceId); + index.removeStaleBuckets(currentIDs); + + // grandchild + OverscaledTileID grandchildID(8, 0, 8, 32, 32); + std::vector grandchildInstances; + grandchildInstances.push_back(makeSymbolInstance(4000, 4000, u"Detroit")); + grandchildInstances.push_back(makeSymbolInstance(4000, 4000, u"Windsor")); + SymbolBucket grandchildBucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, std::move(grandchildInstances) }; + index.addBucket(grandchildID, grandchildBucket); + + // Matches the symbol in `mainBucket` + ASSERT_EQ(grandchildBucket.symbolInstances.at(0).crossTileID, 1u); + // Does not match the previous value for Windsor because that tile was removed + ASSERT_EQ(grandchildBucket.symbolInstances.at(1).crossTileID, 5u); + +} -- cgit v1.2.1