[core] Merge annotation_tile_data.{hpp,cpp} into annotation_tile.{hpp,cpp}

2016-06-07 15:23:24 -07:00
parent 0035eb0122
commit 078392eda9
6 changed files with 36 additions and 49 deletions
--- a/src/mbgl/style/source.cpp
+++ b/src/mbgl/style/source.cpp
@@ -20,9 +20,9 @@
 #include <mbgl/util/tile_cover.hpp>

 #include <mbgl/tile/raster_tile_data.hpp>
-#include <mbgl/tile/annotation_tile_data.hpp>
 #include <mbgl/tile/geojson_tile.hpp>
 #include <mbgl/tile/vector_tile_data.hpp>
+#include <mbgl/annotation/annotation_tile.hpp>
 #include <mbgl/style/parser.hpp>
 #include <mbgl/gl/debugging.hpp>