From c902f9098b331302aaa1baac77d1575db624a132 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 26 Apr 2016 16:39:56 -0700
Subject: [core] Rationalize naming for style-related code

---
 include/mbgl/annotation/annotation.hpp         |   3 +-
 include/mbgl/layer/background_layer.hpp        |  41 ------
 include/mbgl/layer/circle_layer.hpp            |  59 --------
 include/mbgl/layer/custom_layer.hpp            |  69 ----------
 include/mbgl/layer/fill_layer.hpp              |  62 ---------
 include/mbgl/layer/line_layer.hpp              |  87 ------------
 include/mbgl/layer/raster_layer.hpp            |  58 --------
 include/mbgl/layer/symbol_layer.hpp            | 180 ------------------------
 include/mbgl/map/map.hpp                       |  15 +-
 include/mbgl/storage/offline.hpp               |   4 +-
 include/mbgl/storage/resource.hpp              |   2 +-
 include/mbgl/style/filter.hpp                  |   2 +
 include/mbgl/style/function.hpp                |  27 ++++
 include/mbgl/style/layer.hpp                   |   7 +-
 include/mbgl/style/layers/background_layer.hpp |  45 ++++++
 include/mbgl/style/layers/circle_layer.hpp     |  63 +++++++++
 include/mbgl/style/layers/custom_layer.hpp     |  71 ++++++++++
 include/mbgl/style/layers/fill_layer.hpp       |  66 +++++++++
 include/mbgl/style/layers/line_layer.hpp       |  91 ++++++++++++
 include/mbgl/style/layers/raster_layer.hpp     |  62 +++++++++
 include/mbgl/style/layers/symbol_layer.hpp     | 184 +++++++++++++++++++++++++
 include/mbgl/style/property_transition.hpp     |  17 ---
 include/mbgl/style/property_value.hpp          |  38 +++++
 include/mbgl/style/transition_options.hpp      |  19 +++
 include/mbgl/style/types.hpp                   |  41 +-----
 include/mbgl/util/color.hpp                    |  10 ++
 include/mbgl/util/font_stack.hpp               |  17 +++
 27 files changed, 714 insertions(+), 626 deletions(-)
 delete mode 100644 include/mbgl/layer/background_layer.hpp
 delete mode 100644 include/mbgl/layer/circle_layer.hpp
 delete mode 100644 include/mbgl/layer/custom_layer.hpp
 delete mode 100644 include/mbgl/layer/fill_layer.hpp
 delete mode 100644 include/mbgl/layer/line_layer.hpp
 delete mode 100644 include/mbgl/layer/raster_layer.hpp
 delete mode 100644 include/mbgl/layer/symbol_layer.hpp
 create mode 100644 include/mbgl/style/function.hpp
 create mode 100644 include/mbgl/style/layers/background_layer.hpp
 create mode 100644 include/mbgl/style/layers/circle_layer.hpp
 create mode 100644 include/mbgl/style/layers/custom_layer.hpp
 create mode 100644 include/mbgl/style/layers/fill_layer.hpp
 create mode 100644 include/mbgl/style/layers/line_layer.hpp
 create mode 100644 include/mbgl/style/layers/raster_layer.hpp
 create mode 100644 include/mbgl/style/layers/symbol_layer.hpp
 delete mode 100644 include/mbgl/style/property_transition.hpp
 create mode 100644 include/mbgl/style/property_value.hpp
 create mode 100644 include/mbgl/style/transition_options.hpp
 create mode 100644 include/mbgl/util/color.hpp
 create mode 100644 include/mbgl/util/font_stack.hpp

(limited to 'include')

diff --git a/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp
index 8b0c3026a8..6cb26e6a82 100644
--- a/include/mbgl/annotation/annotation.hpp
+++ b/include/mbgl/annotation/annotation.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include <mbgl/style/types.hpp>
-
 #include <mbgl/util/geometry.hpp>
 #include <mbgl/util/variant.hpp>
+#include <mbgl/util/color.hpp>
 
 #include <cstdint>
 #include <vector>
