1 files changed, 32 insertions, 32 deletions

diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp
index 49ecf63c18..8c38ef5694 100644
--- a/src/mbgl/style/layers/line_layer.cpp
+++ b/src/mbgl/style/layers/line_layer.cpp
@@ -60,59 +60,59 @@ const Filter& LineLayer::getFilter() const {
 // Layout properties
 
 PropertyValue<LineCapType> LineLayer::getDefaultLineCap() {
-    return { LineCapType::Butt };
+    return LineCap::defaultValue();
 }
 
 PropertyValue<LineCapType> LineLayer::getLineCap() const {
-    return impl->layout.lineCap.get();
+    return impl->layout.unevaluated.get<LineCap>();
 }
 
 void LineLayer::setLineCap(PropertyValue<LineCapType> value) {
     if (value == getLineCap())
         return;
-    impl->layout.lineCap.set(value);
+    impl->layout.unevaluated.get<LineCap>() = value;
     impl->observer->onLayerLayoutPropertyChanged(*this, "line-cap");
 }
 PropertyValue<LineJoinType> LineLayer::getDefaultLineJoin() {
-    return { LineJoinType::Miter };
+    return LineJoin::defaultValue();
 }
 
 PropertyValue<LineJoinType> LineLayer::getLineJoin() const {
-    return impl->layout.lineJoin.get();
+    return impl->layout.unevaluated.get<LineJoin>();
 }
 
 void LineLayer::setLineJoin(PropertyValue<LineJoinType> value) {
     if (value == getLineJoin())
         return;
-    impl->layout.lineJoin.set(value);
+    impl->layout.unevaluated.get<LineJoin>() = value;
     impl->observer->onLayerLayoutPropertyChanged(*this, "line-join");
 }
 PropertyValue<float> LineLayer::getDefaultLineMiterLimit() {
-    return { 2 };
+    return LineMiterLimit::defaultValue();
 }
 
 PropertyValue<float> LineLayer::getLineMiterLimit() const {
-    return impl->layout.lineMiterLimit.get();
+    return impl->layout.unevaluated.get<LineMiterLimit>();
 }
 
 void LineLayer::setLineMiterLimit(PropertyValue<float> value) {
     if (value == getLineMiterLimit())
         return;
-    impl->layout.lineMiterLimit.set(value);
+    impl->layout.unevaluated.get<LineMiterLimit>() = value;
     impl->observer->onLayerLayoutPropertyChanged(*this, "line-miter-limit");
 }
 PropertyValue<float> LineLayer::getDefaultLineRoundLimit() {
-    return { 1 };
+    return LineRoundLimit::defaultValue();
 }
 
 PropertyValue<float> LineLayer::getLineRoundLimit() const {
-    return impl->layout.lineRoundLimit.get();
+    return impl->layout.unevaluated.get<LineRoundLimit>();
 }
 
 void LineLayer::setLineRoundLimit(PropertyValue<float> value) {
     if (value == getLineRoundLimit())
         return;
-    impl->layout.lineRoundLimit.set(value);
+    impl->layout.unevaluated.get<LineRoundLimit>() = value;
     impl->observer->onLayerLayoutPropertyChanged(*this, "line-round-limit");
 }
 
@@ -123,13 +123,13 @@ PropertyValue<float> LineLayer::getDefaultLineOpacity() {
 }
 
 PropertyValue<float> LineLayer::getLineOpacity(const optional<std::string>& klass) const {
-    return impl->paint.lineOpacity.get(klass);
+    return impl->paint.get<LineOpacity>(klass);
 }
 
 void LineLayer::setLineOpacity(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getLineOpacity(klass))
         return;
-    impl->paint.lineOpacity.set(value, klass);
+    impl->paint.set<LineOpacity>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }
 
@@ -138,13 +138,13 @@ PropertyValue<Color> LineLayer::getDefaultLineColor() {
 }
 
 PropertyValue<Color> LineLayer::getLineColor(const optional<std::string>& klass) const {
-    return impl->paint.lineColor.get(klass);
+    return impl->paint.get<LineColor>(klass);
 }
 
 void LineLayer::setLineColor(PropertyValue<Color> value, const optional<std::string>& klass) {
     if (value == getLineColor(klass))
         return;
-    impl->paint.lineColor.set(value, klass);
+    impl->paint.set<LineColor>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }
 
@@ -153,13 +153,13 @@ PropertyValue<std::array<float, 2>> LineLayer::getDefaultLineTranslate() {
 }
 
 PropertyValue<std::array<float, 2>> LineLayer::getLineTranslate(const optional<std::string>& klass) const {
-    return impl->paint.lineTranslate.get(klass);
+    return impl->paint.get<LineTranslate>(klass);
 }
 
 void LineLayer::setLineTranslate(PropertyValue<std::array<float, 2>> value, const optional<std::string>& klass) {
     if (value == getLineTranslate(klass))
         return;
-    impl->paint.lineTranslate.set(value, klass);
+    impl->paint.set<LineTranslate>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }
 
@@ -168,13 +168,13 @@ PropertyValue<TranslateAnchorType> LineLayer::getDefaultLineTranslateAnchor() {
 }
 
 PropertyValue<TranslateAnchorType> LineLayer::getLineTranslateAnchor(const optional<std::string>& klass) const {
-    return impl->paint.lineTranslateAnchor.get(klass);
+    return impl->paint.get<LineTranslateAnchor>(klass);
 }
 
 void LineLayer::setLineTranslateAnchor(PropertyValue<TranslateAnchorType> value, const optional<std::string>& klass) {
     if (value == getLineTranslateAnchor(klass))
         return;
-    impl->paint.lineTranslateAnchor.set(value, klass);
+    impl->paint.set<LineTranslateAnchor>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }
 
@@ -183,13 +183,13 @@ PropertyValue<float> LineLayer::getDefaultLineWidth() {
 }
 
 PropertyValue<float> LineLayer::getLineWidth(const optional<std::string>& klass) const {
-    return impl->paint.lineWidth.get(klass);
+    return impl->paint.get<LineWidth>(klass);
 }
 
 void LineLayer::setLineWidth(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getLineWidth(klass))
         return;
-    impl->paint.lineWidth.set(value, klass);
+    impl->paint.set<LineWidth>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }
 
@@ -198,13 +198,13 @@ PropertyValue<float> LineLayer::getDefaultLineGapWidth() {
 }
 
 PropertyValue<float> LineLayer::getLineGapWidth(const optional<std::string>& klass) const {
-    return impl->paint.lineGapWidth.get(klass);
+    return impl->paint.get<LineGapWidth>(klass);
 }
 
 void LineLayer::setLineGapWidth(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getLineGapWidth(klass))
         return;
-    impl->paint.lineGapWidth.set(value, klass);
+    impl->paint.set<LineGapWidth>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }
 
@@ -213,13 +213,13 @@ PropertyValue<float> LineLayer::getDefaultLineOffset() {
 }
 
 PropertyValue<float> LineLayer::getLineOffset(const optional<std::string>& klass) const {
-    return impl->paint.lineOffset.get(klass);
+    return impl->paint.get<LineOffset>(klass);
 }
 
 void LineLayer::setLineOffset(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getLineOffset(klass))
         return;
-    impl->paint.lineOffset.set(value, klass);
+    impl->paint.set<LineOffset>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }
 
@@ -228,13 +228,13 @@ PropertyValue<float> LineLayer::getDefaultLineBlur() {
 }
 
 PropertyValue<float> LineLayer::getLineBlur(const optional<std::string>& klass) const {
-    return impl->paint.lineBlur.get(klass);
+    return impl->paint.get<LineBlur>(klass);
 }
 
 void LineLayer::setLineBlur(PropertyValue<float> value, const optional<std::string>& klass) {
     if (value == getLineBlur(klass))
         return;
-    impl->paint.lineBlur.set(value, klass);
+    impl->paint.set<LineBlur>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }
 
@@ -243,13 +243,13 @@ PropertyValue<std::vector<float>> LineLayer::getDefaultLineDasharray() {
 }
 
 PropertyValue<std::vector<float>> LineLayer::getLineDasharray(const optional<std::string>& klass) const {
-    return impl->paint.lineDasharray.get(klass);
+    return impl->paint.get<LineDasharray>(klass);
 }
 
 void LineLayer::setLineDasharray(PropertyValue<std::vector<float>> value, const optional<std::string>& klass) {
     if (value == getLineDasharray(klass))
         return;
-    impl->paint.lineDasharray.set(value, klass);
+    impl->paint.set<LineDasharray>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }
 
@@ -258,13 +258,13 @@ PropertyValue<std::string> LineLayer::getDefaultLinePattern() {
 }
 
 PropertyValue<std::string> LineLayer::getLinePattern(const optional<std::string>& klass) const {
-    return impl->paint.linePattern.get(klass);
+    return impl->paint.get<LinePattern>(klass);
 }
 
 void LineLayer::setLinePattern(PropertyValue<std::string> value, const optional<std::string>& klass) {
     if (value == getLinePattern(klass))
         return;
-    impl->paint.linePattern.set(value, klass);
+    impl->paint.set<LinePattern>(value, klass);
     impl->observer->onLayerPaintPropertyChanged(*this);
 }