Remove unnecessary virtual methods from TileData

This commit is contained in:
John Firebaugh
2015-07-01 17:38:49 -07:00
parent dba1e44f55
commit 1da2c3f840
5 changed files with 12 additions and 26 deletions

View File

@@ -290,18 +290,20 @@ TileData::State Source::addTile(MapData& data,
// If we don't find working tile data, we're just going to load it.
if (info.type == SourceType::Vector) {
new_tile.data =
std::make_shared<VectorTileData>(normalized_id, style, info,
auto tileData = std::make_shared<VectorTileData>(normalized_id, style, info,
transformState.getAngle(), data.getCollisionDebug());
new_tile.data->request(transformState.getPixelRatio(), callback);
tileData->request(transformState.getPixelRatio(), callback);
new_tile.data = tileData;
} else if (info.type == SourceType::Raster) {
new_tile.data = std::make_shared<RasterTileData>(normalized_id, texturePool, info, style.workers);
new_tile.data->request(transformState.getPixelRatio(), callback);
auto tileData = std::make_shared<RasterTileData>(normalized_id, texturePool, info, style.workers);
tileData->request(transformState.getPixelRatio(), callback);
new_tile.data = tileData;
} else if (info.type == SourceType::Annotations) {
new_tile.data = std::make_shared<LiveTileData>(normalized_id, data.annotationManager,
auto tileData = std::make_shared<LiveTileData>(normalized_id, data.annotationManager,
style, info,
transformState.getAngle(), data.getCollisionDebug());
new_tile.data->reparse(callback);
tileData->reparse(callback);
new_tile.data = tileData;
} else {
throw std::runtime_error("source type not implemented");
}