diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-10 16:29:49 -0700 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-10 17:12:02 -0700 |
| commit | 4590adc11571e3973998d7d27db52ca9d4d5b6e2 (patch) | |
| tree | d2767fb2b1e4822962bd29fdb4c8ee03c70da155 /include/llmr/style/style_bucket.hpp | |
| parent | 356c9ce7e40421bd81eb3415295caf39600d7a35 (diff) | |
| download | qtlocation-mapboxgl-4590adc11571e3973998d7d27db52ca9d4d5b6e2.tar.gz | |
break out StyleSource from Source, move getActiveSources and
updateSources into Map::Map, move getAccessToken from Style to Map
Conflicts:
include/llmr/style/style.hpp
src/map/source.cpp
src/style/style_layer.cpp
src/style/style_parser.cpp
Diffstat (limited to 'include/llmr/style/style_bucket.hpp')
| -rw-r--r-- | include/llmr/style/style_bucket.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/llmr/style/style_bucket.hpp b/include/llmr/style/style_bucket.hpp index 55ffeeb18e..c8529fdd23 100644 --- a/include/llmr/style/style_bucket.hpp +++ b/include/llmr/style/style_bucket.hpp @@ -3,6 +3,7 @@ #include <llmr/style/types.hpp> #include <llmr/style/filter_expression.hpp> +#include <llmr/style/style_source.hpp> #include <llmr/util/vec.hpp> #include <llmr/util/variant.hpp> @@ -11,8 +12,6 @@ namespace llmr { -class Source; - class StyleBucketFill { public: WindingType winding = WindingType::Default; @@ -74,7 +73,7 @@ public: StyleBucket(StyleLayerType type); std::string name; - std::shared_ptr<Source> source; + std::shared_ptr<StyleSource> style_source; std::string source_layer; FilterExpression filter; StyleBucketRender render = std::false_type(); |