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

Pass FileSource by reference

Browse Source
This commit is contained in:
John Firebaugh
2014-11-20 17:13:35 -08:00
parent a9b20fc09a
commit 9e971095d3
5 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/map.cpp
View File

@@ -346,7 +346,7 @@ void Map::setStyleJSON(std::string newStyleJSON, const std::string &base) {
style->loadJSON((const uint8_t *)styleJSON.c_str());
if (!fileSource) {
fileSource = std::make_shared<FileSource>(**loop, platform::defaultCacheDatabase());
glyphStore = std::make_shared<GlyphStore>(fileSource);
glyphStore = std::make_shared<GlyphStore>(*fileSource);
}
fileSource->setBase(base);
glyphStore->setURL(util::mapbox::normalizeGlyphsURL(style->glyph_url, getAccessToken()));
@@ -370,7 +370,7 @@ util::ptr<Sprite> Map::getSprite() {
const float pixelRatio = state.getPixelRatio();
const std::string &sprite_url = style->getSpriteURL();
if (!sprite || sprite->pixelRatio != pixelRatio) {
sprite = Sprite::Create(sprite_url, pixelRatio, fileSource);
sprite = Sprite::Create(sprite_url, pixelRatio, *fileSource);
}
return sprite;
@@ -649,7 +649,7 @@ void Map::updateTiles() {
void Map::prepare() {
if (!fileSource) {
fileSource = std::make_shared<FileSource>(**loop, platform::defaultCacheDatabase());
glyphStore = std::make_shared<GlyphStore>(fileSource);
glyphStore = std::make_shared<GlyphStore>(*fileSource);
}
if (!style) {