[core] Organize files that were in map folder better

Fixes #996

src/mbgl/annotation/annotation_tile.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_ANNOTATION_TILE
 #define MBGL_ANNOTATION_TILE
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/map/tile_id.hpp>
 
 #include <map>

src/mbgl/map/tile.cpp

@@ -1,3 +0,0 @@
-#include <mbgl/map/tile.hpp>
-
-using namespace mbgl;

src/mbgl/renderer/circle_bucket.hpp

@@ -3,7 +3,7 @@
 
 #include <mbgl/renderer/bucket.hpp>
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/circle_buffer.hpp>

src/mbgl/renderer/debug_bucket.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_RENDERER_DEBUGBUCKET
 #define MBGL_RENDERER_DEBUGBUCKET
 
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/map/mode.hpp>
 #include <mbgl/geometry/debug_font_buffer.hpp>
 #include <mbgl/geometry/vao.hpp>

src/mbgl/renderer/fill_bucket.hpp

@@ -2,7 +2,7 @@
 #define MBGL_RENDERER_FILLBUCKET
 
 #include <mbgl/renderer/bucket.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/fill_buffer.hpp>
 

src/mbgl/renderer/line_bucket.hpp

@@ -2,7 +2,7 @@
 #define MBGL_RENDERER_LINEBUCKET
 
 #include <mbgl/renderer/bucket.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/line_buffer.hpp>

src/mbgl/renderer/painter.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/renderer/painter.hpp>
 
-#include <mbgl/map/source.hpp>
-#include <mbgl/map/tile.hpp>
+#include <mbgl/source/source.hpp>
+#include <mbgl/tile/tile.hpp>
 #include <mbgl/map/map_context.hpp>
 #include <mbgl/map/map_data.hpp>
 

src/mbgl/renderer/painter_clipping.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/renderer/painter.hpp>
-#include <mbgl/map/source.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/clip_id.hpp>
 #include <mbgl/gl/debugging.hpp>

src/mbgl/renderer/painter_debug.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/debug_bucket.hpp>
-#include <mbgl/map/tile.hpp>
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/string.hpp>

src/mbgl/renderer/symbol_bucket.cpp

@@ -1,6 +1,6 @@
 #include <mbgl/renderer/symbol_bucket.hpp>
 #include <mbgl/layer/symbol_layer.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/sprite/sprite_store.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>

src/mbgl/renderer/symbol_bucket.hpp

@@ -2,7 +2,7 @@
 #define MBGL_RENDERER_SYMBOLBUCKET
 
 #include <mbgl/renderer/bucket.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/map/mode.hpp>
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>

src/mbgl/source/source.cpp

@@ -1,8 +1,8 @@
-#include <mbgl/map/source.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/map/transform.hpp>
-#include <mbgl/map/tile.hpp>
-#include <mbgl/map/vector_tile.hpp>
+#include <mbgl/tile/tile.hpp>
+#include <mbgl/tile/vector_tile.hpp>
 #include <mbgl/annotation/annotation_tile.hpp>
 #include <mbgl/tile/geojson_tile.hpp>
 #include <mbgl/renderer/painter.hpp>
@@ -20,8 +20,8 @@
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/tile_cover.hpp>
 
-#include <mbgl/map/vector_tile_data.hpp>
-#include <mbgl/map/raster_tile_data.hpp>
+#include <mbgl/tile/vector_tile_data.hpp>
+#include <mbgl/tile/raster_tile_data.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_parser.hpp>
 #include <mbgl/gl/debugging.hpp>

src/mbgl/source/source.hpp

@@ -1,12 +1,14 @@
 #ifndef MBGL_MAP_SOURCE
 #define MBGL_MAP_SOURCE
 
-#include <mbgl/map/tile_cache.hpp>
-#include <mbgl/map/source_info.hpp>
+#include <mbgl/tile/tile_data.hpp>
+#include <mbgl/tile/tile_cache.hpp>
+#include <mbgl/source/source_info.hpp>
 
 #include <mbgl/util/mat4.hpp>
 #include <mbgl/util/rapidjson.hpp>
 
+#include <forward_list>
 #include <vector>
 #include <map>
 

