[core] Eliminate static {Vector,Raster}TileData::parseData

This commit is contained in:
John Firebaugh
2016-06-07 12:06:31 -07:00
parent bfcd21dd7e
commit 7c282d074c
5 changed files with 8 additions and 12 deletions

View File

@@ -70,7 +70,3 @@ void RasterTileData::setNecessity(Necessity necessity) {
void RasterTileData::cancel() {
workRequest.reset();
}
std::shared_ptr<const std::string> RasterTileData::parseData(std::shared_ptr<const std::string> data) {
return data;
}

View File

@@ -34,8 +34,6 @@ public:
void cancel() override;
Bucket* getBucket(const style::Layer&) override;
static std::shared_ptr<const std::string> parseData(std::shared_ptr<const std::string>);
private:
gl::TexturePool& texturePool;
Worker& worker;

View File

@@ -95,8 +95,7 @@ void TileSource<T>::loadedData(const Response& res) {
resource.priorModified = res.modified;
resource.priorExpires = res.expires;
resource.priorEtag = res.etag;
tileData.setData(res.noContent ? nullptr : T::parseData(res.data), res.modified,
res.expires);
tileData.setData(res.noContent ? nullptr : res.data, res.modified, res.expires);
}
}

View File

@@ -21,8 +21,10 @@ void VectorTileData::setNecessity(Necessity necessity) {
tileSource.setNecessity(static_cast<TileSource<VectorTileData>::Necessity>(necessity));
}
std::unique_ptr<GeometryTile> VectorTileData::parseData(std::shared_ptr<const std::string> data) {
return data ? std::make_unique<VectorTile>(data) : nullptr;
void VectorTileData::setData(std::shared_ptr<const std::string> data,
optional<Timestamp> modified,
optional<Timestamp> expires) {
GeometryTileData::setData(data ? std::make_unique<VectorTile>(data) : nullptr, modified, expires);
}
} // namespace mbgl

View File

@@ -21,8 +21,9 @@ public:
~VectorTileData();
void setNecessity(Necessity) final;
static std::unique_ptr<GeometryTile> parseData(std::shared_ptr<const std::string>);
void setData(std::shared_ptr<const std::string> data,
optional<Timestamp> modified,
optional<Timestamp> expires);
private:
TileSource<VectorTileData> tileSource;