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

12
test/style/conversion/conversion_impl.test.cpp
View File

@@ -1,7 +1,7 @@
#include <mbgl/test/util.hpp>
#include <mbgl/style/conversion_impl.hpp>
namespace mbgl {
namespace mln {
namespace style {
namespace conversion {
@@ -47,18 +47,18 @@ public:
static std::optional<std::string> toString(const MockConvertible&) { return std::nullopt; }
static std::optional<mbgl::Value> toValue(const MockConvertible&) { return std::nullopt; }
static std::optional<mln::Value> toValue(const MockConvertible&) { return std::nullopt; }
static std::optional<GeoJSON> toGeoJSON(const MockConvertible&, Error&) { return std::nullopt; }
};
} // namespace conversion
} // namespace style
} // namespace mbgl
} // namespace mln
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
TEST(Conversion, Move) {
int dtorCounter = 0;

12
test/style/conversion/function.test.cpp
View File

@@ -6,9 +6,9 @@
#include <mbgl/style/expression/dsl.hpp>
#include <mbgl/util/logging.hpp>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
TEST(StyleConversion, Function) {
Error error;
@@ -94,7 +94,7 @@ TEST(StyleConversion, TokenStrings) {
ASSERT_TRUE(hasTokens("token {token}"));
ASSERT_TRUE(hasTokens("{token} {token}"));
using namespace mbgl::style::expression::dsl;
using namespace mln::style::expression::dsl;
ASSERT_EQ(*convertTokenStringToExpression("{token}"), *toString(get(literal("token"))));
ASSERT_EQ(*convertTokenStringToExpression("token {token}"), *concat(vec(literal("token "), get(literal("token")))));
ASSERT_EQ(*convertTokenStringToExpression("{token} token"), *concat(vec(get(literal("token")), literal(" token"))));
@@ -112,10 +112,10 @@ TEST(StyleConversion, FormattedIdentityFunction) {
Error error;
auto parseFunction = [&](const std::string& json) {
return convertJSON<PropertyValue<mbgl::style::expression::Formatted>>(json, error, true, false);
return convertJSON<PropertyValue<mln::style::expression::Formatted>>(json, error, true, false);
};
using namespace mbgl::style::expression::dsl;
using namespace mln::style::expression::dsl;
auto fn1 = parseFunction(R"({ "property": "name", "type": "identity" })");
ASSERT_TRUE(bool(fn1));

4
test/style/conversion/geojson_options.test.cpp
View File

@@ -5,8 +5,8 @@
#include <mbgl/util/logging.hpp>
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln::style;
using namespace mln::style::conversion;
TEST(GeoJSONOptions, Basic) {
Error error;

6
test/style/conversion/layer.test.cpp
View File

@@ -7,9 +7,9 @@
#include <rapidjson/prettywriter.h>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
using namespace std::literals::chrono_literals;
std::unique_ptr<Layer> parseLayer(const std::string& src) {

30
test/style/conversion/light.test.cpp
View File

@@ -12,9 +12,9 @@
#include <array>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
TEST(StyleConversion, Light) {
Error error;
@@ -27,30 +27,30 @@ TEST(StyleConversion, Light) {
auto light = parseLight("{}");
ASSERT_TRUE((bool)light);
const mbgl::JSValue colorValue("blue");
const mln::JSValue colorValue("blue");
light->setProperty("color", &colorValue);
ASSERT_FALSE(light->getColor().isUndefined());
ASSERT_TRUE(light->getColor().isConstant());
ASSERT_EQ(light->getColor().asConstant(), mbgl::Color::blue());
ASSERT_EQ(light->getColor().asConstant(), mln::Color::blue());
const mbgl::JSValue intensityValue(0.5);
const mln::JSValue intensityValue(0.5);
light->setProperty("intensity", &intensityValue);
ASSERT_FALSE(light->getIntensity().isUndefined());
ASSERT_TRUE(light->getIntensity().isConstant());
ASSERT_EQ(light->getIntensity().asConstant(), 0.5);
mbgl::JSValue::AllocatorType allocator;
const mbgl::JSValue positionValue(std::move(mbgl::JSValue(rapidjson::kArrayType)
.PushBack(1.f, allocator)
.PushBack(2.f, allocator)
.PushBack(3.f, allocator)
.Move()));
mln::JSValue::AllocatorType allocator;
const mln::JSValue positionValue(std::move(mln::JSValue(rapidjson::kArrayType)
.PushBack(1.f, allocator)
.PushBack(2.f, allocator)
.PushBack(3.f, allocator)
.Move()));
light->setProperty("position", &positionValue);
ASSERT_FALSE(light->getPosition().isUndefined());
ASSERT_TRUE(light->getPosition().isConstant());
std::array<float, 3> expected{{1.f, 2.f, 3.f}};
ASSERT_EQ(light->getPosition().asConstant(), mbgl::style::Position({expected}));
ASSERT_EQ(light->getPosition().asConstant(), mln::style::Position({expected}));
}
{
@@ -74,7 +74,7 @@ TEST(StyleConversion, Light) {
ASSERT_FALSE(light->getPosition().isUndefined());
ASSERT_TRUE(light->getPosition().isConstant());
std::array<float, 3> expected{{3, 90, 90}};
ASSERT_EQ(light->getPosition().asConstant(), mbgl::style::Position({expected}));
ASSERT_EQ(light->getPosition().asConstant(), mln::style::Position({expected}));
ASSERT_FALSE(light->getPosition().isExpression());
}
@@ -85,7 +85,7 @@ TEST(StyleConversion, Light) {
ASSERT_FALSE(light->getColor().isUndefined());
ASSERT_TRUE(light->getColor().isConstant());
ASSERT_FALSE(light->getColor().isExpression());
ASSERT_EQ(light->getColorTransition().duration, mbgl::Duration(mbgl::Milliseconds(1000)));
ASSERT_EQ(light->getColorTransition().duration, mln::Duration(mln::Milliseconds(1000)));
ASSERT_FALSE((bool)light->getColorTransition().delay);
}

6
test/style/conversion/padding.test.cpp
View File

@@ -7,9 +7,9 @@
#include <array>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
TEST(StyleConversion, Padding) {
Error error;

6
test/style/conversion/property_value.test.cpp
View File

@@ -4,9 +4,9 @@
#include <mbgl/style/conversion/property_value.hpp>
#include <mbgl/util/rapidjson.hpp>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
TEST(StyleConversion, PropertyValue) {
// PropertyValue<T> accepts a constant expression:

6
test/style/conversion/source_options.test.cpp
View File

@@ -6,9 +6,9 @@
#include <mbgl/util/logging.hpp>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
TEST(SourceOptions, Basic) {
Error error;

12
test/style/conversion/stringify.test.cpp
View File

@@ -10,9 +10,9 @@
#include <rapidjson/writer.h>
#include <rapidjson/stringbuffer.h>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
template <class T>
std::string stringify(const T& t) {
@@ -83,13 +83,13 @@ TEST(Stringify, Value) {
}
TEST(Stringify, Filter) {
using namespace mbgl::style::expression::dsl;
using namespace mln::style::expression::dsl;
ASSERT_EQ(stringify(Filter()), "null");
ASSERT_EQ(stringify(Filter(eq(literal("a"), literal("b")))), "[\"==\",\"a\",\"b\"]");
}
TEST(Stringify, PropertyExpression) {
using namespace mbgl::style::expression::dsl;
using namespace mln::style::expression::dsl;
ASSERT_EQ(stringify(PropertyExpression<float>(interpolate(linear(), zoom(), 0.0, literal(1.0), 1.0, literal(2.0)))),
"[\"interpolate\",[\"linear\"],[\"zoom\"],0.0,1.0,1.0,2.0]");
@@ -115,7 +115,7 @@ TEST(Stringify, PropertyExpression) {
}
TEST(Stringify, PropertyValue) {
using namespace mbgl::style::expression::dsl;
using namespace mln::style::expression::dsl;
ASSERT_EQ(stringify(PropertyValue<float>(1)), "1.0");
ASSERT_EQ(stringify(PropertyValue<float>(PropertyExpression<float>(
interpolate(exponential(2.0), zoom(), 0.0, literal(1.0), 1.0, literal(2.0))))),

4
test/style/conversion/tileset.test.cpp
View File

@@ -5,8 +5,8 @@
#include <mbgl/util/logging.hpp>
using namespace mbgl;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style::conversion;
TEST(Tileset, Empty) {
Error error;

10
test/style/expression/dependency.test.cpp
View File

@@ -4,15 +4,15 @@
#include <mbgl/style/layers/custom_layer_impl.hpp>
#include <mbgl/test/util.hpp>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::expression;
using namespace mbgl::style::expression::dsl;
using namespace mln;
using namespace mln::style;
using namespace mln::style::expression;
using namespace mln::style::expression::dsl;
using namespace std::string_literals;
namespace std {
using ::mbgl::operator<<;
using ::mln::operator<<;
}
template <typename T>

4
test/style/expression/expression.test.cpp
View File

@@ -10,8 +10,8 @@
#include <filesystem>
#include <fstream>
using namespace mbgl;
using namespace mbgl::style;
using namespace mln;
using namespace mln::style;
TEST(Expression, IsExpression) {
rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> spec;

2
test/style/expression/utf8_op_helpers.test.cpp
View File

@@ -2,7 +2,7 @@
#include <mbgl/style/expression/utf8_op_helpers.hpp>
using namespace mbgl::style::expression;
using namespace mln::style::expression;
TEST(Utf8OpHelpers, unicodeLengthOnValidatedUtf8) {
EXPECT_EQ(unicodeLengthOnValidatedUtf8(""), 0);

4
test/style/expression/util.test.cpp
View File

@@ -1,8 +1,8 @@
#include <mbgl/test/util.hpp>
#include <mbgl/style/expression/util.hpp>
using namespace mbgl;
using namespace mbgl::style::expression;
using namespace mln;
using namespace mln::style::expression;
TEST(Expression, Util_rgba) {
Result<Color> valid = rgba(0, 0, 0, 0);

4
test/style/filter.test.cpp
View File

@@ -16,8 +16,8 @@
#include <rapidjson/writer.h>
#include <rapidjson/stringbuffer.h>
using namespace mbgl;
using namespace mbgl::style;
using namespace mln;
using namespace mln::style;
bool filter(const char* json,
const PropertyMap& featureProperties = {{}},

6
test/style/properties.test.cpp
View File

@@ -5,8 +5,8 @@
#include <mbgl/renderer/property_evaluator.hpp>
#include <mbgl/renderer/data_driven_property_evaluator.hpp>
using namespace mbgl;
using namespace mbgl::style;
using namespace mln;
using namespace mln::style;
using namespace std::literals::chrono_literals;
float evaluate(Transitioning<PropertyValue<float>>& property, Duration delta = Duration::zero()) {
@@ -83,7 +83,7 @@ TEST(TransitioningDataDrivenPropertyValue, Evaluate) {
Transitioning<PropertyValue<float>> t0{
PropertyValue<float>(0.0f), Transitioning<PropertyValue<float>>(), TransitionOptions(), TimePoint::min()};
using namespace mbgl::style::expression::dsl;
using namespace mln::style::expression::dsl;
PropertyExpression<float> expression(number(get("property_name")));
Transitioning<PropertyValue<float>> t1{PropertyValue<float>(expression), t0, transition, TimePoint::min()};

40
test/style/property_expression.test.cpp
View File

@@ -11,15 +11,15 @@
#include <sstream>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::expression;
using namespace mbgl::style::expression::dsl;
using namespace mln;
using namespace mln::style;
using namespace mln::style::expression;
using namespace mln::style::expression::dsl;
using namespace std::string_literals;
namespace std {
using ::mbgl::operator<<;
using ::mln::operator<<;
}
static const StubGeometryTileFeature oneInteger{PropertyMap{{"property", uint64_t(1)}}};
@@ -651,13 +651,13 @@ TEST(PropertyExpression, DistanceExpression) {
}
const auto getFeature = [](const std::string &name, FeatureType type, const CanonicalTileID &canonical) {
const auto geometryInput = mbgl::util::read_file(std::string("test/fixtures/geometry_data/" + name));
const auto geometryInput = mln::util::read_file(std::string("test/fixtures/geometry_data/" + name));
mapbox::geojson::geojson geojson{mapbox::geojson::parse(geometryInput)};
const auto &geometry = geojson.match(
[](const mapbox::geometry::geometry<double> &geometrySet) { return mbgl::Feature(geometrySet).geometry; },
[](const mapbox::feature::feature<double> &feature) { return mbgl::Feature(feature).geometry; },
[](const mapbox::geometry::geometry<double> &geometrySet) { return mln::Feature(geometrySet).geometry; },
[](const mapbox::feature::feature<double> &feature) { return mln::Feature(feature).geometry; },
[](const mapbox::feature::feature_collection<double> &features) {
return mbgl::Feature(features.front()).geometry;
return mln::Feature(features.front()).geometry;
},
[](const auto &) { return mapbox::geometry::empty(); });
return StubGeometryTileFeature(type, convertGeometry(geometry, canonical));
@@ -665,7 +665,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with MultiPoint to MultiPoint distance
{
const auto multiPoints1 = mbgl::util::read_file("test/fixtures/geometry_data/multi_point_1.geojson");
const auto multiPoints1 = mln::util::read_file("test/fixtures/geometry_data/multi_point_1.geojson");
const auto multiPointsFeature = getFeature("multi_point_2.geojson", FeatureType::Point, canonicalTileID);
std::stringstream ss;
ss << std::string(R"(["distance", )") << multiPoints1 << std::string(R"( ])");
@@ -680,7 +680,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with MultiPoint to LineString distance
{
const auto multiPoints1 = mbgl::util::read_file("test/fixtures/geometry_data/multi_point_1.geojson");
const auto multiPoints1 = mln::util::read_file("test/fixtures/geometry_data/multi_point_1.geojson");
const auto multiLineFeature = getFeature("line_string_2.geojson", FeatureType::LineString, canonicalTileID);
std::stringstream ss;
ss << std::string(R"(["distance", )") << multiPoints1 << std::string(R"( ])");
@@ -693,7 +693,7 @@ TEST(PropertyExpression, DistanceExpression) {
EXPECT_NEAR(258.691, evaluatedResult, 0.01);
// ----------------- switch feature and argument -----------------
const auto multiLine2 = mbgl::util::read_file("test/fixtures/geometry_data/line_string_2.geojson");
const auto multiLine2 = mln::util::read_file("test/fixtures/geometry_data/line_string_2.geojson");
const auto multiPointsFeature = getFeature("multi_point_1.geojson", FeatureType::Point, canonicalTileID);
std::stringstream ss1;
ss1 << std::string(R"(["distance", )") << multiLine2 << std::string(R"( ])");
@@ -708,7 +708,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with LineString to LineString distance
{
const auto lineString1 = mbgl::util::read_file("test/fixtures/geometry_data/line_string_1.geojson");
const auto lineString1 = mln::util::read_file("test/fixtures/geometry_data/line_string_1.geojson");
const auto lineFeature = getFeature("line_string_2.geojson", FeatureType::LineString, canonicalTileID);
std::stringstream ss;
ss << std::string(R"(["distance", )") << lineString1 << std::string(R"( ])");
@@ -723,7 +723,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with MultiPoints to MutltiLineString distance
{
const auto multiPoints = mbgl::util::read_file("test/fixtures/geometry_data/multi_point_2.geojson");
const auto multiPoints = mln::util::read_file("test/fixtures/geometry_data/multi_point_2.geojson");
const auto multiLineFeature = getFeature(
"multi_line_string_1.geojson", FeatureType::LineString, canonicalTileID);
std::stringstream ss;
@@ -739,7 +739,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with LineString to MutltiLineString distance
{
const auto LineString1 = mbgl::util::read_file("test/fixtures/geometry_data/line_string_1.geojson");
const auto LineString1 = mln::util::read_file("test/fixtures/geometry_data/line_string_1.geojson");
const auto multiLineFeature = getFeature(
"multi_line_string_2.geojson", FeatureType::LineString, canonicalTileID);
std::stringstream ss;
@@ -755,7 +755,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with MultiLineString to MutltiLineString distance
{
const auto multiLineString1 = mbgl::util::read_file("test/fixtures/geometry_data/multi_line_string_1.geojson");
const auto multiLineString1 = mln::util::read_file("test/fixtures/geometry_data/multi_line_string_1.geojson");
const auto multiLineFeature = getFeature(
"multi_line_string_2.geojson", FeatureType::LineString, canonicalTileID);
std::stringstream ss;
@@ -771,7 +771,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with MultiPoint to MultiPolygon distance
{
const auto multiPolygon = mbgl::util::read_file("test/fixtures/geometry_data/multi_polygon_1.geojson");
const auto multiPolygon = mln::util::read_file("test/fixtures/geometry_data/multi_polygon_1.geojson");
std::stringstream ss;
ss << std::string(R"(["distance", )") << multiPolygon << std::string(R"( ])");
auto expression = createExpression(ss.str().c_str());
@@ -791,7 +791,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with MultiLine to MultiPolygon distance
{
const auto multiPolygon = mbgl::util::read_file("test/fixtures/geometry_data/multi_polygon_1.geojson");
const auto multiPolygon = mln::util::read_file("test/fixtures/geometry_data/multi_polygon_1.geojson");
std::stringstream ss;
ss << std::string(R"(["distance", )") << multiPolygon << std::string(R"( ])");
auto expression = createExpression(ss.str().c_str());
@@ -813,7 +813,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with Polygon to MultiPolygon distance
{
const auto multiPolygon = mbgl::util::read_file("test/fixtures/geometry_data/multi_polygon_1.geojson");
const auto multiPolygon = mln::util::read_file("test/fixtures/geometry_data/multi_polygon_1.geojson");
std::stringstream ss;
ss << std::string(R"(["distance", )") << multiPolygon << std::string(R"( ])");
auto expression = createExpression(ss.str().c_str());
@@ -835,7 +835,7 @@ TEST(PropertyExpression, DistanceExpression) {
// Evaluation test with MultiPolygon to MultiPolygon distance
{
const auto multiPolygon = mbgl::util::read_file("test/fixtures/geometry_data/multi_polygon_1.geojson");
const auto multiPolygon = mln::util::read_file("test/fixtures/geometry_data/multi_polygon_1.geojson");
std::stringstream ss;
ss << std::string(R"(["distance", )") << multiPolygon << std::string(R"( ])");
auto expression = createExpression(ss.str().c_str());

4
test/style/source.test.cpp
View File

@@ -51,8 +51,8 @@
#include <optional>
using namespace mbgl;
using SourceType = mbgl::style::SourceType;
using namespace mln;
using SourceType = mln::style::SourceType;
class SourceTest {
public:

4
test/style/style.test.cpp
View File

@@ -18,8 +18,8 @@
#include <Windows.h>
#endif
using namespace mbgl;
using namespace mbgl::style;
using namespace mln;
using namespace mln::style;
TEST(Style, Properties) {
util::RunLoop loop;

2
test/style/style_image.test.cpp
View File

@@ -4,7 +4,7 @@
#include <mbgl/util/image.hpp>
#include <mbgl/util/exception.hpp>
using namespace mbgl;
using namespace mln;
TEST(StyleImage, ZeroWidth) {
try {

10
test/style/style_layer.test.cpp
View File

@@ -28,9 +28,9 @@
#include <memory>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
using namespace expression;
using namespace expression::dsl;
using namespace std::literals::string_literals;
@@ -63,9 +63,9 @@ class MockLayoutProperties : public Properties<TextField> {};
class MockPaintProperties : public Properties<TextColor> {};
using MockOverrides = FormatSectionOverrides<MockPaintProperties::OverridableProperties>;
mbgl::style::Filter parseFilter(const std::string& expression) {
mln::style::Filter parseFilter(const std::string& expression) {
Error error;
return *convertJSON<mbgl::style::Filter>(expression, error);
return *convertJSON<mln::style::Filter>(expression, error);
}
} // namespace

24
test/style/style_parser.test.cpp
View File

@@ -23,7 +23,7 @@
#include <dirent.h>
#endif
using namespace mbgl;
using namespace mln;
using Message = std::pair<uint32_t, std::string>;
using Messages = std::vector<Message>;
@@ -189,12 +189,12 @@ TEST(StyleParser, SpriteAsArrayMultiple) {
TEST(StyleParser, FontStacks) {
style::Parser parser;
parser.parse(util::read_file("test/fixtures/style_parser/font_stacks.json"));
std::set<mbgl::FontStack> expected = {
std::set<mln::FontStack> expected = {
{"a"},
{"a", "b"},
{"a", "b", "c"},
};
std::set<mbgl::FontStack> result = parser.fontStacks();
std::set<mln::FontStack> result = parser.fontStacks();
ASSERT_EQ(expected, result);
}
@@ -229,10 +229,10 @@ TEST(StyleParser, FontStacksCaseExpression) {
}
}]
})");
std::set<mbgl::FontStack> expected;
std::set<mln::FontStack> expected;
expected.insert(FontStack({"Arial"}));
expected.insert(FontStack({"Helvetica"}));
std::set<mbgl::FontStack> result = parser.fontStacks();
std::set<mln::FontStack> result = parser.fontStacks();
ASSERT_EQ(expected, result);
}
@@ -250,10 +250,10 @@ TEST(StyleParser, FontStacksMatchExpression) {
}
}]
})");
std::set<mbgl::FontStack> expected;
std::set<mln::FontStack> expected;
expected.insert(FontStack({"Arial"}));
expected.insert(FontStack({"Helvetica"}));
std::set<mbgl::FontStack> result = parser.fontStacks();
std::set<mln::FontStack> result = parser.fontStacks();
ASSERT_EQ(expected, result);
}
@@ -271,10 +271,10 @@ TEST(StyleParser, FontStacksStepExpression) {
}
}]
})");
std::set<mbgl::FontStack> expected;
std::set<mln::FontStack> expected;
expected.insert(FontStack({"Arial"}));
expected.insert(FontStack({"Helvetica"}));
std::set<mbgl::FontStack> result = parser.fontStacks();
std::set<mln::FontStack> result = parser.fontStacks();
ASSERT_EQ(expected, result);
}
@@ -298,9 +298,9 @@ TEST(StyleParser, FontStacksGetExpression) {
}
TEST(StyleParser, ZoomCurve) {
using namespace mbgl::style;
using namespace mbgl::style::expression;
using namespace mbgl::style::expression::dsl;
using namespace mln::style;
using namespace mln::style::expression;
using namespace mln::style::expression::dsl;
const auto zoomInterp = []() {
return interpolate(linear(), zoom(), 0.0, literal(0.0), 0.0, literal(0.0));

8
test/style/variable_anchor_offset_collection.test.cpp
View File

@@ -9,9 +9,9 @@
#include <array>
using namespace mbgl;
using namespace mbgl::style;
using namespace mbgl::style::conversion;
using namespace mln;
using namespace mln::style;
using namespace mln::style::conversion;
TEST(VariableAnchorOffsetCollection, Calculations) {
auto parseJson = [&](const std::string& src) {
@@ -19,7 +19,7 @@ TEST(VariableAnchorOffsetCollection, Calculations) {
return convertJSON<VariableAnchorOffsetCollection>(src, error);
};
mbgl::util::Interpolator<VariableAnchorOffsetCollection> interpolator;
mln::util::Interpolator<VariableAnchorOffsetCollection> interpolator;
// valid value
{