[core] Reorganize sprite related files

19 files changed, 33 insertions, 37 deletions

diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index 75f195a3f9..dedfff02d8 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -2,7 +2,6 @@
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/map/view.hpp>
 #include <mbgl/map/still_image.hpp>
-#include <mbgl/annotation/sprite_store.hpp>
 
 #include <mbgl/platform/log.hpp>
 
@@ -12,10 +11,11 @@
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 
-#include <mbgl/geometry/sprite_atlas.hpp>
-
 #include <mbgl/style/style.hpp>
 
+#include <mbgl/sprite/sprite_atlas.hpp>
+#include <mbgl/sprite/sprite_store.hpp>
+
 #include <mbgl/util/gl_object_store.hpp>
 #include <mbgl/util/uv_detail.hpp>
 #include <mbgl/util/worker.hpp>
diff --git a/src/mbgl/map/tile_worker.cpp b/src/mbgl/map/tile_worker.cpp
index 8c1115170d..effb90a73d 100644
--- a/src/mbgl/map/tile_worker.cpp
+++ b/src/mbgl/map/tile_worker.cpp
@@ -4,7 +4,7 @@
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_bucket_parameters.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/renderer/symbol_bucket.hpp>
 #include <mbgl/platform/log.hpp>
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 140ab2991c..284bed3705 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -13,7 +13,7 @@
 
 #include <mbgl/layer/background_layer.hpp>
 
-#include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
 
diff --git a/src/mbgl/renderer/painter_circle.cpp b/src/mbgl/renderer/painter_circle.cpp
index 708064bf89..67c23f8615 100644
--- a/src/mbgl/renderer/painter_circle.cpp
+++ b/src/mbgl/renderer/painter_circle.cpp
@@ -3,7 +3,6 @@
 
 #include <mbgl/layer/circle_layer.hpp>
 
-#include <mbgl/map/sprite.hpp>
 #include <mbgl/map/tile_id.hpp>
 #include <mbgl/map/map_data.hpp>
 
diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp
index d9e069d4e8..4bee5b6d1e 100644
--- a/src/mbgl/renderer/painter_fill.cpp
+++ b/src/mbgl/renderer/painter_fill.cpp
@@ -1,9 +1,8 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/fill_bucket.hpp>
 #include <mbgl/layer/fill_layer.hpp>
-#include <mbgl/map/sprite.hpp>
 #include <mbgl/map/tile_id.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/shader/outline_shader.hpp>
 #include <mbgl/shader/pattern_shader.hpp>
 #include <mbgl/shader/plain_shader.hpp>
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index cfc85fcb48..e33864622e 100644
--- a/src/mbgl/renderer/painter_line.cpp
+++ b/src/mbgl/renderer/painter_line.cpp
@@ -1,13 +1,12 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/line_bucket.hpp>
 #include <mbgl/layer/line_layer.hpp>
-#include <mbgl/map/sprite.hpp>
 #include <mbgl/map/tile_id.hpp>
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/shader/line_shader.hpp>
 #include <mbgl/shader/linesdf_shader.hpp>
 #include <mbgl/shader/linepattern_shader.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
 #include <mbgl/util/mat2.hpp>
 
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
index 343c9d5233..f46a9c8454 100644
--- a/src/mbgl/renderer/painter_symbol.cpp
+++ b/src/mbgl/renderer/painter_symbol.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/renderer/symbol_bucket.hpp>
 #include <mbgl/layer/symbol_layer.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/shader/sdf_shader.hpp>
 #include <mbgl/shader/icon_shader.hpp>
 #include <mbgl/shader/box_shader.hpp>
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index ee42d7f47e..1071fdcce9 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -1,11 +1,12 @@
 #include <mbgl/renderer/symbol_bucket.hpp>
 #include <mbgl/layer/symbol_layer.hpp>
 #include <mbgl/map/geometry_tile.hpp>
-#include <mbgl/annotation/sprite_image.hpp>
+#include <mbgl/sprite/sprite.hpp>
+#include <mbgl/sprite/sprite_image.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/geometry/text_buffer.hpp>
 #include <mbgl/geometry/icon_buffer.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
 #include <mbgl/geometry/anchor.hpp>
 #include <mbgl/text/get_anchors.hpp>
 #include <mbgl/renderer/painter.hpp>
@@ -16,7 +17,6 @@
 #include <mbgl/shader/sdf_shader.hpp>
 #include <mbgl/shader/icon_shader.hpp>
 #include <mbgl/shader/box_shader.hpp>
-#include <mbgl/map/sprite.hpp>
 
 #include <mbgl/util/utf.hpp>
 #include <mbgl/util/token.hpp>
diff --git a/src/mbgl/map/sprite.cpp b/src/mbgl/sprite/sprite.cpp
index 518979c5f0..881a6ff8ed 100644
--- a/src/mbgl/map/sprite.cpp
+++ b/src/mbgl/sprite/sprite.cpp
@@ -1,5 +1,4 @@
-#include <mbgl/map/sprite.hpp>
-
+#include <mbgl/sprite/sprite.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/storage/file_source.hpp>
diff --git a/src/mbgl/map/sprite.hpp b/src/mbgl/sprite/sprite.hpp
index cd82460a12..d204b42e85 100644
--- a/src/mbgl/map/sprite.hpp
+++ b/src/mbgl/sprite/sprite.hpp
@@ -1,7 +1,7 @@
-#ifndef MBGL_STYLE_SPRITE
-#define MBGL_STYLE_SPRITE
+#ifndef MBGL_SPRITE
+#define MBGL_SPRITE
 
