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
This commit is contained in:
Mike Morris
2014-07-10 16:29:49 -07:00
parent 356c9ce7e4
commit 4590adc115
12 changed files with 91 additions and 66 deletions

View File

@@ -1,6 +1,5 @@
#include <llmr/style/style_layer.hpp>
#include <llmr/style/style_bucket.hpp>
#include <llmr/map/source.hpp>
#include <llmr/style/style_layer_group.hpp>
#include <llmr/style/property_fallback.hpp>