[core] Rationalize naming for style-related code

10 files changed, 69 insertions, 64 deletions

diff --git a/test/api/custom_layer.cpp b/test/api/custom_layer.cpp
index b3ff335d4e..c805df5566 100644
--- a/test/api/custom_layer.cpp
+++ b/test/api/custom_layer.cpp
@@ -4,12 +4,13 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/platform/default/headless_display.hpp>
 #include <mbgl/platform/default/headless_view.hpp>
-#include <mbgl/layer/custom_layer.hpp>
+#include <mbgl/style/layers/custom_layer.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/mat4.hpp>
 #include <mbgl/util/run_loop.hpp>
 
 using namespace mbgl;
+using namespace mbgl::style;
 
 static const GLchar * vertexShaderSource = "attribute vec2 a_pos; void main() { gl_Position = vec4(a_pos, 0, 1); }";
 static const GLchar * fragmentShaderSource = "void main() { gl_FragColor = vec4(0, 1, 0, 1); }";
diff --git a/test/map/map.cpp b/test/map/map.cpp
index c6f6843a0d..7cafe563b4 100644
--- a/test/map/map.cpp
+++ b/test/map/map.cpp
@@ -8,9 +8,10 @@
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/run_loop.hpp>
-#include <mbgl/layer/background_layer.hpp>
+#include <mbgl/style/layers/background_layer.hpp>
 
 using namespace mbgl;
+using namespace mbgl::style;
 using namespace std::literals::string_literals;
 
 struct MapTest {
diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp
index 45af1edf9d..d70fc5e44c 100644
--- a/test/src/mbgl/test/stub_style_observer.hpp
+++ b/test/src/mbgl/test/stub_style_observer.hpp
@@ -1,13 +1,14 @@
 #pragma once
 
-#include <mbgl/style/style_observer.hpp>
+#include <mbgl/style/observer.hpp>
 
-namespace mbgl {
+using namespace mbgl;
+using namespace mbgl::style;
 
 /**
- * An implementation of StyleObserver that forwards all methods to dynamically-settable lambas.
+ * An implementation of style::Observer that forwards all methods to dynamically-settable lambas.
  */
-class StubStyleObserver : public StyleObserver {
+class StubStyleObserver : public style::Observer {
 public:
     void onGlyphsLoaded(const FontStack& fontStack, const GlyphRange& glyphRange) override {
         if (glyphsLoaded) glyphsLoaded(fontStack, glyphRange);
@@ -61,5 +62,3 @@ public:
     std::function<void ()> resourceLoaded;
     std::function<void (std::exception_ptr)> resourceError;
 };
-
-} // namespace mbgl
diff --git a/test/storage/offline.cpp b/test/storage/offline.cpp
index 3b64c0f50e..06789cd828 100644
--- a/test/storage/offline.cpp
+++ b/test/storage/offline.cpp
@@ -1,5 +1,5 @@
 #include <mbgl/storage/offline.hpp>
-#include <mbgl/source/source_info.hpp>
+#include <mbgl/util/tileset.hpp>
 #include <mbgl/tile/tile_id.hpp>
 
 #include <gtest/gtest.h>
@@ -14,49 +14,49 @@ static const LatLngBounds sanFranciscoWrapped =
 
 TEST(OfflineTilePyramidRegionDefinition, TileCoverEmpty) {
     OfflineTilePyramidRegionDefinition region("", LatLngBounds::empty(), 0, 20, 1.0);
-    SourceInfo info;
+    Tileset tileset;
 
-    EXPECT_EQ((std::vector<CanonicalTileID>{}), region.tileCover(SourceType::Vector, 512, info));
+    EXPECT_EQ((std::vector<CanonicalTileID>{}), region.tileCover(SourceType::Vector, 512, tileset));
 }
 
 TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomIntersection) {
     OfflineTilePyramidRegionDefinition region("", sanFrancisco, 2, 2, 1.0);
-    SourceInfo info;
+    Tileset tileset;
 
-    info.minZoom = 0;
+    tileset.minZoom = 0;
     EXPECT_EQ((std::vector<CanonicalTileID>{ { 2, 0, 1 } }),
-              region.tileCover(SourceType::Vector, 512, info));
+              region.tileCover(SourceType::Vector, 512, tileset));
 
-    info.minZoom = 3;
-    EXPECT_EQ((std::vector<CanonicalTileID>{}), region.tileCover(SourceType::Vector, 512, info));
+    tileset.minZoom = 3;
+    EXPECT_EQ((std::vector<CanonicalTileID>{}), region.tileCover(SourceType::Vector, 512, tileset));
 }
 
 TEST(OfflineTilePyramidRegionDefinition, TileCoverTileSize) {
     OfflineTilePyramidRegionDefinition region("", LatLngBounds::world(), 0, 0, 1.0);
-    SourceInfo info;
+    Tileset tileset;
 
     EXPECT_EQ((std::vector<CanonicalTileID>{ { 0, 0, 0 } }),
-              region.tileCover(SourceType::Vector, 512, info));
+              region.tileCover(SourceType::Vector, 512, tileset));
 
     EXPECT_EQ((std::vector<CanonicalTileID>{ { 1, 0, 0 }, { 1, 0, 1 }, { 1, 1, 0 }, { 1, 1, 1 } }),
-              region.tileCover(SourceType::Vector, 256, info));
+              region.tileCover(SourceType::Vector, 256, tileset));
 }
 
 TEST(OfflineTilePyramidRegionDefinition, TileCoverZoomRounding) {
     OfflineTilePyramidRegionDefinition region("", sanFrancisco, 0.6, 0.7, 1.0);
-    SourceInfo info;
+    Tileset tileset;
 
     EXPECT_EQ((std::vector<CanonicalTileID>{ { 0, 0, 0 } }),
-              region.tileCover(SourceType::Vector, 512, info));
+              region.tileCover(SourceType::Vector, 512, tileset));
 
     EXPECT_EQ((std::vector<CanonicalTileID>{ { 1, 0, 0 } }),
-              region.tileCover(SourceType::Raster, 512, info));
+              region.tileCover(SourceType::Raster, 512, tileset));
 }
 
 TEST(OfflineTilePyramidRegionDefinition, TileCoverWrapped) {
     OfflineTilePyramidRegionDefinition region("", sanFranciscoWrapped, 0, 0, 1.0);
-    SourceInfo info;
+    Tileset tileset;
 
     EXPECT_EQ((std::vector<CanonicalTileID>{ { 0, 0, 0 } }),
-              region.tileCover(SourceType::Vector, 512, info));
+              region.tileCover(SourceType::Vector, 512, tileset));
 }
