summaryrefslogtreecommitdiff
path: root/test/style/conversion/geojson_options.test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/style/conversion/geojson_options.test.cpp')
-rw-r--r--test/style/conversion/geojson_options.test.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/style/conversion/geojson_options.test.cpp b/test/style/conversion/geojson_options.test.cpp
index 46a2aa950b..14a7adbba7 100644
--- a/test/style/conversion/geojson_options.test.cpp
+++ b/test/style/conversion/geojson_options.test.cpp
@@ -4,7 +4,7 @@
#include <mbgl/style/conversion/geojson_options.hpp>
#include <mbgl/test/conversion_stubs.hpp>
-#include <mbgl/platform/log.hpp>
+#include <mbgl/util/logging.hpp>
using namespace mbgl::style;
using namespace mbgl::style::conversion;
@@ -17,7 +17,7 @@ TEST(GeoJSONOptions, Basic) {
}
TEST(GeoJSONOptions, ErrorHandling) {
- ValueMap map {{"maxzoom", "should not be a string"}};
+ ValueMap map {{"maxzoom", std::string{"should not be a string"}}};
Value raw(map);
Result<GeoJSONOptions> converted = convert<GeoJSONOptions>(raw);
ASSERT_FALSE((bool) converted);
@@ -44,14 +44,14 @@ TEST(GeoJSONOptions, RetainsDefaults) {
TEST(GeoJSONOptions, FullConversion) {
ValueMap map {
//GeoJSON-VT
- {"maxzoom", 1},
- {"buffer", 2},
- {"tolerance", 3},
+ {"maxzoom", 1.0f},
+ {"buffer", 2.0f},
+ {"tolerance", 3.0f},
//Supercluster
{"cluster", true},
- {"clusterRadius", 4},
- {"clusterMaxZoom", 5}
+ {"clusterRadius", 4.0f},
+ {"clusterMaxZoom", 5.0f}
};
Value raw(map);
GeoJSONOptions converted = *convert<GeoJSONOptions>(raw);