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

refs #101: first cut of basic hacky data sources

Browse Source
This commit is contained in:
Justin R. Miller
2014-04-02 11:07:22 -07:00
parent 1915c39eee
commit f60a46229d
14 changed files with 529 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/map/tile_data.cpp
View File

@@ -11,11 +11,11 @@
using namespace llmr;
TileData::TileData(Tile::ID id, const Style& style, GlyphAtlas& glyphAtlas, const bool use_raster, const bool use_retina)
TileData::TileData(Tile::ID id, const Style& style, GlyphAtlas& glyphAtlas, const std::string url, const bool is_raster)
: id(id),
use_raster(use_raster),
use_retina(use_retina),
url(url),
state(State::initial),
is_raster(is_raster),
raster(),
style(style),
glyphAtlas(glyphAtlas) {
@@ -38,14 +38,6 @@ const std::string TileData::toString() const {
void TileData::request() {
state = State::loading;
std::string url;
if (use_raster) {
url = util::sprintf(kTileRasterURL, id.z, id.x, id.y, (use_retina ? "@2x" : ""));
} else {
url = util::sprintf(kTileVectorURL, id.z, id.x, id.y);
}
// Note: Somehow this feels slower than the change to request_http()
std::weak_ptr<TileData> weak_tile = shared_from_this();
platform::Request *request = platform::request_http(url, [=](platform::Response& res) {
@@ -78,7 +70,8 @@ bool TileData::parse() {
return false;
}
if (use_raster) {
if (is_raster) {
// raster tiles don't need parsed, just decoded
raster = std::make_shared<Raster>();
raster->load(data);
state = State::parsed;