[core] Rationalize naming for style-related code

8 files changed, 49 insertions, 48 deletions

diff --git a/platform/android/src/example_custom_layer.cpp b/platform/android/src/example_custom_layer.cpp
index 99b6d7223a..516a8f2cd5 100644
--- a/platform/android/src/example_custom_layer.cpp
+++ b/platform/android/src/example_custom_layer.cpp
@@ -1,7 +1,7 @@
 #include <jni.h>
 #include <GLES2/gl2.h>
 
-#include <mbgl/layer/custom_layer.hpp>
+#include <mbgl/style/layers/custom_layer.hpp>
 
 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); }";
@@ -64,7 +64,7 @@ void nativeInitialize(void *context) {
     reinterpret_cast<ExampleCustomLayer*>(context)->initialize();
 }
 
-void nativeRender(void *context, const mbgl::CustomLayerRenderParameters& /*parameters*/) {
+void nativeRender(void *context, const mbgl::style::CustomLayerRenderParameters& /*parameters*/) {
     reinterpret_cast<ExampleCustomLayer*>(context)->render();
 }
 
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index 2b6b4429f2..5c0f7b1530 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -14,7 +14,7 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/camera.hpp>
 #include <mbgl/annotation/annotation.hpp>
-#include <mbgl/layer/custom_layer.hpp>
+#include <mbgl/style/layers/custom_layer.hpp>
 #include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/platform/event.hpp>
 #include <mbgl/platform/log.hpp>
@@ -1112,11 +1112,11 @@ void nativeAddCustomLayer(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr
     mbgl::Log::Debug(mbgl::Event::JNI, "nativeAddCustomLayer");
     assert(nativeMapViewPtr != 0);
     NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr);
-    nativeMapView->getMap().addLayer(std::make_unique<mbgl::CustomLayer>(
+    nativeMapView->getMap().addLayer(std::make_unique<mbgl::style::CustomLayer>(
         std_string_from_jstring(env, reinterpret_cast<jni::jstring*>(jni::GetField<jni::jobject*>(*env, customLayer, *customLayerIdId))),
-        reinterpret_cast<mbgl::CustomLayerInitializeFunction>(jni::GetField<jlong>(*env, customLayer, *customLayerInitializeFunctionId)),
-        reinterpret_cast<mbgl::CustomLayerRenderFunction>(jni::GetField<jlong>(*env, customLayer, *customLayerRenderFunctionId)),
-        reinterpret_cast<mbgl::CustomLayerDeinitializeFunction>(jni::GetField<jlong>(*env, customLayer, *customLayerDeinitializeFunctionId)),
+        reinterpret_cast<mbgl::style::CustomLayerInitializeFunction>(jni::GetField<jlong>(*env, customLayer, *customLayerInitializeFunctionId)),
+        reinterpret_cast<mbgl::style::CustomLayerRenderFunction>(jni::GetField<jlong>(*env, customLayer, *customLayerRenderFunctionId)),
+        reinterpret_cast<mbgl::style::CustomLayerDeinitializeFunction>(jni::GetField<jlong>(*env, customLayer, *customLayerDeinitializeFunctionId)),
         reinterpret_cast<void*>(jni::GetField<jlong>(*env, customLayer, *customLayerContextId))),
         before ? mbgl::optional<std::string>(std_string_from_jstring(env, before)) : mbgl::optional<std::string>());
 }
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index 2280c3f2ae..67e9748a70 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/platform/default/glfw_view.hpp>
 #include <mbgl/annotation/annotation.hpp>
 #include <mbgl/sprite/sprite_image.hpp>
-#include <mbgl/style/property_transition.hpp>
+#include <mbgl/style/transition_options.hpp>
 #include <mbgl/gl/gl.hpp>
 #include <mbgl/gl/gl_values.hpp>
 #include <mbgl/gl/gl_helper.hpp>
@@ -146,7 +146,7 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action,
             break;
         case GLFW_KEY_R:
             if (!mods) {
-                static const mbgl::PropertyTransition transition { { mbgl::Milliseconds(300) } };
+                static const mbgl::style::TransitionOptions transition { { mbgl::Milliseconds(300) } };
                 if (view->map->hasClass("night")) {
                     view->map->removeClass("night", transition);
                 } else {
diff --git a/platform/default/mbgl/storage/offline.cpp b/platform/default/mbgl/storage/offline.cpp
index b13aa05039..d8e0357ae2 100644
--- a/platform/default/mbgl/storage/offline.cpp
+++ b/platform/default/mbgl/storage/offline.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/storage/offline.hpp>
 #include <mbgl/util/tile_cover.hpp>
-#include <mbgl/source/source_info.hpp>
+#include <mbgl/util/tileset.hpp>
 
 #include <rapidjson/document.h>
 #include <rapidjson/stringbuffer.h>
@@ -23,9 +23,9 @@ OfflineTilePyramidRegionDefinition::OfflineTilePyramidRegionDefinition(
     }
 }
 
-std::vector<CanonicalTileID> OfflineTilePyramidRegionDefinition::tileCover(SourceType type, uint16_t tileSize, const SourceInfo& info) const {
-    double minZ = std::max<double>(util::coveringZoomLevel(minZoom, type, tileSize), info.minZoom);
-    double maxZ = std::min<double>(util::coveringZoomLevel(maxZoom, type, tileSize), info.maxZoom);
+std::vector<CanonicalTileID> OfflineTilePyramidRegionDefinition::tileCover(SourceType type, uint16_t tileSize, const Tileset& tileset) const {
+    double minZ = std::max<double>(util::coveringZoomLevel(minZoom, type, tileSize), tileset.minZoom);
+    double maxZ = std::min<double>(util::coveringZoomLevel(maxZoom, type, tileSize), tileset.maxZoom);
 
     assert(minZ >= 0);
     assert(maxZ >= 0);
diff --git a/platform/default/mbgl/storage/offline_download.cpp b/platform/default/mbgl/storage/offline_download.cpp
index 76a9c38c8b..11ca862925 100644
--- a/platform/default/mbgl/storage/offline_download.cpp
+++ b/platform/default/mbgl/storage/offline_download.cpp
@@ -3,7 +3,7 @@
 #include <mbgl/storage/file_source.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
-#include <mbgl/style/style_parser.hpp>
+#include <mbgl/style/parser.hpp>
 #include <mbgl/text/glyph.hpp>
 #include <mbgl/util/tile_cover.hpp>
 #include <mbgl/util/mapbox.hpp>
@@ -46,7 +46,7 @@ void OfflineDownload::setState(OfflineRegionDownloadState state) {
     observer->statusChanged(status);
 }
 
-std::vector<Resource> OfflineDownload::spriteResources(const StyleParser& parser) const {
+std::vector<Resource> OfflineDownload::spriteResources(const style::Parser& parser) const {
     std::vector<Resource> result;
 
     if (!parser.spriteURL.empty()) {
@@ -57,7 +57,7 @@ std::vector<Resource> OfflineDownload::spriteResources(const StyleParser& parser
     return result;
 }
 
-std::vector<Resource> OfflineDownload::glyphResources(const StyleParser& parser) const {
+std::vector<Resource> OfflineDownload::glyphResources(const style::Parser& parser) const {
     std::vector<Resource> result;
 
     if (!parser.glyphURL.empty()) {
@@ -71,11 +71,11 @@ std::vector<Resource> OfflineDownload::glyphResources(const StyleParser& parser)
     return result;
 }
 
-std::vector<Resource> OfflineDownload::tileResources(SourceType type, uint16_t tileSize, const SourceInfo& info) const {
+std::vector<Resource> OfflineDownload::tileResources(SourceType type, uint16_t tileSize, const Tileset& tileset) const {
     std::vector<Resource> result;
 
-    for (const auto& tile : definition.tileCover(type, tileSize, info)) {
-        result.push_back(Resource::tile(info.tiles[0], definition.pixelRatio, tile.x, tile.y, tile.z));
+    for (const auto& tile : definition.tileCover(type, tileSize, tileset)) {
+        result.push_back(Resource::tile(tileset.tiles[0], definition.pixelRatio, tile.x, tile.y, tile.z));
     }
 
     return result;
@@ -94,7 +94,7 @@ OfflineRegionStatus OfflineDownload::getStatus() const {
         return result;
     }
 
-    StyleParser parser;
+    style::Parser parser;
     parser.parse(*styleResponse->data);
 
     result.requiredResourceCountIsPrecise = true;
@@ -103,14 +103,14 @@ OfflineRegionStatus OfflineDownload::getStatus() const {
         switch (source->type) {
         case SourceType::Vector:
         case SourceType::Raster:
-            if (source->getInfo()) {
-                result.requiredResourceCount += tileResources(source->type, source->tileSize, *source->getInfo()).size();
+            if (source->getTileset()) {
+                result.requiredResourceCount += tileResources(source->type, source->tileSize, *source->getTileset()).size();
             } else {
                 result.requiredResourceCount += 1;
                 optional<Response> sourceResponse = offlineDatabase.get(Resource::source(source->url));
                 if (sourceResponse) {
                     result.requiredResourceCount += tileResources(source->type, source->tileSize,
-                        *StyleParser::parseTileJSON(*sourceResponse->data, source->url, source->type, source->tileSize)).size();
+                        *style::parseTileJSON(*sourceResponse->data, source->url, source->type, source->tileSize)).size();
                 } else {
                     result.requiredResourceCountIsPrecise = false;
                 }
@@ -144,7 +144,7 @@ void OfflineDownload::activateDownload() {
     ensureResource(Resource::style(definition.styleURL), [&] (Response styleResponse) {
         status.requiredResourceCountIsPrecise = true;
 
-        StyleParser parser;
+        style::Parser parser;
         parser.parse(*styleResponse.data);
 
         for (const auto& source : parser.sources) {
@@ -155,14 +155,14 @@ void OfflineDownload::activateDownload() {
             switch (type) {
             case SourceType::Vector:
             case SourceType::Raster:
-                if (source->getInfo()) {
-                    ensureTiles(type, tileSize, *source->getInfo());
+                if (source->getTileset()) {
+                    ensureTiles(type, tileSize, *source->getTileset());
                 } else {
                     status.requiredResourceCountIsPrecise = false;
                     requiredSourceURLs.insert(url);
 
                     ensureResource(Resource::source(url), [=] (Response sourceResponse) {
-                        ensureTiles(type, tileSize, *StyleParser::parseTileJSON(*sourceResponse.data, url, type, tileSize));
+                        ensureTiles(type, tileSize, *style::parseTileJSON(*sourceResponse.data, url, type, tileSize));
 
                         requiredSourceURLs.erase(url);
                         if (requiredSourceURLs.empty()) {
@@ -198,7 +198,7 @@ void OfflineDownload::deactivateDownload() {
     requests.clear();
 }
 
-void OfflineDownload::ensureTiles(SourceType type, uint16_t tileSize, const SourceInfo& info) {
+void OfflineDownload::ensureTiles(SourceType type, uint16_t tileSize, const Tileset& info) {
     for (const auto& resource : tileResources(type, tileSize, info)) {
         ensureResource(resource);
     }
diff --git a/platform/default/mbgl/storage/offline_download.hpp b/platform/default/mbgl/storage/offline_download.hpp
index 706cdf98d8..1a0d7536d8 100644
--- a/platform/default/mbgl/storage/offline_download.hpp
+++ b/platform/default/mbgl/storage/offline_download.hpp
@@ -1,7 +1,6 @@
-    #pragma once
+#pragma once
 
 #include <mbgl/storage/offline.hpp>
-#include <mbgl/style/types.hpp>
 
 #include <list>
 #include <set>
@@ -14,9 +13,11 @@ class FileSource;
 class AsyncRequest;
 class Resource;
 class Response;
-class SourceInfo;
-class StyleParser;
-class Source;
+class Tileset;
+
+namespace style {
+class Parser;
+}
 
 /**
  * Coordinates the request and storage of all resources for an offline region.
@@ -37,9 +38,9 @@ private:
     void activateDownload();
     void deactivateDownload();
 
-    std::vector<Resource> spriteResources(const StyleParser&) const;
-    std::vector<Resource> glyphResources(const StyleParser&) const;
-    std::vector<Resource> tileResources(SourceType, uint16_t, const SourceInfo&) const;
+    std::vector<Resource> spriteResources(const style::Parser&) const;
+    std::vector<Resource> glyphResources(const style::Parser&) const;
+    std::vector<Resource> tileResources(SourceType, uint16_t, const Tileset&) const;
 
     /*
      * Ensure that the resource is stored in the database, requesting it if necessary.
@@ -47,7 +48,7 @@ private:
      * is deactivated, all in progress requests are cancelled.
      */
     void ensureResource(const Resource&, std::function<void (Response)> = {});
-    void ensureTiles(SourceType, uint16_t, const SourceInfo&);
+    void ensureTiles(SourceType, uint16_t, const Tileset&);
     bool checkTileCountLimit(const Resource& resource);
     
     int64_t id;
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 338dd4805f..cc2f7c3518 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -15,9 +15,9 @@
 #include <mbgl/platform/darwin/reachability.h>
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/network_status.hpp>
-#include <mbgl/style/property_transition.hpp>
+#include <mbgl/style/transition_options.hpp>
+#include <mbgl/style/layers/custom_layer.hpp>
 #include <mbgl/math/wrap.hpp>
-#include <mbgl/layer/custom_layer.hpp>
 #include <mbgl/util/geo.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/image.hpp>
@@ -2700,7 +2700,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
         newAppliedClasses.insert(newAppliedClasses.end(), [appliedClass UTF8String]);
     }
 
-    mbgl::PropertyTransition transition { { MGLDurationInSeconds(transitionDuration) } };
+    mbgl::style::TransitionOptions transition { { MGLDurationInSeconds(transitionDuration) } };
     _mbglMap->setClasses(newAppliedClasses, transition);
 }
 
@@ -4973,7 +4973,7 @@ void MGLPrepareCustomStyleLayer(void *context)
     }
 }
 
-void MGLDrawCustomStyleLayer(void *context, const mbgl::CustomLayerRenderParameters &params)
+void MGLDrawCustomStyleLayer(void *context, const mbgl::style::CustomLayerRenderParameters &params)
 {
     CGSize size = CGSizeMake(params.width, params.height);
     CLLocationCoordinate2D centerCoordinate = CLLocationCoordinate2DMake(params.latitude, params.longitude);
@@ -5005,8 +5005,8 @@ void MGLFinishCustomStyleLayer(void *context)
 {
     NSAssert(identifier, @"Style layer needs an identifier");
     MGLCustomStyleLayerHandlers *context = new MGLCustomStyleLayerHandlers(preparation, drawing, completion);
-    _mbglMap->addLayer(std::make_unique<mbgl::CustomLayer>(identifier.UTF8String, MGLPrepareCustomStyleLayer,
-                                                           MGLDrawCustomStyleLayer, MGLFinishCustomStyleLayer, context),
+    _mbglMap->addLayer(std::make_unique<mbgl::style::CustomLayer>(identifier.UTF8String, MGLPrepareCustomStyleLayer,
+                                                                  MGLDrawCustomStyleLayer, MGLFinishCustomStyleLayer, context),
                        otherIdentifier ? mbgl::optional<std::string>(otherIdentifier.UTF8String) : mbgl::optional<std::string>());
 }
 
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 4354eac75d..144d545d3c 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -4,7 +4,7 @@
 #include <mbgl/gl/gl.hpp>
 #include <mbgl/map/camera.hpp>
 #include <mbgl/map/map.hpp>
-#include <mbgl/layer/custom_layer.hpp>
+#include <mbgl/style/layers/custom_layer.hpp>
 #include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/storage/network_status.hpp>
 #include <mbgl/util/constants.hpp>
@@ -557,13 +557,13 @@ void QMapboxGL::addCustomLayer(const QString &id,
         void *context_,
         char *before)
 {
-    d_ptr->mapObj->addLayer(std::make_unique<mbgl::CustomLayer>(
+    d_ptr->mapObj->addLayer(std::make_unique<mbgl::style::CustomLayer>(
             id.toStdString(),
-            reinterpret_cast<mbgl::CustomLayerInitializeFunction>(initFn),
+            reinterpret_cast<mbgl::style::CustomLayerInitializeFunction>(initFn),
             // This cast is safe as long as both mbgl:: and QMapbox::
             // CustomLayerRenderParameters members remains the same.
-            (mbgl::CustomLayerRenderFunction)renderFn,
-            reinterpret_cast<mbgl::CustomLayerDeinitializeFunction>(deinitFn),
+            (mbgl::style::CustomLayerRenderFunction)renderFn,
+            reinterpret_cast<mbgl::style::CustomLayerDeinitializeFunction>(deinitFn),
             context_),
             before ? mbgl::optional<std::string>(before) : mbgl::optional<std::string>());
 }