diff --git a/include/mbgl/layer/background_layer.hpp b/include/mbgl/layer/background_layer.hpp
deleted file mode 100644
index bba16d3839..0000000000
--- a/include/mbgl/layer/background_layer.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// This file is generated. Do not edit.
-
-#pragma once
-
-#include <mbgl/style/layer.hpp>
-#include <mbgl/style/filter.hpp>
-#include <mbgl/style/property_value.hpp>
-
-namespace mbgl {
-
-class BackgroundLayer : public Layer {
-public:
-    BackgroundLayer(const std::string& layerID);
-    ~BackgroundLayer() final;
-
-    // Paint properties
-
-    PropertyValue<Color> getBackgroundColor() const;
-    void setBackgroundColor(PropertyValue<Color>);
-
-    PropertyValue<std::string> getBackgroundPattern() const;
-    void setBackgroundPattern(PropertyValue<std::string>);
-
-    PropertyValue<float> getBackgroundOpacity() const;
-    void setBackgroundOpacity(PropertyValue<float>);
-
-    // Private implementation
-
-    class Impl;
-    Impl* const impl;
-
-    BackgroundLayer(const Impl&);
-    BackgroundLayer(const BackgroundLayer&) = delete;
-};
-
-template <>
-inline bool Layer::is<BackgroundLayer>() const {
-    return type == Type::Background;
-}
-
-} // namespace mbgl
diff --git a/include/mbgl/layer/circle_layer.hpp b/include/mbgl/layer/circle_layer.hpp
deleted file mode 100644
index 81f84d36a8..0000000000
--- a/include/mbgl/layer/circle_layer.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// This file is generated. Do not edit.
-
-#pragma once
-
-#include <mbgl/style/layer.hpp>
-#include <mbgl/style/filter.hpp>
-#include <mbgl/style/property_value.hpp>
-
-namespace mbgl {
-
-class CircleLayer : public Layer {
-public:
-    CircleLayer(const std::string& layerID);
-    ~CircleLayer() final;
-
-    // Source
-
-    void setSource(const std::string& sourceID, const std::string& sourceLayer);
-    const std::string& getSourceID() const;
-    const std::string& getSourceLayer() const;
-
-    void setFilter(const Filter&);
-    const Filter& getFilter() const;
-
-    // Paint properties
-
-    PropertyValue<float> getCircleRadius() const;
-    void setCircleRadius(PropertyValue<float>);
-
-    PropertyValue<Color> getCircleColor() const;
-    void setCircleColor(PropertyValue<Color>);
-
-    PropertyValue<float> getCircleBlur() const;
-    void setCircleBlur(PropertyValue<float>);
-
-    PropertyValue<float> getCircleOpacity() const;
-    void setCircleOpacity(PropertyValue<float>);
-
-    PropertyValue<std::array<float, 2>> getCircleTranslate() const;
-    void setCircleTranslate(PropertyValue<std::array<float, 2>>);
-
-    PropertyValue<TranslateAnchorType> getCircleTranslateAnchor() const;
-    void setCircleTranslateAnchor(PropertyValue<TranslateAnchorType>);
-
-    // Private implementation
-
-    class Impl;
-    Impl* const impl;
-
-    CircleLayer(const Impl&);
-    CircleLayer(const CircleLayer&) = delete;
-};
-
-template <>
-inline bool Layer::is<CircleLayer>() const {
-    return type == Type::Circle;
-}
-
-} // namespace mbgl
diff --git a/include/mbgl/layer/custom_layer.hpp b/include/mbgl/layer/custom_layer.hpp
deleted file mode 100644
index 9782d9593f..0000000000
--- a/include/mbgl/layer/custom_layer.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#pragma once
-
-#include <mbgl/style/layer.hpp>
-
-namespace mbgl {
-
-/**
- * Initialize any GL state needed by the custom layer. This method is called once, from the
- * rendering thread, at a point when the GL context is active but before rendering for the
- * first time.
- *
- * Resources that are acquired in this method must be released in the UninitializeFunction.
- */
-using CustomLayerInitializeFunction = void (*)(void* context);
-
-/**
- * Parameters that define the current camera position for a CustomLayerRenderFunction.
- */
-struct CustomLayerRenderParameters {
-    double width;
-    double height;
-    double latitude;
-    double longitude;
-    double zoom;
-    double bearing;
-    double pitch;
-    double altitude;
-};
-
-/**
- * Render the layer. This method is called once per frame. The implementation should not make
- * any assumptions about the GL state (other than that the correct context is active). It may
- * make changes to the state, and is not required to reset values such as the depth mask, stencil
- * mask, and corresponding test flags to their original values.
- */
-using CustomLayerRenderFunction = void (*)(void* context, const CustomLayerRenderParameters&);
-
-/**
- * Destroy any GL state needed by the custom layer, and deallocate context, if necessary. This
- * method is called once, from the rendering thread, at a point when the GL context is active.
- *
- * Note that it may be called even when the InitializeFunction has not been called.
- */
-using CustomLayerDeinitializeFunction = void (*)(void* context);
-
-class CustomLayer : public Layer {
-public:
-    CustomLayer(const std::string& id,
-                CustomLayerInitializeFunction,
-                CustomLayerRenderFunction,
-                CustomLayerDeinitializeFunction,
-                void* context);
-    ~CustomLayer() final;
-
-    // Private implementation
-
-    class Impl;
-    Impl* impl;
-
-    CustomLayer(const Impl&);
-    CustomLayer(const CustomLayer&) = delete;
-};
-
-template <>
-inline bool Layer::is<CustomLayer>() const {
-    return type == Type::Custom;
-}
-
-} // namespace mbgl
diff --git a/include/mbgl/layer/fill_layer.hpp b/include/mbgl/layer/fill_layer.hpp
deleted file mode 100644
index 10cf4f3bbd..0000000000
--- a/include/mbgl/layer/fill_layer.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// This file is generated. Do not edit.
-
-#pragma once
-
-#include <mbgl/style/layer.hpp>
-#include <mbgl/style/filter.hpp>
-#include <mbgl/style/property_value.hpp>
-
-namespace mbgl {
-
-class FillLayer : public Layer {
-public:
-    FillLayer(const std::string& layerID);
-    ~FillLayer() final;
-
-    // Source
-
-    void setSource(const std::string& sourceID, const std::string& sourceLayer);
-    const std::string& getSourceID() const;
-    const std::string& getSourceLayer() const;
-
-    void setFilter(const Filter&);
-    const Filter& getFilter() const;
-
-    // Paint properties
-
-    PropertyValue<bool> getFillAntialias() const;
-    void setFillAntialias(PropertyValue<bool>);
-
-    PropertyValue<float> getFillOpacity() const;
-    void setFillOpacity(PropertyValue<float>);
-
-    PropertyValue<Color> getFillColor() const;
-    void setFillColor(PropertyValue<Color>);
-
-    PropertyValue<Color> getFillOutlineColor() const;
-    void setFillOutlineColor(PropertyValue<Color>);
-
-    PropertyValue<std::array<float, 2>> getFillTranslate() const;
-    void setFillTranslate(PropertyValue<std::array<float, 2>>);
-
-    PropertyValue<TranslateAnchorType> getFillTranslateAnchor() const;
-    void setFillTranslateAnchor(PropertyValue<TranslateAnchorType>);
-
-    PropertyValue<std::string> getFillPattern() const;
-    void setFillPattern(PropertyValue<std::string>);
-
-    // Private implementation
-
-    class Impl;
-    Impl* const impl;
-
-    FillLayer(const Impl&);
-    FillLayer(const FillLayer&) = delete;
-};
-
-template <>
-inline bool Layer::is<FillLayer>() const {
-    return type == Type::Fill;
-}
-
-} // namespace mbgl
diff --git a/include/mbgl/layer/line_layer.hpp b/include/mbgl/layer/line_layer.hpp
deleted file mode 100644
index aeec363281..0000000000
--- a/include/mbgl/layer/line_layer.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// This file is generated. Do not edit.
-
-#pragma once
-
-#include <mbgl/style/layer.hpp>
-#include <mbgl/style/filter.hpp>
-#include <mbgl/style/property_value.hpp>
-
-#include <vector>
-
-namespace mbgl {
-
-class LineLayer : public Layer {
-public:
-    LineLayer(const std::string& layerID);
-    ~LineLayer() final;
-
-    // Source
-
-    void setSource(const std::string& sourceID, const std::string& sourceLayer);
-    const std::string& getSourceID() const;
-    const std::string& getSourceLayer() const;
-
-    void setFilter(const Filter&);
-    const Filter& getFilter() const;
-
-    // Layout properties
-
-    PropertyValue<LineCapType> getLineCap() const;
-    void setLineCap(PropertyValue<LineCapType>);
-
-    PropertyValue<LineJoinType> getLineJoin() const;
-    void setLineJoin(PropertyValue<LineJoinType>);
-
-    PropertyValue<float> getLineMiterLimit() const;
-    void setLineMiterLimit(PropertyValue<float>);
-
-    PropertyValue<float> getLineRoundLimit() const;
-    void setLineRoundLimit(PropertyValue<float>);
-
-    // Paint properties
-
-    PropertyValue<float> getLineOpacity() const;
-    void setLineOpacity(PropertyValue<float>);
-
-    PropertyValue<Color> getLineColor() const;
-    void setLineColor(PropertyValue<Color>);
-
-    PropertyValue<std::array<float, 2>> getLineTranslate() const;
-    void setLineTranslate(PropertyValue<std::array<float, 2>>);
-
-    PropertyValue<TranslateAnchorType> getLineTranslateAnchor() const;
-    void setLineTranslateAnchor(PropertyValue<TranslateAnchorType>);
-
-    PropertyValue<float> getLineWidth() const;
-    void setLineWidth(PropertyValue<float>);
-
-    PropertyValue<float> getLineGapWidth() const;
-    void setLineGapWidth(PropertyValue<float>);
-
-    PropertyValue<float> getLineOffset() const;
-    void setLineOffset(PropertyValue<float>);
-
-    PropertyValue<float> getLineBlur() const;
-    void setLineBlur(PropertyValue<float>);
-
-    PropertyValue<std::vector<float>> getLineDasharray() const;
-    void setLineDasharray(PropertyValue<std::vector<float>>);
-
-    PropertyValue<std::string> getLinePattern() const;
-    void setLinePattern(PropertyValue<std::string>);
-
-    // Private implementation
-
-    class Impl;
-    Impl* const impl;
-
-    LineLayer(const Impl&);
-    LineLayer(const LineLayer&) = delete;
-};
-
-template <>
-inline bool Layer::is<LineLayer>() const {
-    return type == Type::Line;
-}
-
-} // namespace mbgl
diff --git a/include/mbgl/layer/raster_layer.hpp b/include/mbgl/layer/raster_layer.hpp
deleted file mode 100644
index 7dc2532a2f..0000000000
--- a/include/mbgl/layer/raster_layer.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// This file is generated. Do not edit.
-
-#pragma once
-
-#include <mbgl/style/layer.hpp>
-#include <mbgl/style/filter.hpp>
-#include <mbgl/style/property_value.hpp>
-
-namespace mbgl {
-
-class RasterLayer : public Layer {
-public:
-    RasterLayer(const std::string& layerID);
-    ~RasterLayer() final;
-
-    // Source
-
-    void setSource(const std::string& sourceID);
-    const std::string& getSourceID() const;
-
-    // Paint properties
-
-    PropertyValue<float> getRasterOpacity() const;
-    void setRasterOpacity(PropertyValue<float>);
-
-    PropertyValue<float> getRasterHueRotate() const;
-    void setRasterHueRotate(PropertyValue<float>);
-
-    PropertyValue<float> getRasterBrightnessMin() const;
-    void setRasterBrightnessMin(PropertyValue<float>);
-
-    PropertyValue<float> getRasterBrightnessMax() const;
-    void setRasterBrightnessMax(PropertyValue<float>);
-
-    PropertyValue<float> getRasterSaturation() const;
-    void setRasterSaturation(PropertyValue<float>);
-
-    PropertyValue<float> getRasterContrast() const;
-    void setRasterContrast(PropertyValue<float>);
-
-    PropertyValue<float> getRasterFadeDuration() const;
-    void setRasterFadeDuration(PropertyValue<float>);
-
-    // Private implementation
-
-    class Impl;
-    Impl* const impl;
-
-    RasterLayer(const Impl&);
-    RasterLayer(const RasterLayer&) = delete;
-};
-
-template <>
-inline bool Layer::is<RasterLayer>() const {
-    return type == Type::Raster;
-}
-
-} // namespace mbgl
diff --git a/include/mbgl/layer/symbol_layer.hpp b/include/mbgl/layer/symbol_layer.hpp
deleted file mode 100644
index 006506b3d8..0000000000
--- a/include/mbgl/layer/symbol_layer.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-// This file is generated. Do not edit.
-
-#pragma once
-
-#include <mbgl/style/layer.hpp>
-#include <mbgl/style/filter.hpp>
-#include <mbgl/style/property_value.hpp>
-
-#include <vector>
-
-namespace mbgl {
-
-class SymbolLayer : public Layer {
-public:
-    SymbolLayer(const std::string& layerID);
-    ~SymbolLayer() final;
-
-    // Source
-
-    void setSource(const std::string& sourceID, const std::string& sourceLayer);
-    const std::string& getSourceID() const;
-    const std::string& getSourceLayer() const;
-
-    void setFilter(const Filter&);
-    const Filter& getFilter() const;
-
-    // Layout properties
-
-    PropertyValue<SymbolPlacementType> getSymbolPlacement() const;
-    void setSymbolPlacement(PropertyValue<SymbolPlacementType>);
-
-    PropertyValue<float> getSymbolSpacing() const;
-    void setSymbolSpacing(PropertyValue<float>);
-
-    PropertyValue<bool> getSymbolAvoidEdges() const;
-    void setSymbolAvoidEdges(PropertyValue<bool>);
-
-    PropertyValue<bool> getIconAllowOverlap() const;
-    void setIconAllowOverlap(PropertyValue<bool>);
-
-    PropertyValue<bool> getIconIgnorePlacement() const;
-    void setIconIgnorePlacement(PropertyValue<bool>);
-
-    PropertyValue<bool> getIconOptional() const;
-    void setIconOptional(PropertyValue<bool>);
-
-    PropertyValue<RotationAlignmentType> getIconRotationAlignment() const;
-    void setIconRotationAlignment(PropertyValue<RotationAlignmentType>);
-
-    PropertyValue<float> getIconSize() const;
-    void setIconSize(PropertyValue<float>);
-
-    PropertyValue<std::string> getIconImage() const;
-    void setIconImage(PropertyValue<std::string>);
-
-    PropertyValue<float> getIconRotate() const;
-    void setIconRotate(PropertyValue<float>);
-
-    PropertyValue<float> getIconPadding() const;
-    void setIconPadding(PropertyValue<float>);
-
-    PropertyValue<bool> getIconKeepUpright() const;
-    void setIconKeepUpright(PropertyValue<bool>);
-
-    PropertyValue<std::array<float, 2>> getIconOffset() const;
-    void setIconOffset(PropertyValue<std::array<float, 2>>);
-
-    PropertyValue<RotationAlignmentType> getTextRotationAlignment() const;
-    void setTextRotationAlignment(PropertyValue<RotationAlignmentType>);
-
-    PropertyValue<std::string> getTextField() const;
-    void setTextField(PropertyValue<std::string>);
-
-    PropertyValue<std::vector<std::string>> getTextFont() const;
-    void setTextFont(PropertyValue<std::vector<std::string>>);
-
-    PropertyValue<float> getTextSize() const;
-    void setTextSize(PropertyValue<float>);
-
-    PropertyValue<float> getTextMaxWidth() const;
-    void setTextMaxWidth(PropertyValue<float>);
-
-    PropertyValue<float> getTextLineHeight() const;
-    void setTextLineHeight(PropertyValue<float>);
-
-    PropertyValue<float> getTextLetterSpacing() const;
-    void setTextLetterSpacing(PropertyValue<float>);
-
-    PropertyValue<TextJustifyType> getTextJustify() const;
-    void setTextJustify(PropertyValue<TextJustifyType>);
-
-    PropertyValue<TextAnchorType> getTextAnchor() const;
-    void setTextAnchor(PropertyValue<TextAnchorType>);
-
-    PropertyValue<float> getTextMaxAngle() const;
-    void setTextMaxAngle(PropertyValue<float>);
-
-    PropertyValue<float> getTextRotate() const;
-    void setTextRotate(PropertyValue<float>);
-
-    PropertyValue<float> getTextPadding() const;
-    void setTextPadding(PropertyValue<float>);
-
-    PropertyValue<bool> getTextKeepUpright() const;
-    void setTextKeepUpright(PropertyValue<bool>);
-
-    PropertyValue<TextTransformType> getTextTransform() const;
-    void setTextTransform(PropertyValue<TextTransformType>);
-
-    PropertyValue<std::array<float, 2>> getTextOffset() const;
-    void setTextOffset(PropertyValue<std::array<float, 2>>);
-
-    PropertyValue<bool> getTextAllowOverlap() const;
-    void setTextAllowOverlap(PropertyValue<bool>);
-
-    PropertyValue<bool> getTextIgnorePlacement() const;
-    void setTextIgnorePlacement(PropertyValue<bool>);
-
-    PropertyValue<bool> getTextOptional() const;
-    void setTextOptional(PropertyValue<bool>);
-
-    // Paint properties
-
-    PropertyValue<float> getIconOpacity() const;
-    void setIconOpacity(PropertyValue<float>);
-
-    PropertyValue<Color> getIconColor() const;
-    void setIconColor(PropertyValue<Color>);
-
-    PropertyValue<Color> getIconHaloColor() const;
-    void setIconHaloColor(PropertyValue<Color>);
-
-    PropertyValue<float> getIconHaloWidth() const;
-    void setIconHaloWidth(PropertyValue<float>);
-
-    PropertyValue<float> getIconHaloBlur() const;
-    void setIconHaloBlur(PropertyValue<float>);
-
-    PropertyValue<std::array<float, 2>> getIconTranslate() const;
-    void setIconTranslate(PropertyValue<std::array<float, 2>>);
-
-    PropertyValue<TranslateAnchorType> getIconTranslateAnchor() const;
-    void setIconTranslateAnchor(PropertyValue<TranslateAnchorType>);
-
-    PropertyValue<float> getTextOpacity() const;
-    void setTextOpacity(PropertyValue<float>);
-
-    PropertyValue<Color> getTextColor() const;
-    void setTextColor(PropertyValue<Color>);
-
-    PropertyValue<Color> getTextHaloColor() const;
-    void setTextHaloColor(PropertyValue<Color>);
-
-    PropertyValue<float> getTextHaloWidth() const;
-    void setTextHaloWidth(PropertyValue<float>);
-
-    PropertyValue<float> getTextHaloBlur() const;
-    void setTextHaloBlur(PropertyValue<float>);
-
-    PropertyValue<std::array<float, 2>> getTextTranslate() const;
-    void setTextTranslate(PropertyValue<std::array<float, 2>>);
-
-    PropertyValue<TranslateAnchorType> getTextTranslateAnchor() const;
-    void setTextTranslateAnchor(PropertyValue<TranslateAnchorType>);
-
-    // Private implementation
-
-    class Impl;
-    Impl* const impl;
-
-    SymbolLayer(const Impl&);
-    SymbolLayer(const SymbolLayer&) = delete;
-};
-
-template <>
-inline bool Layer::is<SymbolLayer>() const {
-    return type == Type::Symbol;
-}
-
-} // namespace mbgl
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index aadfdf9ada..b44b53ff99 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -9,7 +9,7 @@
 #include <mbgl/util/feature.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/annotation/annotation.hpp>
