diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-14 16:15:43 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-15 09:56:18 -0700 |
commit | ed489e764971b40b01e33e8505f2d31a72a0075e (patch) | |
tree | 34acdf5869430f30e27e8666af9d8fc8f7c77d21 /test/style/source.cpp | |
parent | 25ff2696a1c6741a5a61334f1bd965e9d5099f05 (diff) | |
download | qtlocation-mapboxgl-ed489e764971b40b01e33e8505f2d31a72a0075e.tar.gz |
[core] Remove MapData dependency from Style
Diffstat (limited to 'test/style/source.cpp')
-rw-r--r-- | test/style/source.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/style/source.cpp b/test/style/source.cpp index 9c334c65d5..5ec2714b43 100644 --- a/test/style/source.cpp +++ b/test/style/source.cpp @@ -10,12 +10,12 @@ #include <mbgl/platform/log.hpp> #include <mbgl/map/transform.hpp> -#include <mbgl/map/map_data.hpp> #include <mbgl/util/worker.hpp> #include <mbgl/gl/texture_pool.hpp> #include <mbgl/style/style.hpp> #include <mbgl/style/style_update_parameters.hpp> #include <mbgl/layer/line_layer.hpp> +#include <mbgl/annotation/annotation_manager.hpp> using namespace mbgl; @@ -29,8 +29,8 @@ public: TransformState transformState; Worker worker { 1 }; gl::TexturePool texturePool; - MapData mapData { MapMode::Still, GLContextMode::Unique, 1.0 }; - Style style { mapData, fileSource }; + AnnotationManager annotationManager { 1.0 }; + Style style { fileSource, 1.0 }; StyleUpdateParameters updateParameters { 1.0, @@ -42,7 +42,7 @@ public: texturePool, true, MapMode::Continuous, - mapData, + annotationManager, style }; |