[core] Reorganize sprite related files

7 files changed, 42 insertions, 42 deletions

diff --git a/test/miscellaneous/custom_sprites.cpp b/test/sprite/custom_sprites.cpp
index a72119ea61..98d173ea2d 100644
--- a/test/miscellaneous/custom_sprites.cpp
+++ b/test/sprite/custom_sprites.cpp
@@ -4,7 +4,7 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/still_image.hpp>
 #include <mbgl/util/image.hpp>
-#include <mbgl/annotation/sprite_image.hpp>
+#include <mbgl/sprite/sprite_image.hpp>
 
 #include <mbgl/util/io.hpp>
 
@@ -16,7 +16,7 @@
 
 using namespace mbgl;
 
-TEST(Headless, CustomSpriteImages) {
+TEST(Sprite, CustomSpriteImages) {
     FixtureLog log;
 
     auto display = std::make_shared<mbgl::HeadlessDisplay>();
diff --git a/test/style/sprite.cpp b/test/sprite/sprite.cpp
index 1c3f9b2271..7575cb3c9a 100644
--- a/test/style/sprite.cpp
+++ b/test/sprite/sprite.cpp
@@ -2,7 +2,7 @@
 #include "../fixtures/mock_file_source.hpp"
 #include "../fixtures/util.hpp"
 
-#include <mbgl/map/sprite.hpp>
+#include <mbgl/sprite/sprite.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/thread.hpp>
 
diff --git a/test/annotations/sprite_atlas.cpp b/test/sprite/sprite_atlas.cpp
index 0eece6c47c..554ef16da9 100644
--- a/test/annotations/sprite_atlas.cpp
+++ b/test/sprite/sprite_atlas.cpp
@@ -1,15 +1,15 @@
 #include "../fixtures/util.hpp"
 #include "../fixtures/fixture_log_observer.hpp"
 
-#include <mbgl/geometry/sprite_atlas.hpp>
-#include <mbgl/annotation/sprite_store.hpp>
-#include <mbgl/annotation/sprite_parser.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
+#include <mbgl/sprite/sprite_store.hpp>
+#include <mbgl/sprite/sprite_parser.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/image.hpp>
 
 using namespace mbgl;
 
-TEST(Annotations, SpriteAtlas) {
+TEST(Sprite, SpriteAtlas) {
     FixtureLog log;
 
     auto spriteParseResult = parseSprite(util::read_file("test/fixtures/annotations/emerald.png"),
@@ -86,7 +86,7 @@ TEST(Annotations, SpriteAtlas) {
     //     util::compress_png(atlas.getTextureWidth(), atlas.getTextureHeight(), atlas.getData()));
 }
 
-TEST(Annotations, SpriteAtlasSize) {
+TEST(Sprite, SpriteAtlasSize) {
     auto spriteParseResult = parseSprite(util::read_file("test/fixtures/annotations/emerald.png"),
                                          util::read_file("test/fixtures/annotations/emerald.json"));
 
@@ -123,7 +123,7 @@ TEST(Annotations, SpriteAtlasSize) {
     //     util::compress_png(atlas.getTextureWidth(), atlas.getTextureHeight(), atlas.getData()));
 }
 
-TEST(Annotations, SpriteAtlasUpdates) {
+TEST(Sprite, SpriteAtlasUpdates) {
     SpriteStore store;
 
     SpriteAtlas atlas(32, 32, 1, store);
diff --git a/test/annotations/sprite_image.cpp b/test/sprite/sprite_image.cpp
index 9c5ca79ac9..8bc88fcc84 100644
--- a/test/annotations/sprite_image.cpp
+++ b/test/sprite/sprite_image.cpp
@@ -1,11 +1,11 @@
 #include "../fixtures/util.hpp"
 
-#include <mbgl/annotation/sprite_image.hpp>
+#include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/util/exception.hpp>
 
 using namespace mbgl;
 
-TEST(Annotations, SpriteImageZeroWidth) {
+TEST(Sprite, SpriteImageZeroWidth) {
     try {
         SpriteImage(0, 16, 2, "");
         FAIL() << "Expected exception";
@@ -14,7 +14,7 @@ TEST(Annotations, SpriteImageZeroWidth) {
     }
 }
 
-TEST(Annotations, SpriteImageZeroHeight) {
+TEST(Sprite, SpriteImageZeroHeight) {
     try {
         SpriteImage(16, 0, 2, "");
         FAIL() << "Expected exception";
@@ -23,7 +23,7 @@ TEST(Annotations, SpriteImageZeroHeight) {
     }
 }
 
-TEST(Annotations, SpriteImageZeroRatio) {
+TEST(Sprite, SpriteImageZeroRatio) {
     try {
         SpriteImage(16, 16, 0, "");
         FAIL() << "Expected exception";
@@ -32,7 +32,7 @@ TEST(Annotations, SpriteImageZeroRatio) {
     }
 }
 
-TEST(Annotations, SpriteImageMismatchedData) {
+TEST(Sprite, SpriteImageMismatchedData) {
     try {
         SpriteImage(16, 16, 2, "");
         FAIL() << "Expected exception";
@@ -41,7 +41,7 @@ TEST(Annotations, SpriteImageMismatchedData) {
     }
 }
 
-TEST(Annotations, SpriteImage) {
+TEST(Sprite, SpriteImage) {
     std::string pixels(32 * 24 * 4, '\0');
     SpriteImage sprite(16, 12, 2, std::move(pixels));
     EXPECT_EQ(16, sprite.width);
@@ -52,7 +52,7 @@ TEST(Annotations, SpriteImage) {
     EXPECT_EQ(32u * 24 * 4, sprite.data.size());
 }
 
-TEST(Annotations, SpriteImageFractionalRatio) {
+TEST(Sprite, SpriteImageFractionalRatio) {
     std::string pixels(20 * 12 * 4, '\0');
     SpriteImage sprite(13, 8, 1.5, std::move(pixels));
     EXPECT_EQ(13, sprite.width);
diff --git a/test/annotations/sprite_parser.cpp b/test/sprite/sprite_parser.cpp
index d4c3f96d6a..c2e4df3c58 100644
--- a/test/annotations/sprite_parser.cpp
+++ b/test/sprite/sprite_parser.cpp
@@ -1,8 +1,8 @@
 #include "../fixtures/util.hpp"
 #include "../fixtures/fixture_log_observer.hpp"
 
-#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/util/image.hpp>
 #include <mbgl/util/io.hpp>
 
@@ -10,7 +10,7 @@
 
 using namespace mbgl;
 
-TEST(Annotations, SpriteImageCreationInvalid) {
+TEST(Sprite, SpriteImageCreationInvalid) {
     FixtureLog log;
 
     const util::Image image_1x(util::read_file("test/fixtures/annotations/emerald.png"));
@@ -33,7 +33,7 @@ TEST(Annotations, SpriteImageCreationInvalid) {
                   }));
 }
 
-TEST(Annotations, SpriteImageCreation1x) {
+TEST(Sprite, SpriteImageCreation1x) {
     const util::Image image_1x(util::read_file("test/fixtures/annotations/emerald.png"));
     ASSERT_TRUE(image_1x);
     ASSERT_EQ(200u, image_1x.getWidth());
@@ -73,7 +73,7 @@ TEST(Annotations, SpriteImageCreation1x) {
     }
 }
 
-TEST(Annotations, SpriteImageCreation2x) {
+TEST(Sprite, SpriteImageCreation2x) {
     const util::Image image_2x(util::read_file("test/fixtures/annotations/emerald@2x.png"));
     ASSERT_TRUE(image_2x);
 
@@ -88,7 +88,7 @@ TEST(Annotations, SpriteImageCreation2x) {
     EXPECT_EQ(0x85F345098DD4F9E3u, test::crc64(sprite->data));
 }
 
-TEST(Annotations, SpriteImageCreation1_5x) {
+TEST(Sprite, SpriteImageCreation1_5x) {
     const util::Image image_2x(util::read_file("test/fixtures/annotations/emerald@2x.png"));
     ASSERT_TRUE(image_2x);
 
@@ -113,7 +113,7 @@ TEST(Annotations, SpriteImageCreation1_5x) {
     EXPECT_EQ(0x134A530C742DD141u, test::crc64(sprite2->data));
 }
 
-TEST(Annotations, SpriteParsing) {
+TEST(Sprite, SpriteParsing) {
     const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png");
     const auto json_1x = util::read_file("test/fixtures/annotations/emerald.json");
 
@@ -209,7 +209,7 @@ TEST(Annotations, SpriteParsing) {
     }
 }
 
-TEST(Annotations, SpriteParsingInvalidJSON) {
+TEST(Sprite, SpriteParsingInvalidJSON) {
     const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png");
     const auto json_1x = R"JSON({ "image": " })JSON";
 
@@ -219,7 +219,7 @@ TEST(Annotations, SpriteParsingInvalidJSON) {
               std::string("Failed to parse JSON: Missing a closing quotation mark in string. at offset 13"));
 }
 
-TEST(Annotations, SpriteParsingEmptyImage) {
+TEST(Sprite, SpriteParsingEmptyImage) {
     FixtureLog log;
 
     const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png");
@@ -236,7 +236,7 @@ TEST(Annotations, SpriteParsingEmptyImage) {
                   }));
 }
 
-TEST(Annotations, SpriteParsingSimpleWidthHeight) {
+TEST(Sprite, SpriteParsingSimpleWidthHeight) {
     FixtureLog log;
 
     const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png");
@@ -246,7 +246,7 @@ TEST(Annotations, SpriteParsingSimpleWidthHeight) {
     EXPECT_EQ(1u, images.size());
 }
 
-TEST(Annotations, SpriteParsingWidthTooBig) {
+TEST(Sprite, SpriteParsingWidthTooBig) {
     FixtureLog log;
 
     const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png");
@@ -269,7 +269,7 @@ TEST(Annotations, SpriteParsingWidthTooBig) {
                   }));
 }
 
-TEST(Annotations, SpriteParsingNegativeWidth) {
+TEST(Sprite, SpriteParsingNegativeWidth) {
     FixtureLog log;
 
     const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png");
@@ -292,7 +292,7 @@ TEST(Annotations, SpriteParsingNegativeWidth) {
                   }));
 }
 
-TEST(Annotations, SpriteParsingNullRatio) {
+TEST(Sprite, SpriteParsingNullRatio) {
     FixtureLog log;
 
     const auto image_1x = util::read_file("test/fixtures/annotations/emerald.png");
diff --git a/test/annotations/sprite_store.cpp b/test/sprite/sprite_store.cpp
index 16eaad2499..17fce62a2b 100644
--- a/test/annotations/sprite_store.cpp
+++ b/test/sprite/sprite_store.cpp
@@ -1,11 +1,11 @@
 #include "../fixtures/util.hpp"
 #include "../fixtures/fixture_log_observer.hpp"
 
-#include <mbgl/annotation/sprite_store.hpp>
+#include <mbgl/sprite/sprite_store.hpp>
 
 using namespace mbgl;
 
-TEST(Annotations, SpriteStore) {
+TEST(Sprite, SpriteStore) {
     FixtureLog log;
 
     const auto sprite1 = std::make_shared<SpriteImage>(8, 8, 2, std::string(16 * 16 * 4, '\0'));
@@ -71,7 +71,7 @@ TEST(Annotations, SpriteStore) {
     EXPECT_EQ(Sprites(), store.getDirty());
 }
 
-TEST(Annotations, SpriteStoreOtherPixelRatio) {
+TEST(Sprite, SpriteStoreOtherPixelRatio) {
     FixtureLog log;
 
     const auto sprite1 = std::make_shared<SpriteImage>(8, 8, 1, std::string(8 * 8 * 4, '\0'));
@@ -84,7 +84,7 @@ TEST(Annotations, SpriteStoreOtherPixelRatio) {
     EXPECT_EQ(Sprites({ { "one", sprite1 } }), store.getDirty());
 }
 
-TEST(Annotations, SpriteStoreMultiple) {
+TEST(Sprite, SpriteStoreMultiple) {
     const auto sprite1 = std::make_shared<SpriteImage>(8, 8, 2, std::string(16 * 16 * 4, '\0'));
     const auto sprite2 = std::make_shared<SpriteImage>(8, 8, 2, std::string(16 * 16 * 4, '\0'));
 
@@ -101,7 +101,7 @@ TEST(Annotations, SpriteStoreMultiple) {
     EXPECT_EQ(Sprites(), store.getDirty());
 }
 
-TEST(Annotations, SpriteStoreReplace) {
+TEST(Sprite, SpriteStoreReplace) {
     FixtureLog log;
 
     const auto sprite1 = std::make_shared<SpriteImage>(8, 8, 2, std::string(16 * 16 * 4, '\0'));
@@ -118,7 +118,7 @@ TEST(Annotations, SpriteStoreReplace) {
     EXPECT_EQ(Sprites({ { "sprite", sprite2 } }), store.getDirty());
 }
 
-TEST(Annotations, SpriteStoreReplaceWithDifferentDimensions) {
+TEST(Sprite, SpriteStoreReplaceWithDifferentDimensions) {
     FixtureLog log;
 
     const auto sprite1 = std::make_shared<SpriteImage>(8, 8, 2, std::string(16 * 16 * 4, '\0'));
diff --git a/test/test.gypi b/test/test.gypi
index 7c0b0d6c23..e9678b0754 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -39,11 +39,6 @@
 
         'miscellaneous/assert.cpp',
 
-        'annotations/sprite_atlas.cpp',
-        'annotations/sprite_image.cpp',
-        'annotations/sprite_store.cpp',
-        'annotations/sprite_parser.cpp',
-
         'api/annotations.cpp',
         'api/api_misuse.cpp',
         'api/repeated_render.cpp',
@@ -54,7 +49,6 @@
         'miscellaneous/binpack.cpp',
         'miscellaneous/bilinear.cpp',
         'miscellaneous/comparisons.cpp',
-        'miscellaneous/custom_sprites.cpp',
         'miscellaneous/enums.cpp',
         'miscellaneous/functions.cpp',
         'miscellaneous/geo.cpp',
@@ -91,7 +85,13 @@
         'style/glyph_store.cpp',
         'style/pending_resources.cpp',
         'style/resource_loading.cpp',
-        'style/sprite.cpp',
+
+        'sprite/sprite.cpp',
+        'sprite/sprite_atlas.cpp',
+        'sprite/sprite_image.cpp',
+        'sprite/sprite_parser.cpp',
+        'sprite/sprite_store.cpp',
+        'sprite/custom_sprites.cpp',
       ],
       'libraries': [
         '<@(gtest_static_libs)',