-#include <mbgl/style/property_transition.hpp>
+#include <mbgl/style/transition_options.hpp>
 
 #include <cstdint>
 #include <string>
@@ -22,10 +22,13 @@ namespace mbgl {
 class FileSource;
 class View;
 class SpriteImage;
-class Layer;
 struct CameraOptions;
 struct AnimationOptions;
 
+namespace style {
+class Layer;
+}
+
 class Map : private util::noncopyable {
 public:
     explicit Map(View&, FileSource&,
@@ -47,9 +50,9 @@ public:
     void update(Update update);
 
     // Styling
-    void addClass(const std::string&, const PropertyTransition& = {});
-    void removeClass(const std::string&, const PropertyTransition& = {});
-    void setClasses(const std::vector<std::string>&, const PropertyTransition& = {});
+    void addClass(const std::string&, const style::TransitionOptions& = {});
+    void removeClass(const std::string&, const style::TransitionOptions& = {});
+    void setClasses(const std::vector<std::string>&, const style::TransitionOptions& = {});
 
     bool hasClass(const std::string&) const;
     std::vector<std::string> getClasses() const;
@@ -146,7 +149,7 @@ public:
 
     AnnotationIDs getPointAnnotationsInBounds(const LatLngBounds&);
 
-    void addLayer(std::unique_ptr<Layer>, const optional<std::string>& beforeLayerID = {});
+    void addLayer(std::unique_ptr<style::Layer>, const optional<std::string>& beforeLayerID = {});
     void removeLayer(const std::string& layerID);
 
     // Feature queries
diff --git a/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp
index e0c5ba6247..990c8470bb 100644
--- a/include/mbgl/storage/offline.hpp
+++ b/include/mbgl/storage/offline.hpp
@@ -12,7 +12,7 @@
 namespace mbgl {
 
 class TileID;
-class SourceInfo;
+class Tileset;
 
 /*
  * An offline region defined by a style URL, geographic bounding box, zoom range, and
@@ -30,7 +30,7 @@ public:
     OfflineTilePyramidRegionDefinition(const std::string&, const LatLngBounds&, double, double, float);
 
     /* Private */
-    std::vector<CanonicalTileID> tileCover(SourceType, uint16_t tileSize, const SourceInfo&) const;
+    std::vector<CanonicalTileID> tileCover(SourceType, uint16_t tileSize, const Tileset&) const;
 
     const std::string styleURL;
     const LatLngBounds bounds;
diff --git a/include/mbgl/storage/resource.hpp b/include/mbgl/storage/resource.hpp
index 62ee549663..a75de380a1 100644
--- a/include/mbgl/storage/resource.hpp
+++ b/include/mbgl/storage/resource.hpp
@@ -2,7 +2,7 @@
 
 #include <mbgl/storage/response.hpp>
 #include <mbgl/util/optional.hpp>
-#include <mbgl/style/types.hpp>
+#include <mbgl/util/font_stack.hpp>
 
 #include <string>
 
diff --git a/include/mbgl/style/filter.hpp b/include/mbgl/style/filter.hpp
index 6ad6969fbf..9cf84f5e1d 100644
--- a/include/mbgl/style/filter.hpp
+++ b/include/mbgl/style/filter.hpp
@@ -7,6 +7,7 @@
 #include <vector>
 
 namespace mbgl {
+namespace style {
 
 typedef variant<
     class NullFilter,
@@ -100,4 +101,5 @@ public:
     std::string key;
 };
 
+} // namespace style
 } // namespace mbgl
diff --git a/include/mbgl/style/function.hpp b/include/mbgl/style/function.hpp
new file mode 100644
index 0000000000..da2659c76a
--- /dev/null
+++ b/include/mbgl/style/function.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <vector>
+#include <utility>
+
+namespace mbgl {
+namespace style {
+
+template <typename T>
+class Function {
+public:
+    using Stop = std::pair<float, T>;
+    using Stops = std::vector<Stop>;
+
+    explicit Function(const Stops& stops_, float base_)
+        : base(base_), stops(stops_) {}
+
+    float getBase() const { return base; }
+    const std::vector<std::pair<float, T>>& getStops() const { return stops; }
+
+private:
+    float base = 1;
+    std::vector<std::pair<float, T>> stops;
+};
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp
index 4a40cc0cff..1f4a6fdf35 100644
--- a/include/mbgl/style/layer.hpp
+++ b/include/mbgl/style/layer.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_LAYER
-#define MBGL_LAYER
+#pragma once
 
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/style/types.hpp>
@@ -7,6 +6,7 @@
 #include <memory>
 
 namespace mbgl {
+namespace style {
 
 /**
  * The runtime representation of a [layer](https://www.mapbox.com/mapbox-gl-style-spec/#layers) from the Mapbox Style
@@ -79,6 +79,5 @@ protected:
     Layer(Type, std::unique_ptr<Impl>);
 };
 
+} // namespace style
 } // namespace mbgl
-
-#endif
diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
new file mode 100644
index 0000000000..2eb84ee499
--- /dev/null
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -0,0 +1,45 @@
+// This file is generated. Do not edit.
+
+#pragma once
+
+#include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
+#include <mbgl/style/property_value.hpp>
+
+#include <mbgl/util/color.hpp>
+
+namespace mbgl {
+namespace style {
+
+class BackgroundLayer : public Layer {
+public:
+    BackgroundLayer(const std::string& layerID);
+    ~BackgroundLayer() final;
+
+    // Paint properties
+
+    PropertyValue<Color> getBackgroundColor() const;
+    void setBackgroundColor(PropertyValue<Color>);
+
+    PropertyValue<std::string> getBackgroundPattern() const;
+    void setBackgroundPattern(PropertyValue<std::string>);
+
+    PropertyValue<float> getBackgroundOpacity() const;
+    void setBackgroundOpacity(PropertyValue<float>);
+
+    // Private implementation
+
+    class Impl;
+    Impl* const impl;
+
+    BackgroundLayer(const Impl&);
+    BackgroundLayer(const BackgroundLayer&) = delete;
+};
+
+template <>
+inline bool Layer::is<BackgroundLayer>() const {
+    return type == Type::Background;
+}
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
new file mode 100644
index 0000000000..10d281b6ac
--- /dev/null
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -0,0 +1,63 @@
+// This file is generated. Do not edit.
+
+#pragma once
+
+#include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
+#include <mbgl/style/property_value.hpp>
+
+#include <mbgl/util/color.hpp>
+
+namespace mbgl {
+namespace style {
+
+class CircleLayer : public Layer {
+public:
+    CircleLayer(const std::string& layerID);
+    ~CircleLayer() final;
+
+    // Source
+
+    void setSource(const std::string& sourceID, const std::string& sourceLayer);
+    const std::string& getSourceID() const;
+    const std::string& getSourceLayer() const;
+
+    void setFilter(const Filter&);
+    const Filter& getFilter() const;
+
+    // Paint properties
+
+    PropertyValue<float> getCircleRadius() const;
+    void setCircleRadius(PropertyValue<float>);
+
+    PropertyValue<Color> getCircleColor() const;
+    void setCircleColor(PropertyValue<Color>);
+
+    PropertyValue<float> getCircleBlur() const;
+    void setCircleBlur(PropertyValue<float>);
+
+    PropertyValue<float> getCircleOpacity() const;
+    void setCircleOpacity(PropertyValue<float>);
+
+    PropertyValue<std::array<float, 2>> getCircleTranslate() const;
+    void setCircleTranslate(PropertyValue<std::array<float, 2>>);
+
+    PropertyValue<TranslateAnchorType> getCircleTranslateAnchor() const;
+    void setCircleTranslateAnchor(PropertyValue<TranslateAnchorType>);
+
+    // Private implementation
+
+    class Impl;
+    Impl* const impl;
+
+    CircleLayer(const Impl&);
+    CircleLayer(const CircleLayer&) = delete;
+};
+
+template <>
+inline bool Layer::is<CircleLayer>() const {
+    return type == Type::Circle;
+}
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/layers/custom_layer.hpp b/include/mbgl/style/layers/custom_layer.hpp
new file mode 100644
index 0000000000..d3867e2c4f
--- /dev/null
+++ b/include/mbgl/style/layers/custom_layer.hpp
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <mbgl/style/layer.hpp>
+
+namespace mbgl {
+namespace style {
+
+/**
+ * Initialize any GL state needed by the custom layer. This method is called once, from the
+ * rendering thread, at a point when the GL context is active but before rendering for the
+ * first time.
+ *
+ * Resources that are acquired in this method must be released in the UninitializeFunction.
+ */
+using CustomLayerInitializeFunction = void (*)(void* context);
+
+/**
+ * Parameters that define the current camera position for a CustomLayerRenderFunction.
+ */
+struct CustomLayerRenderParameters {
+    double width;
+    double height;
+    double latitude;
+    double longitude;
+    double zoom;
+    double bearing;
+    double pitch;
+    double altitude;
+};
+
+/**
+ * Render the layer. This method is called once per frame. The implementation should not make
+ * any assumptions about the GL state (other than that the correct context is active). It may
+ * make changes to the state, and is not required to reset values such as the depth mask, stencil
+ * mask, and corresponding test flags to their original values.
+ */
+using CustomLayerRenderFunction = void (*)(void* context, const CustomLayerRenderParameters&);
+
+/**
+ * Destroy any GL state needed by the custom layer, and deallocate context, if necessary. This
+ * method is called once, from the rendering thread, at a point when the GL context is active.
+ *
+ * Note that it may be called even when the InitializeFunction has not been called.
+ */
+using CustomLayerDeinitializeFunction = void (*)(void* context);
+
+class CustomLayer : public Layer {
+public:
+    CustomLayer(const std::string& id,
+                CustomLayerInitializeFunction,
+                CustomLayerRenderFunction,
+                CustomLayerDeinitializeFunction,
+                void* context);
+    ~CustomLayer() final;
+
+    // Private implementation
+
+    class Impl;
+    Impl* impl;
+
+    CustomLayer(const Impl&);
+    CustomLayer(const CustomLayer&) = delete;
+};
+
+template <>
+inline bool Layer::is<CustomLayer>() const {
+    return type == Type::Custom;
+}
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
new file mode 100644
index 0000000000..a14bf4a390
--- /dev/null
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -0,0 +1,66 @@
+// This file is generated. Do not edit.
+
+#pragma once
+
+#include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
+#include <mbgl/style/property_value.hpp>
+
+#include <mbgl/util/color.hpp>
+
+namespace mbgl {
+namespace style {
+
+class FillLayer : public Layer {
+public:
+    FillLayer(const std::string& layerID);
+    ~FillLayer() final;
+
+    // Source
+
+    void setSource(const std::string& sourceID, const std::string& sourceLayer);
+    const std::string& getSourceID() const;
+    const std::string& getSourceLayer() const;
+
+    void setFilter(const Filter&);
+    const Filter& getFilter() const;
+
+    // Paint properties
+
+    PropertyValue<bool> getFillAntialias() const;
+    void setFillAntialias(PropertyValue<bool>);
+
+    PropertyValue<float> getFillOpacity() const;
+    void setFillOpacity(PropertyValue<float>);
+
+    PropertyValue<Color> getFillColor() const;
+    void setFillColor(PropertyValue<Color>);
+
+    PropertyValue<Color> getFillOutlineColor() const;
+    void setFillOutlineColor(PropertyValue<Color>);
+
+    PropertyValue<std::array<float, 2>> getFillTranslate() const;
+    void setFillTranslate(PropertyValue<std::array<float, 2>>);
+
+    PropertyValue<TranslateAnchorType> getFillTranslateAnchor() const;
+    void setFillTranslateAnchor(PropertyValue<TranslateAnchorType>);
+
+    PropertyValue<std::string> getFillPattern() const;
+    void setFillPattern(PropertyValue<std::string>);
+
+    // Private implementation
+
+    class Impl;
+    Impl* const impl;
+
+    FillLayer(const Impl&);
+    FillLayer(const FillLayer&) = delete;
+};
+
+template <>
+inline bool Layer::is<FillLayer>() const {
+    return type == Type::Fill;
+}
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
new file mode 100644
index 0000000000..fb9e37811a
--- /dev/null
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -0,0 +1,91 @@
+// This file is generated. Do not edit.
+
+#pragma once
+
+#include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
+#include <mbgl/style/property_value.hpp>
+
+#include <mbgl/util/color.hpp>
+
+#include <vector>
+
+namespace mbgl {
+namespace style {
+
+class LineLayer : public Layer {
+public:
+    LineLayer(const std::string& layerID);
+    ~LineLayer() final;
+
+    // Source
+
+    void setSource(const std::string& sourceID, const std::string& sourceLayer);
+    const std::string& getSourceID() const;
+    const std::string& getSourceLayer() const;
+
+    void setFilter(const Filter&);
+    const Filter& getFilter() const;
+
+    // Layout properties
+
+    PropertyValue<LineCapType> getLineCap() const;
+    void setLineCap(PropertyValue<LineCapType>);
+
+    PropertyValue<LineJoinType> getLineJoin() const;
+    void setLineJoin(PropertyValue<LineJoinType>);
+
+    PropertyValue<float> getLineMiterLimit() const;
+    void setLineMiterLimit(PropertyValue<float>);
+
+    PropertyValue<float> getLineRoundLimit() const;
+    void setLineRoundLimit(PropertyValue<float>);
+
+    // Paint properties
+
+    PropertyValue<float> getLineOpacity() const;
+    void setLineOpacity(PropertyValue<float>);
+
+    PropertyValue<Color> getLineColor() const;
+    void setLineColor(PropertyValue<Color>);
+
+    PropertyValue<std::array<float, 2>> getLineTranslate() const;
+    void setLineTranslate(PropertyValue<std::array<float, 2>>);
+
+    PropertyValue<TranslateAnchorType> getLineTranslateAnchor() const;
+    void setLineTranslateAnchor(PropertyValue<TranslateAnchorType>);
+
+    PropertyValue<float> getLineWidth() const;
+    void setLineWidth(PropertyValue<float>);
+
+    PropertyValue<float> getLineGapWidth() const;
+    void setLineGapWidth(PropertyValue<float>);
+
+    PropertyValue<float> getLineOffset() const;
+    void setLineOffset(PropertyValue<float>);
+
+    PropertyValue<float> getLineBlur() const;
+    void setLineBlur(PropertyValue<float>);
+
+    PropertyValue<std::vector<float>> getLineDasharray() const;
+    void setLineDasharray(PropertyValue<std::vector<float>>);
+
+    PropertyValue<std::string> getLinePattern() const;
+    void setLinePattern(PropertyValue<std::string>);
+
+    // Private implementation
+
+    class Impl;
+    Impl* const impl;
+
+    LineLayer(const Impl&);
+    LineLayer(const LineLayer&) = delete;
+};
+
+template <>
+inline bool Layer::is<LineLayer>() const {
+    return type == Type::Line;
+}
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
new file mode 100644
index 0000000000..6d0c7dd91c
--- /dev/null
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -0,0 +1,62 @@
+// This file is generated. Do not edit.
+
+#pragma once
+
+#include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
+#include <mbgl/style/property_value.hpp>
+
+#include <mbgl/util/color.hpp>
+
+namespace mbgl {
+namespace style {
+
+class RasterLayer : public Layer {
+public:
+    RasterLayer(const std::string& layerID);
+    ~RasterLayer() final;
+
+    // Source
+
+    void setSource(const std::string& sourceID);
+    const std::string& getSourceID() const;
+
+    // Paint properties
+
+    PropertyValue<float> getRasterOpacity() const;
+    void setRasterOpacity(PropertyValue<float>);
+
+    PropertyValue<float> getRasterHueRotate() const;
+    void setRasterHueRotate(PropertyValue<float>);
+
+    PropertyValue<float> getRasterBrightnessMin() const;
+    void setRasterBrightnessMin(PropertyValue<float>);
+
+    PropertyValue<float> getRasterBrightnessMax() const;
+    void setRasterBrightnessMax(PropertyValue<float>);
+
+    PropertyValue<float> getRasterSaturation() const;
+    void setRasterSaturation(PropertyValue<float>);
+
+    PropertyValue<float> getRasterContrast() const;
+    void setRasterContrast(PropertyValue<float>);
+
+    PropertyValue<float> getRasterFadeDuration() const;
+    void setRasterFadeDuration(PropertyValue<float>);
+
+    // Private implementation
+
+    class Impl;
+    Impl* const impl;
+
+    RasterLayer(const Impl&);
+    RasterLayer(const RasterLayer&) = delete;
+};
+
+template <>
+inline bool Layer::is<RasterLayer>() const {
+    return type == Type::Raster;
+}
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
new file mode 100644
index 0000000000..3806310c95
--- /dev/null
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -0,0 +1,184 @@
+// This file is generated. Do not edit.
+
+#pragma once
+
+#include <mbgl/style/layer.hpp>
+#include <mbgl/style/filter.hpp>
+#include <mbgl/style/property_value.hpp>
+
+#include <mbgl/util/color.hpp>
+
+#include <vector>
+
+namespace mbgl {
+namespace style {
+
+class SymbolLayer : public Layer {
+public:
+    SymbolLayer(const std::string& layerID);
+    ~SymbolLayer() final;
+
+    // Source
+
+    void setSource(const std::string& sourceID, const std::string& sourceLayer);
+    const std::string& getSourceID() const;
+    const std::string& getSourceLayer() const;
+
+    void setFilter(const Filter&);
+    const Filter& getFilter() const;
+
+    // Layout properties
+
+    PropertyValue<SymbolPlacementType> getSymbolPlacement() const;
+    void setSymbolPlacement(PropertyValue<SymbolPlacementType>);
+
+    PropertyValue<float> getSymbolSpacing() const;
+    void setSymbolSpacing(PropertyValue<float>);
+
+    PropertyValue<bool> getSymbolAvoidEdges() const;
+    void setSymbolAvoidEdges(PropertyValue<bool>);
+
+    PropertyValue<bool> getIconAllowOverlap() const;
+    void setIconAllowOverlap(PropertyValue<bool>);
+
+    PropertyValue<bool> getIconIgnorePlacement() const;
+    void setIconIgnorePlacement(PropertyValue<bool>);
+
+    PropertyValue<bool> getIconOptional() const;
+    void setIconOptional(PropertyValue<bool>);
+
+    PropertyValue<RotationAlignmentType> getIconRotationAlignment() const;
+    void setIconRotationAlignment(PropertyValue<RotationAlignmentType>);
+
+    PropertyValue<float> getIconSize() const;
+    void setIconSize(PropertyValue<float>);
+
+    PropertyValue<std::string> getIconImage() const;
+    void setIconImage(PropertyValue<std::string>);
+
+    PropertyValue<float> getIconRotate() const;
+    void setIconRotate(PropertyValue<float>);
+
+    PropertyValue<float> getIconPadding() const;
+    void setIconPadding(PropertyValue<float>);
+
+    PropertyValue<bool> getIconKeepUpright() const;
+    void setIconKeepUpright(PropertyValue<bool>);
+
+    PropertyValue<std::array<float, 2>> getIconOffset() const;
+    void setIconOffset(PropertyValue<std::array<float, 2>>);
+
+    PropertyValue<RotationAlignmentType> getTextRotationAlignment() const;
+    void setTextRotationAlignment(PropertyValue<RotationAlignmentType>);
+
+    PropertyValue<std::string> getTextField() const;
+    void setTextField(PropertyValue<std::string>);
+
+    PropertyValue<std::vector<std::string>> getTextFont() const;
+    void setTextFont(PropertyValue<std::vector<std::string>>);
+
+    PropertyValue<float> getTextSize() const;
+    void setTextSize(PropertyValue<float>);
+
+    PropertyValue<float> getTextMaxWidth() const;
+    void setTextMaxWidth(PropertyValue<float>);
+
+    PropertyValue<float> getTextLineHeight() const;
+    void setTextLineHeight(PropertyValue<float>);
+
+    PropertyValue<float> getTextLetterSpacing() const;
+    void setTextLetterSpacing(PropertyValue<float>);
+
+    PropertyValue<TextJustifyType> getTextJustify() const;
+    void setTextJustify(PropertyValue<TextJustifyType>);
+
+    PropertyValue<TextAnchorType> getTextAnchor() const;
+    void setTextAnchor(PropertyValue<TextAnchorType>);
+
+    PropertyValue<float> getTextMaxAngle() const;
+    void setTextMaxAngle(PropertyValue<float>);
+
+    PropertyValue<float> getTextRotate() const;
+    void setTextRotate(PropertyValue<float>);
+
+    PropertyValue<float> getTextPadding() const;
+    void setTextPadding(PropertyValue<float>);
+
+    PropertyValue<bool> getTextKeepUpright() const;
+    void setTextKeepUpright(PropertyValue<bool>);
+
+    PropertyValue<TextTransformType> getTextTransform() const;
+    void setTextTransform(PropertyValue<TextTransformType>);
+
+    PropertyValue<std::array<float, 2>> getTextOffset() const;
+    void setTextOffset(PropertyValue<std::array<float, 2>>);
+
+    PropertyValue<bool> getTextAllowOverlap() const;
+    void setTextAllowOverlap(PropertyValue<bool>);
+
+    PropertyValue<bool> getTextIgnorePlacement() const;
+    void setTextIgnorePlacement(PropertyValue<bool>);
+
+    PropertyValue<bool> getTextOptional() const;
+    void setTextOptional(PropertyValue<bool>);
+
+    // Paint properties
+
+    PropertyValue<float> getIconOpacity() const;
+    void setIconOpacity(PropertyValue<float>);
+
+    PropertyValue<Color> getIconColor() const;
+    void setIconColor(PropertyValue<Color>);
+
+    PropertyValue<Color> getIconHaloColor() const;
+    void setIconHaloColor(PropertyValue<Color>);
+
+    PropertyValue<float> getIconHaloWidth() const;
+    void setIconHaloWidth(PropertyValue<float>);
+
+    PropertyValue<float> getIconHaloBlur() const;
+    void setIconHaloBlur(PropertyValue<float>);
+
+    PropertyValue<std::array<float, 2>> getIconTranslate() const;
+    void setIconTranslate(PropertyValue<std::array<float, 2>>);
+
+    PropertyValue<TranslateAnchorType> getIconTranslateAnchor() const;
+    void setIconTranslateAnchor(PropertyValue<TranslateAnchorType>);
+
+    PropertyValue<float> getTextOpacity() const;
+    void setTextOpacity(PropertyValue<float>);
+
+    PropertyValue<Color> getTextColor() const;
+    void setTextColor(PropertyValue<Color>);
+
+    PropertyValue<Color> getTextHaloColor() const;
+    void setTextHaloColor(PropertyValue<Color>);
+
+    PropertyValue<float> getTextHaloWidth() const;
+    void setTextHaloWidth(PropertyValue<float>);
+
+    PropertyValue<float> getTextHaloBlur() const;
+    void setTextHaloBlur(PropertyValue<float>);
+
+    PropertyValue<std::array<float, 2>> getTextTranslate() const;
+    void setTextTranslate(PropertyValue<std::array<float, 2>>);
+
+    PropertyValue<TranslateAnchorType> getTextTranslateAnchor() const;
+    void setTextTranslateAnchor(PropertyValue<TranslateAnchorType>);
+
+    // Private implementation
+
+    class Impl;
+    Impl* const impl;
+
+    SymbolLayer(const Impl&);
+    SymbolLayer(const SymbolLayer&) = delete;
+};
+
+template <>
+inline bool Layer::is<SymbolLayer>() const {
+    return type == Type::Symbol;
+}
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/property_transition.hpp b/include/mbgl/style/property_transition.hpp
deleted file mode 100644
index b9a301feea..0000000000
--- a/include/mbgl/style/property_transition.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <mbgl/util/chrono.hpp>
-#include <mbgl/util/optional.hpp>
-
-namespace mbgl {
-
-class PropertyTransition {
-public:
-    PropertyTransition(const optional<Duration>& duration_ = {}, const optional<Duration>& delay_ = {})
-        : duration(duration_), delay(delay_) {}
-
-    optional<Duration> duration;
-    optional<Duration> delay;
-};
-
-} // namespace mbgl
diff --git a/include/mbgl/style/property_value.hpp b/include/mbgl/style/property_value.hpp
new file mode 100644
index 0000000000..d8f83a0fb3
--- /dev/null
+++ b/include/mbgl/style/property_value.hpp
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <mbgl/util/variant.hpp>
+#include <mbgl/style/function.hpp>
+
+namespace mbgl {
+namespace style {
+
+class Undefined {};
+
+template <class T>
+class PropertyValue {
+private:
+    using Value = variant<Undefined, T, Function<T>>;
+    Value value;
+
+public:
+    PropertyValue()                     : value()         {}
+    PropertyValue(         T  constant) : value(constant) {}
+    PropertyValue(Function<T> function) : value(function) {}
+
+    bool isUndefined() const { return value.which() == 0; }
+    bool isConstant()  const { return value.which() == 1; }
+    bool isFunction()  const { return value.which() == 2; }
+
+    const          T & asConstant() const { return value.template get<         T >(); }
+    const Function<T>& asFunction() const { return value.template get<Function<T>>(); }
+
+    explicit operator bool() const { return !isUndefined(); };
+
+    template <typename Visitor>
+    static auto visit(const PropertyValue<T>& value, Visitor&& visitor) {
+        return Value::visit(value.value, visitor);
+    }
+};
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp
new file mode 100644
index 0000000000..87faff21f8
--- /dev/null
+++ b/include/mbgl/style/transition_options.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <mbgl/util/chrono.hpp>
+#include <mbgl/util/optional.hpp>
+
+namespace mbgl {
+namespace style {
+
+class TransitionOptions {
+public:
+    TransitionOptions(const optional<Duration>& duration_ = {}, const optional<Duration>& delay_ = {})
+        : duration(duration_), delay(delay_) {}
+
+    optional<Duration> duration;
+    optional<Duration> delay;
+};
+
+} // namespace style
+} // namespace mbgl
diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp
index 56f3570357..27b524a800 100644
--- a/include/mbgl/style/types.hpp
+++ b/include/mbgl/style/types.hpp
@@ -2,44 +2,9 @@
 
 #include <mbgl/util/enum.hpp>
 
-#include <string>
-#include <array>
-#include <vector>
-#include <utility>
-
 namespace mbgl {
 
-// Stores a premultiplied color, with all four channels ranging from 0..1
-using Color = std::array<float, 4>;
-
-// An array of font names
-using FontStack = std::vector<std::string>;
-
-std::string fontStackToString(const FontStack&);
-
-struct FontStackHash {
-    std::size_t operator()(const FontStack&) const;
-};
-
-template <typename T>
-class Function {
-public:
-    using Stop = std::pair<float, T>;
-    using Stops = std::vector<Stop>;
-
-    explicit Function(const Stops& stops_, float base_)
-        : base(base_), stops(stops_) {}
-
-    float getBase() const { return base; }
-    const std::vector<std::pair<float, T>>& getStops() const { return stops; }
-
-private:
-    float base = 1;
-    std::vector<std::pair<float, T>> stops;
-};
-
-// -------------------------------------------------------------------------------------------------
-
+// TODO: should be in public source.hpp header and style namespace
 enum class SourceType : uint8_t {
     Vector,
     Raster,
@@ -56,7 +21,7 @@ MBGL_DEFINE_ENUM_CLASS(SourceTypeClass, SourceType, {
     { SourceType::Annotations, "annotations" },
 });
 
-// -------------------------------------------------------------------------------------------------
+namespace style {
 
 enum class VisibilityType : bool {
     Visible,
@@ -122,5 +87,5 @@ enum class TextTransformType : uint8_t {
     Lowercase,
 };
 
+} // namespace style
 } // namespace mbgl
-
diff --git a/include/mbgl/util/color.hpp b/include/mbgl/util/color.hpp
new file mode 100644
index 0000000000..d7fe61c640
--- /dev/null
+++ b/include/mbgl/util/color.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <array>
+
+namespace mbgl {
+
+// Stores a premultiplied color, with all four channels ranging from 0..1
+using Color = std::array<float, 4>;
+
+} // namespace mbgl
diff --git a/include/mbgl/util/font_stack.hpp b/include/mbgl/util/font_stack.hpp
new file mode 100644
index 0000000000..d0b431e9ea
--- /dev/null
+++ b/include/mbgl/util/font_stack.hpp
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace mbgl {
+
+// An array of font names
+using FontStack = std::vector<std::string>;
+
+std::string fontStackToString(const FontStack&);
+
+struct FontStackHash {
+    std::size_t operator()(const FontStack&) const;
+};
+
+} // namespace mbgl
-- 
cgit v1.2.1