diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-21 17:23:49 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-23 13:56:55 -0700 |
commit | 8d79c257654905a888e9d1a32e566293fda84455 (patch) | |
tree | 370726d8e6b40434f9c3c0240edce69dbcd2b001 /test | |
parent | 0665b645909994cb4b6037f4d5e61d4d7ff9d9ea (diff) | |
download | qtlocation-mapboxgl-8d79c257654905a888e9d1a32e566293fda84455.tar.gz |
[core] Remove MapData dependency from StyleParser
MapData was needed for two things: getting the default transition and
fade durations, and detecting still rendering vs. continuous.
The first is avoided by making transition durations optional, and
supplying the default fallback value at evaluation time. The second did
not fix the still rendering issue, and will be followed up with a
different approach in a later commit.
Diffstat (limited to 'test')
-rw-r--r-- | test/miscellaneous/style_parser.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/test/miscellaneous/style_parser.cpp b/test/miscellaneous/style_parser.cpp index cbb896bac4..7a38ba054d 100644 --- a/test/miscellaneous/style_parser.cpp +++ b/test/miscellaneous/style_parser.cpp @@ -3,9 +3,6 @@ #include <mbgl/style/style_parser.hpp> #include <mbgl/util/io.hpp> -#include <mbgl/map/mode.hpp> -#include <mbgl/map/map_data.hpp> - #include <rapidjson/document.h> #include "../fixtures/fixture_log_observer.hpp" @@ -38,12 +35,7 @@ TEST_P(StyleParserTest, ParseStyle) { FixtureLogObserver* observer = new FixtureLogObserver(); Log::setObserver(std::unique_ptr<Log::Observer>(observer)); - MapMode mapMode = MapMode::Continuous; - GLContextMode contextMode = GLContextMode::Unique; - const float pixelRatio = 1.0f; - - MapData data(mapMode, contextMode, pixelRatio); - StyleParser parser(data); + StyleParser parser; parser.parse(styleDoc); for (auto it = infoDoc.MemberBegin(), end = infoDoc.MemberEnd(); it != end; it++) { |