-#include <mbgl/annotation/sprite_parser.hpp>
+#include <mbgl/sprite/sprite_parser.hpp>
 #include <mbgl/util/image.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/ptr.hpp>
diff --git a/src/mbgl/geometry/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp
index 743848d5f2..22c2ba8b95 100644
--- a/src/mbgl/geometry/sprite_atlas.cpp
+++ b/src/mbgl/sprite/sprite_atlas.cpp
@@ -1,5 +1,5 @@
-#include <mbgl/geometry/sprite_atlas.hpp>
-#include <mbgl/annotation/sprite_store.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
+#include <mbgl/sprite/sprite_store.hpp>
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/platform/platform.hpp>
@@ -10,7 +10,7 @@
 #include <mbgl/util/scaling.hpp>
 #include <mbgl/util/thread_context.hpp>
 
-#include <mbgl/map/sprite.hpp>
+#include <mbgl/sprite/sprite.hpp>
 
 #include <cassert>
 #include <cmath>
diff --git a/src/mbgl/geometry/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp
index 2e794f651b..0d86279e2d 100644
--- a/src/mbgl/geometry/sprite_atlas.hpp
+++ b/src/mbgl/sprite/sprite_atlas.hpp
@@ -1,5 +1,5 @@
-#ifndef MBGL_GEOMETRY_SPRITE_ATLAS
-#define MBGL_GEOMETRY_SPRITE_ATLAS
+#ifndef MBGL_SPRITE_ATLAS
+#define MBGL_SPRITE_ATLAS
 
 #include <mbgl/geometry/binpack.hpp>
 #include <mbgl/platform/gl.hpp>
diff --git a/src/mbgl/annotation/sprite_image.cpp b/src/mbgl/sprite/sprite_image.cpp
index e482d8f13f..d5e4a7828e 100644
--- a/src/mbgl/annotation/sprite_image.cpp
+++ b/src/mbgl/sprite/sprite_image.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/annotation/sprite_image.hpp>
+#include <mbgl/sprite/sprite_image.hpp>
 
 #include <mbgl/util/exception.hpp>
 
diff --git a/src/mbgl/annotation/sprite_parser.cpp b/src/mbgl/sprite/sprite_parser.cpp
index acd93b47ce..a8ed4f0e12 100644
--- a/src/mbgl/annotation/sprite_parser.cpp
+++ b/src/mbgl/sprite/sprite_parser.cpp
@@ -1,5 +1,5 @@
-#include <mbgl/annotation/sprite_parser.hpp>
-#include <mbgl/annotation/sprite_image.hpp>
+#include <mbgl/sprite/sprite_parser.hpp>
+#include <mbgl/sprite/sprite_image.hpp>
 
 #include <mbgl/platform/log.hpp>
 
diff --git a/src/mbgl/annotation/sprite_parser.hpp b/src/mbgl/sprite/sprite_parser.hpp
index c5856ebbc7..d385d77aea 100644
--- a/src/mbgl/annotation/sprite_parser.hpp
+++ b/src/mbgl/sprite/sprite_parser.hpp
@@ -1,5 +1,5 @@
-#ifndef MBGL_ANNOTATIONS_SPRITE_PARSER
-#define MBGL_ANNOTATIONS_SPRITE_PARSER
+#ifndef MBGL_SPRITE_PARSER
+#define MBGL_SPRITE_PARSER
 
 #include <mapbox/variant.hpp>
 
diff --git a/src/mbgl/annotation/sprite_store.cpp b/src/mbgl/sprite/sprite_store.cpp
index 8d2231a2b7..fb6833114e 100644
--- a/src/mbgl/annotation/sprite_store.cpp
+++ b/src/mbgl/sprite/sprite_store.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/annotation/sprite_store.hpp>
+#include <mbgl/sprite/sprite_store.hpp>
 
 #include <mbgl/platform/log.hpp>
 
diff --git a/src/mbgl/annotation/sprite_store.hpp b/src/mbgl/sprite/sprite_store.hpp
index 78e02ac695..ed903f074b 100644
--- a/src/mbgl/annotation/sprite_store.hpp
+++ b/src/mbgl/sprite/sprite_store.hpp
@@ -1,7 +1,7 @@
-#ifndef MBGL_ANNOTATION_SPRITE_STORE
-#define MBGL_ANNOTATION_SPRITE_STORE
+#ifndef MBGL_SPRITE_STORE
+#define MBGL_SPRITE_STORE
 
-#include <mbgl/annotation/sprite_image.hpp>
+#include <mbgl/sprite/sprite_image.hpp>
 
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/geo.hpp>
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 5509447275..acf4752e07 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -1,9 +1,10 @@
 #include <mbgl/style/style.hpp>
-#include <mbgl/map/sprite.hpp>
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/map/source.hpp>
 #include <mbgl/map/transform_state.hpp>
-#include <mbgl/annotation/sprite_store.hpp>
+#include <mbgl/sprite/sprite.hpp>
+#include <mbgl/sprite/sprite_store.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_parser.hpp>
 #include <mbgl/style/property_transition.hpp>
@@ -11,7 +12,6 @@
 #include <mbgl/style/style_cascade_parameters.hpp>
 #include <mbgl/style/style_calculation_parameters.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/platform/log.hpp>
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 412107b737..837703e264 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -5,7 +5,7 @@
 #include <mbgl/style/zoom_history.hpp>
 
 #include <mbgl/map/source.hpp>
-#include <mbgl/map/sprite.hpp>
+#include <mbgl/sprite/sprite.hpp>
 #include <mbgl/text/glyph_store.hpp>
 
 #include <mbgl/util/ptr.hpp>