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

core: rename mbgl namespace to mln (#4487)

Browse Source 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Bart Louwers
2026-08-14 23:25:20 +02:00
committed by GitHub
parent 836b862984
commit 550f64be22
1970 changed files with 8931 additions and 8967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/storage/asset_file_source.test.cpp
View File

@@ -11,7 +11,7 @@
#include <gtest/gtest.h>
#include <atomic>
using namespace mbgl;
using namespace mln;
#if !ANDROID
TEST(AssetFileSource, Load) {
@@ -29,13 +29,13 @@ TEST(AssetFileSource, Load) {
class TestWorker {
public:
TestWorker(ActorRef<TestWorker>, mbgl::AssetFileSource* fs_)
TestWorker(ActorRef<TestWorker>, mln::AssetFileSource* fs_)
: fs(fs_) {}
void run(std::function<void()> endCallback) {
const std::string asset("asset://nonempty");
requestCallback = [this, asset, endCallback](mbgl::Response res) {
requestCallback = [this, asset, endCallback](mln::Response res) {
EXPECT_EQ(nullptr, res.error);
ASSERT_TRUE(res.data.get());
EXPECT_EQ("content is here\n", *res.data);
@@ -44,20 +44,20 @@ TEST(AssetFileSource, Load) {
endCallback();
request.reset();
} else {
request = fs->request({mbgl::Resource::Unknown, asset}, requestCallback);
request = fs->request({mln::Resource::Unknown, asset}, requestCallback);
}
};
request = fs->request({mbgl::Resource::Unknown, asset}, requestCallback);
request = fs->request({mln::Resource::Unknown, asset}, requestCallback);
}
private:
unsigned numRequests = 1000;
mbgl::AssetFileSource* fs;
std::unique_ptr<mbgl::AsyncRequest> request;
mln::AssetFileSource* fs;
std::unique_ptr<mln::AsyncRequest> request;
std::function<void(mbgl::Response)> requestCallback;
std::function<void(mln::Response)> requestCallback;
};
std::vector<std::unique_ptr<util::Thread<TestWorker>>> threads;

4
test/storage/database_file_source.test.cpp
View File

@@ -7,7 +7,7 @@
#include <gtest/gtest.h>
using namespace mbgl;
using namespace mln;
TEST(DatabaseFileSource, PauseResume) {
util::RunLoop loop;
@@ -34,7 +34,7 @@ TEST(DatabaseFileSource, VolatileResource) {
Resource resource{Resource::Unknown, "http://127.0.0.1:3000/test", {}, Resource::LoadingMethod::CacheOnly};
Response response{};
response.data = std::make_shared<std::string>("Cached value");
std::unique_ptr<mbgl::AsyncRequest> req;
std::unique_ptr<mln::AsyncRequest> req;
dbfs->forward(resource, response, [&] {
req = dbfs->request(resource, [&](Response res1) {

2
test/storage/headers.test.cpp
View File

@@ -2,7 +2,7 @@
#include <mbgl/util/http_header.hpp>
TEST(HTTPHeader, Parsing) {
using namespace mbgl;
using namespace mln;
http::CacheControl cc;

2
test/storage/http_file_source.test.cpp
View File

@@ -7,7 +7,7 @@
#include <mbgl/util/string.hpp>
#include <mbgl/storage/resource_options.hpp>
using namespace mbgl;
using namespace mln;
TEST(HTTPFileSource, TEST_REQUIRES_SERVER(Cancel)) {
util::RunLoop loop;

4
test/storage/local_file_source.test.cpp
View File

@@ -27,14 +27,14 @@ std::string toAbsoluteURL(const std::string& fileName) {
char* cwd = getcwd(buff, PATH_MAX + 1);
#endif
// NOLINTNEXTLINE(clang-analyzer-nullability.NullPassedToNonnull)
std::string url = {mbgl::util::FILE_PROTOCOL + std::string(cwd) + "/test/fixtures/storage/assets/" + fileName};
std::string url = {mln::util::FILE_PROTOCOL + std::string(cwd) + "/test/fixtures/storage/assets/" + fileName};
assert(url.size() <= PATH_MAX);
return url;
}
} // namespace
using namespace mbgl;
using namespace mln;
TEST(LocalFileSource, AcceptsURL) {
LocalFileSource fs(ResourceOptions::Default(), ClientOptions());

2
test/storage/main_resource_loader.test.cpp
View File

@@ -12,7 +12,7 @@
#include <mbgl/util/timer.hpp>
#include <mbgl/util/tile_server_options.hpp>
using namespace mbgl;
using namespace mln;
TEST(MainResourceLoader, TEST_REQUIRES_SERVER(CacheResponse)) {
util::RunLoop loop;

2
test/storage/mbtiles_file_source.test.cpp
View File

@@ -18,7 +18,7 @@ std::string toAbsoluteURL(const std::string &fileName) {
} // namespace
using namespace mbgl;
using namespace mln;
TEST(MBTilesFileSource, AcceptsURL) {
MBTilesFileSource mbtiles(ResourceOptions::Default(), ClientOptions());

4
test/storage/offline.test.cpp
View File

@@ -3,8 +3,8 @@
#include <gtest/gtest.h>
using namespace mbgl;
using SourceType = mbgl::style::SourceType;
using namespace mln;
using SourceType = mln::style::SourceType;
TEST(OfflineTilePyramidRegionDefinition, EncodeDecode) {
OfflineTilePyramidRegionDefinition region(

2
test/storage/offline_database.test.cpp
View File

@@ -15,7 +15,7 @@
#include <variant>
using namespace std::literals::string_literals;
using namespace mbgl;
using namespace mln;
using mapbox::sqlite::ResultCode;
static constexpr const char* filename = "test/fixtures/offline_database/offline.db";

2
test/storage/offline_download.test.cpp
View File

@@ -19,7 +19,7 @@
#include <mbgl/storage/sqlite3.hpp>
#include <gtest/gtest.h>
using namespace mbgl;
using namespace mln;
using namespace std::literals::string_literals;
using mapbox::sqlite::ResultCode;

6
test/storage/online_file_source.test.cpp
View File

@@ -11,7 +11,7 @@
#include <gtest/gtest.h>
using namespace mbgl;
using namespace mln;
#ifdef WIN32
// Windows doesn't fail immediately like other OS
@@ -309,7 +309,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusChange)) {
// After 50 milliseconds, we're going to trigger a NetworkStatus change.
util::Timer reachableTimer;
reachableTimer.start(Milliseconds(50), Duration::zero(), []() { mbgl::NetworkStatus::Reachable(); });
reachableTimer.start(Milliseconds(50), Duration::zero(), []() { mln::NetworkStatus::Reachable(); });
loop.run();
}
@@ -357,7 +357,7 @@ TEST(OnlineFileSource, TEST_REQUIRES_SERVER(NetworkStatusChangePreempt)) {
// After 400 milliseconds + connectionTimeout, we're going to trigger a NetworkStatus change.
util::Timer reachableTimer;
reachableTimer.start(Milliseconds(static_cast<int>(connectionTimeout * 1000) + 400), Duration::zero(), []() {
mbgl::NetworkStatus::Reachable();
mln::NetworkStatus::Reachable();
});
fs->resume();

4
test/storage/pmtiles_file_source.test.cpp
View File

@@ -13,12 +13,12 @@ namespace {
std::string toAbsoluteURL(const std::string &fileName) {
auto path = std::filesystem::current_path() / "test/fixtures/storage/pmtiles" / fileName;
return std::string(mbgl::util::PMTILES_PROTOCOL) + std::string(mbgl::util::FILE_PROTOCOL) + path.string();
return std::string(mln::util::PMTILES_PROTOCOL) + std::string(mln::util::FILE_PROTOCOL) + path.string();
}
} // namespace
using namespace mbgl;
using namespace mln;
TEST(PMTilesFileSource, AcceptsURL) {
PMTilesFileSource pmtiles(ResourceOptions::Default(), ClientOptions());

14
test/storage/resource.test.cpp
View File

@@ -3,21 +3,21 @@
#include <gtest/gtest.h>
TEST(Resource, Style) {
using namespace mbgl;
using namespace mln;
Resource resource = Resource::style("http://example.com");
EXPECT_EQ(Resource::Kind::Style, resource.kind);
EXPECT_EQ("http://example.com", resource.url);
}
TEST(Resource, Source) {
using namespace mbgl;
using namespace mln;
Resource resource = Resource::source("http://example.com");
EXPECT_EQ(Resource::Kind::Source, resource.kind);
EXPECT_EQ("http://example.com", resource.url);
}
TEST(Resource, Tile) {
using namespace mbgl;
using namespace mln;
Resource rasterTile = Resource::tile(
"http://example.com/{z}/{x}/{y}{ratio}.png", 2.0, 1, 2, 3, Tileset::Scheme::XYZ);
@@ -106,14 +106,14 @@ TEST(Resource, Tile) {
}
TEST(Resource, Glyphs) {
using namespace mbgl;
using namespace mln;
Resource resource = Resource::glyphs("http://example.com/{fontstack}/{range}", {{"stack"}}, {0, 255});
EXPECT_EQ(Resource::Kind::Glyphs, resource.kind);
EXPECT_EQ("http://example.com/stack/0-255", resource.url);
}
TEST(Resource, SpriteImage) {
using namespace mbgl;
using namespace mln;
Resource resource = Resource::spriteImage("http://example.com/sprite", 2.0);
EXPECT_EQ(Resource::Kind::SpriteImage, resource.kind);
EXPECT_EQ("http://example.com/sprite@2x.png", resource.url);
@@ -124,14 +124,14 @@ TEST(Resource, SpriteImage) {
}
TEST(Resource, Image) {
using namespace mbgl;
using namespace mln;
Resource resource = Resource::image("http://example.com/sprite.jpg");
EXPECT_EQ(Resource::Kind::Image, resource.kind);
EXPECT_EQ("http://example.com/sprite.jpg", resource.url);
}
TEST(Resource, SpriteJSON) {
using namespace mbgl;
using namespace mln;
Resource resource = Resource::spriteJSON("http://example.com/sprite", 2.0);
EXPECT_EQ(Resource::Kind::SpriteJSON, resource.kind);
EXPECT_EQ("http://example.com/sprite@2x.json", resource.url);

4
test/storage/sqlite.test.cpp
View File

@@ -3,10 +3,10 @@
#include <mbgl/storage/sqlite3.hpp>
using namespace mbgl;
using namespace mln;
TEST(SQLite, Statement) {
using namespace mbgl;
using namespace mln;
mapbox::sqlite::Database db = mapbox::sqlite::Database::open(":memory:", mapbox::sqlite::ReadWriteCreate);
db.exec("CREATE TABLE test (id INTEGER);");

2
test/storage/sync_file_source.test.cpp
View File

@@ -14,7 +14,7 @@
#include <gtest/gtest.h>
using namespace mbgl;
using namespace mln;
class SyncFileSource : public FileSource {
public: