From 1733e29f0ac7ffe7c1aa5bf54d8f710befcdd2ea Mon Sep 17 00:00:00 2001
From: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>
Date: Thu, 26 Sep 2019 14:43:11 +0300
Subject: [core] Separate header for StyleProperty

---
 include/mbgl/style/layer.hpp          | 10 +---------
 include/mbgl/style/style_property.hpp | 20 ++++++++++++++++++++
 next/CMakeLists.txt                   |  1 +
 src/core-files.json                   |  1 +
 4 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 include/mbgl/style/style_property.hpp

diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp
index 11fd429be9..849cb436be 100644
--- a/include/mbgl/style/layer.hpp
+++ b/include/mbgl/style/layer.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <mbgl/style/conversion.hpp>
+#include <mbgl/style/style_property.hpp>
 #include <mbgl/style/types.hpp>
-#include <mbgl/util/feature.hpp>
 #include <mbgl/util/immutable.hpp>
 #include <mbgl/util/optional.hpp>
 
@@ -66,14 +66,6 @@ struct LayerTypeInfo {
     const enum class TileKind : uint8_t { Geometry, Raster, RasterDEM, NotRequired } tileKind;
 };
 
-struct StyleProperty {
-    enum class Kind : uint8_t { Undefined, Constant, Expression, Transition };
-    StyleProperty(Value value_, Kind kind_) : value(std::move(value_)), kind(kind_) {}
-    StyleProperty() = default;
-    const Value value;
-    const Kind kind = Kind::Undefined;
-};
-
 /**
  * The runtime representation of a [layer](https://www.mapbox.com/mapbox-gl-style-spec/#layers) from the Mapbox Style
  * Specification.
diff --git a/include/mbgl/style/style_property.hpp b/include/mbgl/style/style_property.hpp
new file mode 100644
index 0000000000..43787c7919
--- /dev/null
+++ b/include/mbgl/style/style_property.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <mbgl/util/feature.hpp>
+
+namespace mbgl {
+namespace style {
+
+/**
+ * @brief Generic representation of a style property.
+ */
+struct StyleProperty {
+    enum class Kind : uint8_t { Undefined, Constant, Expression, Transition };
+    StyleProperty(Value value_, Kind kind_) : value(std::move(value_)), kind(kind_) {}
+    StyleProperty() = default;
+    const Value value;
+    const Kind kind = Kind::Undefined;
+};
+
+} // namespace style
+} // namespace mbgl
diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt
index dbf6c11918..df56f04b22 100644
--- a/next/CMakeLists.txt
+++ b/next/CMakeLists.txt
@@ -189,6 +189,7 @@ add_library(
     ${MBGL_ROOT}/include/mbgl/style/sources/raster_source.hpp
     ${MBGL_ROOT}/include/mbgl/style/sources/vector_source.hpp
     ${MBGL_ROOT}/include/mbgl/style/style.hpp
+    ${MBGL_ROOT}/include/mbgl/style/style_property.hpp
     ${MBGL_ROOT}/include/mbgl/style/transition_options.hpp
     ${MBGL_ROOT}/include/mbgl/style/types.hpp
     ${MBGL_ROOT}/include/mbgl/style/undefined.hpp
diff --git a/src/core-files.json b/src/core-files.json
index a460ab86df..e5fa493312 100644
--- a/src/core-files.json
+++ b/src/core-files.json
@@ -452,6 +452,7 @@
         "mbgl/style/sources/raster_source.hpp": "include/mbgl/style/sources/raster_source.hpp",
         "mbgl/style/sources/vector_source.hpp": "include/mbgl/style/sources/vector_source.hpp",
         "mbgl/style/style.hpp": "include/mbgl/style/style.hpp",
+        "mbgl/style/style_property.hpp": "include/mbgl/style/style_property.hpp",
         "mbgl/style/transition_options.hpp": "include/mbgl/style/transition_options.hpp",
         "mbgl/style/types.hpp": "include/mbgl/style/types.hpp",
         "mbgl/style/undefined.hpp": "include/mbgl/style/undefined.hpp",
-- 
cgit v1.2.1