src/mbgl/style/filter_expression.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/style/filter_expression.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/platform/log.hpp>
 
 namespace mbgl {

src/mbgl/style/style.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/style/style.hpp>
 #include <mbgl/map/map_data.hpp>
-#include <mbgl/map/source.hpp>
-#include <mbgl/map/tile.hpp>
+#include <mbgl/source/source.hpp>
+#include <mbgl/tile/tile.hpp>
 #include <mbgl/map/transform_state.hpp>
 #include <mbgl/layer/symbol_layer.hpp>
 #include <mbgl/layer/custom_layer.hpp>

src/mbgl/style/style.hpp

@@ -3,7 +3,7 @@
 
 #include <mbgl/style/zoom_history.hpp>
 
-#include <mbgl/map/source.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/text/glyph_store.hpp>
 #include <mbgl/sprite/sprite_store.hpp>
 

src/mbgl/style/style_bucket_parameters.cpp

@@ -1,5 +1,5 @@
 #include <mbgl/style/style_bucket_parameters.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 
 namespace mbgl {
 

src/mbgl/style/style_bucket_parameters.hpp

@@ -3,7 +3,7 @@
 
 #include <mbgl/map/mode.hpp>
 #include <mbgl/style/filter_expression.hpp>
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 
 #include <functional>
 

src/mbgl/style/style_parser.hpp

@@ -2,7 +2,7 @@
 #define MBGL_STYLE_STYLE_PARSER
 
 #include <mbgl/style/style_layer.hpp>
-#include <mbgl/map/source.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/util/rapidjson.hpp>
 
 #include <vector>

src/mbgl/tile/geojson_tile.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_ANNOTATION_GEOJSON_VT_TILE
 #define MBGL_ANNOTATION_GEOJSON_VT_TILE
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/map/tile_id.hpp>
 
 #include <unordered_map>

src/mbgl/tile/geometry_tile.cpp

@@ -1,4 +1,4 @@
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/style/filter_expression.hpp>
 #include <mbgl/style/filter_expression_private.hpp>
 

src/mbgl/tile/raster_tile_data.cpp

@@ -1,5 +1,5 @@
-#include <mbgl/map/raster_tile_data.hpp>
-#include <mbgl/map/source.hpp>
+#include <mbgl/tile/raster_tile_data.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/storage/file_source.hpp>

src/mbgl/tile/raster_tile_data.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_MAP_RASTER_TILE_DATA
 #define MBGL_MAP_RASTER_TILE_DATA
 
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
 
 namespace mbgl {

src/mbgl/tile/tile.cpp

@@ -0,0 +1,3 @@
+#include <mbgl/tile/tile.hpp>
+
+using namespace mbgl;

src/mbgl/tile/tile_cache.cpp

@@ -1,4 +1,5 @@
-#include <mbgl/map/tile_cache.hpp>
+#include <mbgl/tile/tile_cache.hpp>
+#include <mbgl/tile/tile_data.hpp>
 
 #include <cassert>
 

src/mbgl/tile/tile_cache.hpp

@@ -1,13 +1,13 @@
 #ifndef MBGL_MAP_TILE_CACHE
 #define MBGL_MAP_TILE_CACHE
 
-#include <mbgl/map/tile_data.hpp>
-
 #include <list>
 #include <unordered_map>
 
 namespace mbgl {
 
+class TileData;
+
 class TileCache {
 public:
     TileCache(size_t size_ = 0) : size(size_) {}
@@ -18,6 +18,7 @@ public:
     std::shared_ptr<TileData> get(uint64_t key);
     bool has(uint64_t key);
     void clear();
+
 private:
     std::unordered_map<uint64_t, std::shared_ptr<TileData>> tiles;
     std::list<uint64_t> orderedKeys;

src/mbgl/tile/tile_data.cpp

@@ -1,4 +1,4 @@
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/renderer/debug_bucket.hpp>
 #include <mbgl/util/string.hpp>
 

src/mbgl/tile/tile_worker.cpp

@@ -1,6 +1,6 @@
 #include <mbgl/text/collision_tile.hpp>
-#include <mbgl/map/tile_worker.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/tile_worker.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_bucket_parameters.hpp>
 #include <mbgl/layer/background_layer.hpp>

src/mbgl/tile/tile_worker.hpp

@@ -4,7 +4,7 @@
 #include <mapbox/variant.hpp>
 
 #include <mbgl/map/mode.hpp>
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/ptr.hpp>
 #include <mbgl/text/placement_config.hpp>

src/mbgl/tile/vector_tile.cpp

@@ -1,5 +1,5 @@
-#include <mbgl/map/vector_tile.hpp>
-#include <mbgl/map/source.hpp>
+#include <mbgl/tile/vector_tile.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/storage/file_source.hpp>

src/mbgl/tile/vector_tile.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_MAP_VECTOR_TILE
 #define MBGL_MAP_VECTOR_TILE
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/map/tile_id.hpp>
 #include <mbgl/util/pbf.hpp>
 

src/mbgl/tile/vector_tile_data.cpp

@@ -1,5 +1,5 @@
-#include <mbgl/map/vector_tile_data.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/vector_tile_data.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/util/worker.hpp>
 #include <mbgl/util/work_request.hpp>

src/mbgl/tile/vector_tile_data.hpp

@@ -1,8 +1,8 @@
 #ifndef MBGL_MAP_VECTOR_TILE_DATA
 #define MBGL_MAP_VECTOR_TILE_DATA
 
-#include <mbgl/map/tile_data.hpp>
-#include <mbgl/map/tile_worker.hpp>
+#include <mbgl/tile/tile_data.hpp>
+#include <mbgl/tile/tile_worker.hpp>
 #include <mbgl/text/placement_config.hpp>
 
 #include <atomic>

src/mbgl/util/clip_id.cpp

@@ -3,7 +3,7 @@
 #include <mbgl/platform/log.hpp>
 #include <mbgl/util/math.hpp>
 #include <mbgl/util/std.hpp>
-#include <mbgl/map/tile.hpp>
+#include <mbgl/tile/tile.hpp>
 
 #include <list>
 #include <vector>

src/mbgl/util/get_geometries.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_UTIL_GET_GEOMETRIES
 #define MBGL_UTIL_GET_GEOMETRIES
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 
 namespace mbgl {
 

src/mbgl/util/tile_cover.cpp

@@ -2,7 +2,6 @@
 #include <mbgl/util/vec.hpp>
 #include <mbgl/util/tile_coordinate.hpp>
 #include <mbgl/util/constants.hpp>
-#include <mbgl/map/source_info.hpp>
 #include <mbgl/map/transform_state.hpp>
 
 namespace mbgl {

src/mbgl/util/worker.cpp

@@ -3,7 +3,7 @@
 #include <mbgl/util/work_request.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/style/style_layer.hpp>
 
 #include <cassert>

src/mbgl/util/worker.hpp

@@ -3,7 +3,7 @@
 
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/thread.hpp>
-#include <mbgl/map/tile_worker.hpp>
+#include <mbgl/tile/tile_worker.hpp>
 
 #include <functional>
 #include <memory>