tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update linux-ci to Ubuntu 24.04, apply clang-tidy fixes (#3998)

Browse Source
This commit is contained in:
Bart Louwers
2025-12-11 21:56:24 +01:00
committed by GitHub
parent 83d34c3a17
commit 5882a9c94e
117 changed files with 927 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/api/annotations.test.cpp
View File

@@ -1,3 +1,4 @@
#include <algorithm>
#include <mbgl/test/util.hpp>
#include <mbgl/test/stub_file_source.hpp>
#include <mbgl/test/map_adapter.hpp>
@@ -12,6 +13,8 @@
#include <mbgl/renderer/renderer.hpp>
#include <mbgl/gfx/headless_frontend.hpp>
#include <algorithm>
using namespace mbgl;
namespace {
@@ -416,8 +419,9 @@ TEST(Annotations, QueryFractionalZoomLevels) {
auto sameID = [](const Feature& lhs, const Feature& rhs) {
return lhs.id == rhs.id;
};
std::sort(features.begin(), features.end(), sortID);
features.erase(std::unique(features.begin(), features.end(), sameID), features.end());
std::ranges::sort(features, sortID);
features.erase(std::unique(features.begin(), features.end(), sameID),
features.end()); // NOLINT(modernize-use-ranges)
EXPECT_EQ(features.size(), ids.size());
}
}
@@ -451,15 +455,17 @@ TEST(Annotations, VisibleFeatures) {
auto sameID = [](const Feature& lhs, const Feature& rhs) {
return lhs.id == rhs.id;
};
std::sort(features.begin(), features.end(), sortID);
features.erase(std::unique(features.begin(), features.end(), sameID), features.end());
std::ranges::sort(features, sortID);
features.erase(std::unique(features.begin(), features.end(), sameID),
features.end()); // NOLINT(modernize-use-ranges)
EXPECT_EQ(features.size(), ids.size());
test.map.jumpTo(CameraOptions().withZoom(4.0).withBearing(0.0));
test.frontend.render(test.map);
features = test.frontend.getRenderer()->queryRenderedFeatures(box);
std::sort(features.begin(), features.end(), sortID);
features.erase(std::unique(features.begin(), features.end(), sameID), features.end());
std::ranges::sort(features, sortID);
features.erase(std::unique(features.begin(), features.end(), sameID),
features.end()); // NOLINT(modernize-use-ranges)
EXPECT_EQ(features.size(), ids.size());
}
@@ -541,9 +547,9 @@ TEST(Annotations, ViewFrustumCulling) {
test.frontend.render(test.map);
auto features = test.frontend.getRenderer()->queryRenderedFeatures(box, {});
for (uint64_t id : testCase.second) { // testCase.second is vector of ids expected.
EXPECT_NE(std::find_if(features.begin(),
features.end(),
[&id](auto feature) { return id == feature.id.template get<uint64_t>(); }),
EXPECT_NE(std::ranges::find_if(features,
[&id](auto feature) { return id == feature.id.template get<uint64_t>(); }),
features.end())
<< "Point with id " << id << " is missing in test case " << i;
EXPECT_EQ(features.size(), testCase.second.size()) << " in test case " << i;