diff --git a/test/style/filter.cpp b/test/style/filter.cpp
index f258c31492..6e7f62db1b 100644
--- a/test/style/filter.cpp
+++ b/test/style/filter.cpp
@@ -2,7 +2,7 @@
 
 #include <mbgl/style/filter.hpp>
 #include <mbgl/style/filter_evaluator.hpp>
-#include <mbgl/style/style_parser.hpp>
+#include <mbgl/style/parser.hpp>
 #include <mbgl/tile/geometry_tile.hpp>
 
 #include <rapidjson/document.h>
@@ -10,6 +10,7 @@
 #include <map>
 
 using namespace mbgl;
+using namespace mbgl::style;
 
 typedef std::multimap<std::string, mbgl::Value> Properties;
 
diff --git a/test/style/functions.cpp b/test/style/functions.cpp
index 8812c77b55..5406320e4c 100644
--- a/test/style/functions.cpp
+++ b/test/style/functions.cpp
@@ -2,12 +2,13 @@
 #include <mbgl/test/util.hpp>
 
 #include <mbgl/style/property_evaluator.hpp>
-#include <mbgl/style/style_calculation_parameters.hpp>
+#include <mbgl/style/calculation_parameters.hpp>
 
 using namespace mbgl;
+using namespace mbgl::style;
 
 float evaluate(PropertyValue<float> value, float zoom) {
-    return PropertyValue<float>::visit(value, PropertyEvaluator<float>(StyleCalculationParameters(zoom), 0));
+    return PropertyValue<float>::visit(value, PropertyEvaluator<float>(CalculationParameters(zoom), 0));
 }
 
 TEST(Function, Constant) {
diff --git a/test/style/source.cpp b/test/style/source.cpp
index b9eb1bc434..ae8fb54d2f 100644
--- a/test/style/source.cpp
+++ b/test/style/source.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/test/stub_file_source.hpp>
 #include <mbgl/test/stub_style_observer.hpp>
 
-#include <mbgl/source/source.hpp>
+#include <mbgl/style/source.hpp>
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/io.hpp>
@@ -12,8 +12,8 @@
 #include <mbgl/util/worker.hpp>
 #include <mbgl/gl/texture_pool.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/style/style_update_parameters.hpp>
-#include <mbgl/layer/line_layer.hpp>
+#include <mbgl/style/update_parameters.hpp>
+#include <mbgl/style/layers/line_layer.hpp>
 #include <mbgl/annotation/annotation_manager.hpp>
 
 #include <mapbox/geojsonvt.hpp>
@@ -30,9 +30,9 @@ public:
     Worker worker { 1 };
     gl::TexturePool texturePool;
     AnnotationManager annotationManager { 1.0 };
-    Style style { fileSource, 1.0 };
+    style::Style style { fileSource, 1.0 };
 
-    StyleUpdateParameters updateParameters {
+    style::UpdateParameters updateParameters {
         1.0,
         MapDebugOptions(),
         TimePoint(),
@@ -131,10 +131,10 @@ TEST(Source, RasterTileEmpty) {
         FAIL() << "Should never be called";
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Raster, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -160,10 +160,10 @@ TEST(Source, VectorTileEmpty) {
         FAIL() << "Should never be called";
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Vector, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -189,10 +189,10 @@ TEST(Source, RasterTileFail) {
         test.end();
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Raster, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -218,10 +218,10 @@ TEST(Source, VectorTileFail) {
         test.end();
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Vector, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -246,10 +246,10 @@ TEST(Source, RasterTileCorrupt) {
         test.end();
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Raster, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -278,10 +278,10 @@ TEST(Source, VectorTileCorrupt) {
     layer->setSource("source", "water");
     test.style.addLayer(std::move(layer));
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Vector, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -305,10 +305,10 @@ TEST(Source, RasterTileCancel) {
         FAIL() << "Should never be called";
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Raster, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Raster, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
@@ -332,10 +332,10 @@ TEST(Source, VectorTileCancel) {
         FAIL() << "Should never be called";
     };
 
-    auto info = std::make_unique<SourceInfo>();
-    info->tiles = { "tiles" };
+    auto tileset = std::make_unique<Tileset>();
+    tileset->tiles = { "tiles" };
 
-    Source source(SourceType::Vector, "source", "", 512, std::move(info), nullptr);
+    Source source(SourceType::Vector, "source", "", 512, std::move(tileset), nullptr);
     source.setObserver(&test.observer);
     source.load(test.fileSource);
     source.update(test.updateParameters);
diff --git a/test/style/style.cpp b/test/style/style.cpp
index 916e1121c6..931867978e 100644
--- a/test/style/style.cpp
+++ b/test/style/style.cpp
@@ -2,10 +2,11 @@
 #include <mbgl/test/stub_file_source.hpp>
 
 #include <mbgl/style/style.hpp>
-#include <mbgl/source/source.hpp>
+#include <mbgl/style/source.hpp>
 #include <mbgl/util/io.hpp>
 
 using namespace mbgl;
+using namespace mbgl::style;
 
 TEST(Style, UnusedSource) {
     util::RunLoop loop;
diff --git a/test/style/style_layer.cpp b/test/style/style_layer.cpp
index 3274fe3377..ed8904dabd 100644
--- a/test/style/style_layer.cpp
+++ b/test/style/style_layer.cpp
@@ -1,8 +1,9 @@
 #include <mbgl/test/util.hpp>
-#include <mbgl/layer/background_layer.hpp>
-#include <mbgl/layer/background_layer_impl.hpp>
+#include <mbgl/style/layers/background_layer.hpp>
+#include <mbgl/style/layers/background_layer_impl.hpp>
 
 using namespace mbgl;
+using namespace mbgl::style;
 
 TEST(Layer, Clone) {
     std::unique_ptr<Layer> layer = std::make_unique<BackgroundLayer>("id");
diff --git a/test/style/style_parser.cpp b/test/style/style_parser.cpp
index 6245c326a5..5f730a8373 100644
--- a/test/style/style_parser.cpp
+++ b/test/style/style_parser.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/test/util.hpp>
 #include <mbgl/test/fixture_log_observer.hpp>
 
-#include <mbgl/style/style_parser.hpp>
+#include <mbgl/style/parser.hpp>
 #include <mbgl/util/io.hpp>
 
 #include <rapidjson/document.h>
@@ -29,7 +29,7 @@ TEST_P(StyleParserTest, ParseStyle) {
     FixtureLogObserver* observer = new FixtureLogObserver();
     Log::setObserver(std::unique_ptr<Log::Observer>(observer));
 
-    StyleParser parser;
+    style::Parser parser;
     parser.parse(util::read_file(base + ".style.json"));
 
     for (auto it = infoDoc.MemberBegin(), end = infoDoc.MemberEnd(); it != end; it++) {
@@ -86,7 +86,7 @@ INSTANTIATE_TEST_CASE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] {
 }()));
 
 TEST(StyleParser, ParseTileJSONRaster) {
-    auto result = StyleParser::parseTileJSON(
+    auto result = style::parseTileJSON(
         util::read_file("test/fixtures/style_parser/tilejson.raster.json"),
         "mapbox://mapbox.satellite",
         SourceType::Raster,
@@ -103,7 +103,7 @@ TEST(StyleParser, ParseTileJSONRaster) {
 }
 
 TEST(StyleParser, ParseTileJSONVector) {
-    auto result = StyleParser::parseTileJSON(
+    auto result = style::parseTileJSON(
         util::read_file("test/fixtures/style_parser/tilejson.vector.json"),
         "mapbox://mapbox.streets",
         SourceType::Vector,
@@ -116,7 +116,7 @@ TEST(StyleParser, ParseTileJSONVector) {
 }
 
 TEST(StyleParser, FontStacks) {
-    StyleParser parser;
+    style::Parser parser;
     parser.parse(util::read_file("test/fixtures/style_parser/font_stacks.json"));
     auto result = parser.fontStacks();
     ASSERT_EQ(3, result.size());