Unify default transition values in MapData

Relevant changes:
 - Added 'defaultFadeDuration' and 'defaultTransitionDelay' to MapData;
 - Painter & StyleParser now receives a reference to MapData;
 - As previously seen on the code: 300ms is the default fade duration
   and 0ms is the default transition duration;
 - We no longer pass the current time point to Style, since it now uses
   MapData.animationTime, which gets updated in MapContext::update().
 - Updated StyleParser check to use a mock MapData;
This commit is contained in:
Bruno de Oliveira Abinader
2015-07-14 15:14:39 +03:00
parent 2aad2f4e14
commit 0ea8a37cb0
14 changed files with 88 additions and 58 deletions

View File

@@ -3,6 +3,9 @@
#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"
@@ -35,7 +38,11 @@ TEST_P(StyleParserTest, ParseStyle) {
FixtureLogObserver* observer = new FixtureLogObserver();
Log::setObserver(std::unique_ptr<Log::Observer>(observer));
StyleParser parser;
MapMode mapMode = MapMode::Continuous;
const float pixelRatio = 1.0f;
MapData data(mapMode, pixelRatio);
StyleParser parser(data);
parser.parse(styleDoc);
for (auto it = infoDoc.MemberBegin(), end = infoDoc.MemberEnd(); it != end; it++) {