From 4596157fe0c3b24533014e1b94e920485452856a Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 6 Jun 2016 17:49:09 -0700
Subject: [PATCH] [core] Merge ImageTileSource into RasterTileData

---
 src/mbgl/tile/image_tile_source.cpp | 13 -------------
 src/mbgl/tile/image_tile_source.hpp | 22 ----------------------
 src/mbgl/tile/raster_tile_data.cpp  | 11 +++++++++--
 src/mbgl/tile/raster_tile_data.hpp  |  2 ++
 4 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 src/mbgl/tile/image_tile_source.cpp
 delete mode 100644 src/mbgl/tile/image_tile_source.hpp

diff --git a/src/mbgl/tile/image_tile_source.cpp b/src/mbgl/tile/image_tile_source.cpp
deleted file mode 100644
index 477c00dd1..000000000
--- a/src/mbgl/tile/image_tile_source.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <mbgl/tile/image_tile_source.hpp>
-#include <mbgl/tile/file_based_tile_source_impl.hpp>
-#include <mbgl/tile/raster_tile_data.hpp>
-
-namespace mbgl {
-
-ImageTileSource::ImageTileSource(RasterTileData& tileData_,
-                                 const Resource& resource_,
-                                 FileSource& fileSource_)
-    : FileBasedTileSource<RasterTileSource, ImageTileSource>(tileData_, resource_, fileSource_) {
-}
-
-} // namespace mbgl
diff --git a/src/mbgl/tile/image_tile_source.hpp b/src/mbgl/tile/image_tile_source.hpp
deleted file mode 100644
index 56b3f7ba8..000000000
--- a/src/mbgl/tile/image_tile_source.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <mbgl/tile/tile_source.hpp>
-#include <mbgl/tile/file_based_tile_source.hpp>
-
-namespace mbgl {
-
-class FileSource;
-class AsyncRequest;
-
-class ImageTileSource final : public FileBasedTileSource<RasterTileSource, ImageTileSource> {
-public:
-    ImageTileSource(RasterTileData&, const Resource&, FileSource&);
-    virtual ~ImageTileSource() = default;
-
-    static std::shared_ptr<const std::string> parseData(std::shared_ptr<const std::string> data) {
-        return data;
-    }
-
-};
-
-} // namespace mbgl
diff --git a/src/mbgl/tile/raster_tile_data.cpp b/src/mbgl/tile/raster_tile_data.cpp
index dfc4266d8..ac6299e22 100644
--- a/src/mbgl/tile/raster_tile_data.cpp
+++ b/src/mbgl/tile/raster_tile_data.cpp
@@ -2,7 +2,9 @@
 #include <mbgl/style/source.hpp>
 #include <mbgl/style/update_parameters.hpp>
 #include <mbgl/tile/tile_data_observer.hpp>
-#include <mbgl/tile/image_tile_source.hpp>
+#include <mbgl/tile/file_based_tile_source.hpp>
+#include <mbgl/tile/file_based_tile_source_impl.hpp>
+#include <mbgl/tile/tile_source.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/storage/file_source.hpp>
@@ -21,7 +23,8 @@ RasterTileData::RasterTileData(const OverscaledTileID& id_,
     const auto resource = Resource::tile(
         tileset.tiles.at(0), parameters.pixelRatio, id_.canonical.x,
         id_.canonical.y, id_.canonical.z);
-    tileSource = std::make_unique<ImageTileSource>(*this, resource, parameters.fileSource);
+    tileSource = std::make_unique<FileBasedTileSource<RasterTileSource, RasterTileData>>(
+        *this, resource, parameters.fileSource);
 }
 
 void RasterTileData::setError(std::exception_ptr err) {
@@ -74,3 +77,7 @@ 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;
+}
diff --git a/src/mbgl/tile/raster_tile_data.hpp b/src/mbgl/tile/raster_tile_data.hpp
index f3110c129..ce8fb2a0f 100644
--- a/src/mbgl/tile/raster_tile_data.hpp
+++ b/src/mbgl/tile/raster_tile_data.hpp
@@ -35,6 +35,8 @@ 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;