tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

break out StyleSource from Source, move getActiveSources and

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

7
src/map/source.cpp
View File

@@ -18,6 +18,13 @@
namespace llmr {
Source::Source(StyleSource style_source, const std::string &access_token)
: type(style_source.type),
url(normalizeSourceURL(style_source.url, access_token)),
tile_size(style_source.tile_size),
min_zoom(style_source.min_zoom),
max_zoom(style_source.max_zoom) {}
Source::Source(SourceType type, const std::string &url,
uint32_t tile_size, uint32_t min_zoom, uint32_t max_zoom,
const std::string &access_token)