[core] Add missing classed paint property getter

7 files changed, 98 insertions, 98 deletions

diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp
index e5747e07ce..25de2a943e 100644
--- a/src/mbgl/style/layers/background_layer.cpp
+++ b/src/mbgl/style/layers/background_layer.cpp
@@ -41,8 +41,8 @@ PropertyValue<Color> BackgroundLayer::getDefaultBackgroundColor() {
     return { Color::black() };
 }
 
-PropertyValue<Color> BackgroundLayer::getBackgroundColor() const {
-    return impl->paint.backgroundColor.get();
+PropertyValue<Color> BackgroundLayer::getBackgroundColor(const optional<std::string>& klass) const {
+    return impl->paint.backgroundColor.get(klass);
 }
 
 void BackgroundLayer::setBackgroundColor(PropertyValue<Color> value, const optional<std::string>& klass) {
@@ -53,8 +53,8 @@ PropertyValue<std::string> BackgroundLayer::getDefaultBackgroundPattern() {
     return { "" };
 }
 
-PropertyValue<std::string> BackgroundLayer::getBackgroundPattern() const {
-    return impl->paint.backgroundPattern.get();
+PropertyValue<std::string> BackgroundLayer::getBackgroundPattern(const optional<std::string>& klass) const {
+    return impl->paint.backgroundPattern.get(klass);
 }
 
 void BackgroundLayer::setBackgroundPattern(PropertyValue<std::string> value, const optional<std::string>& klass) {
@@ -65,8 +65,8 @@ PropertyValue<float> BackgroundLayer::getDefaultBackgroundOpacity() {
     return { 1 };
 }
 
-PropertyValue<float> BackgroundLayer::getBackgroundOpacity() const {
-    return impl->paint.backgroundOpacity.get();
+PropertyValue<float> BackgroundLayer::getBackgroundOpacity(const optional<std::string>& klass) const {
+    return impl->paint.backgroundOpacity.get(klass);
 }
 
 void BackgroundLayer::setBackgroundOpacity(PropertyValue<float> value, const optional<std::string>& klass) {
diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp
index 271a573f0b..5fa29d9d37 100644
--- a/src/mbgl/style/layers/circle_layer.cpp
+++ b/src/mbgl/style/layers/circle_layer.cpp
@@ -65,8 +65,8 @@ PropertyValue<float> CircleLayer::getDefaultCircleRadius() {
     return { 5 };
 }
 
-PropertyValue<float> CircleLayer::getCircleRadius() const {
-    return impl->paint.circleRadius.get();
+PropertyValue<float> CircleLayer::getCircleRadius(const optional<std::string>& klass) const {
+    return impl->paint.circleRadius.get(klass);
 }
 
 void CircleLayer::setCircleRadius(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -77,8 +77,8 @@ PropertyValue<Color> CircleLayer::getDefaultCircleColor() {
     return { Color::black() };
 }
 
-PropertyValue<Color> CircleLayer::getCircleColor() const {
-    return impl->paint.circleColor.get();
+PropertyValue<Color> CircleLayer::getCircleColor(const optional<std::string>& klass) const {
+    return impl->paint.circleColor.get(klass);
 }
 
 void CircleLayer::setCircleColor(PropertyValue<Color> value, const optional<std::string>& klass) {
@@ -89,8 +89,8 @@ PropertyValue<float> CircleLayer::getDefaultCircleBlur() {
     return { 0 };
 }
 
-PropertyValue<float> CircleLayer::getCircleBlur() const {
-    return impl->paint.circleBlur.get();
+PropertyValue<float> CircleLayer::getCircleBlur(const optional<std::string>& klass) const {
+    return impl->paint.circleBlur.get(klass);
 }
 
 void CircleLayer::setCircleBlur(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -101,8 +101,8 @@ PropertyValue<float> CircleLayer::getDefaultCircleOpacity() {
     return { 1 };
 }
 
-PropertyValue<float> CircleLayer::getCircleOpacity() const {
-    return impl->paint.circleOpacity.get();
+PropertyValue<float> CircleLayer::getCircleOpacity(const optional<std::string>& klass) const {
+    return impl->paint.circleOpacity.get(klass);
 }
 
 void CircleLayer::setCircleOpacity(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -113,8 +113,8 @@ PropertyValue<std::array<float, 2>> CircleLayer::getDefaultCircleTranslate() {
     return { {{ 0, 0 }} };
 }
 
-PropertyValue<std::array<float, 2>> CircleLayer::getCircleTranslate() const {
-    return impl->paint.circleTranslate.get();
+PropertyValue<std::array<float, 2>> CircleLayer::getCircleTranslate(const optional<std::string>& klass) const {
+    return impl->paint.circleTranslate.get(klass);
 }
 
 void CircleLayer::setCircleTranslate(PropertyValue<std::array<float, 2>> value, const optional<std::string>& klass) {
@@ -125,8 +125,8 @@ PropertyValue<TranslateAnchorType> CircleLayer::getDefaultCircleTranslateAnchor(
     return { TranslateAnchorType::Map };
 }
 
-PropertyValue<TranslateAnchorType> CircleLayer::getCircleTranslateAnchor() const {
-    return impl->paint.circleTranslateAnchor.get();
+PropertyValue<TranslateAnchorType> CircleLayer::getCircleTranslateAnchor(const optional<std::string>& klass) const {
+    return impl->paint.circleTranslateAnchor.get(klass);
 }
 
 void CircleLayer::setCircleTranslateAnchor(PropertyValue<TranslateAnchorType> value, const optional<std::string>& klass) {
@@ -137,8 +137,8 @@ PropertyValue<CirclePitchScaleType> CircleLayer::getDefaultCirclePitchScale() {
     return { CirclePitchScaleType::Map };
 }
 
-PropertyValue<CirclePitchScaleType> CircleLayer::getCirclePitchScale() const {
-    return impl->paint.circlePitchScale.get();
+PropertyValue<CirclePitchScaleType> CircleLayer::getCirclePitchScale(const optional<std::string>& klass) const {
+    return impl->paint.circlePitchScale.get(klass);
 }
 
 void CircleLayer::setCirclePitchScale(PropertyValue<CirclePitchScaleType> value, const optional<std::string>& klass) {
diff --git a/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp
index 36febd77e8..6bc4b892ef 100644
--- a/src/mbgl/style/layers/fill_layer.cpp
+++ b/src/mbgl/style/layers/fill_layer.cpp
@@ -65,8 +65,8 @@ PropertyValue<bool> FillLayer::getDefaultFillAntialias() {
     return { true };
 }
 
-PropertyValue<bool> FillLayer::getFillAntialias() const {
-    return impl->paint.fillAntialias.get();
+PropertyValue<bool> FillLayer::getFillAntialias(const optional<std::string>& klass) const {
+    return impl->paint.fillAntialias.get(klass);
 }
 
 void FillLayer::setFillAntialias(PropertyValue<bool> value, const optional<std::string>& klass) {
@@ -77,8 +77,8 @@ PropertyValue<float> FillLayer::getDefaultFillOpacity() {
     return { 1 };
 }
 
-PropertyValue<float> FillLayer::getFillOpacity() const {
-    return impl->paint.fillOpacity.get();
+PropertyValue<float> FillLayer::getFillOpacity(const optional<std::string>& klass) const {
+    return impl->paint.fillOpacity.get(klass);
 }
 
 void FillLayer::setFillOpacity(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -89,8 +89,8 @@ PropertyValue<Color> FillLayer::getDefaultFillColor() {
     return { Color::black() };
 }
 
-PropertyValue<Color> FillLayer::getFillColor() const {
-    return impl->paint.fillColor.get();
+PropertyValue<Color> FillLayer::getFillColor(const optional<std::string>& klass) const {
+    return impl->paint.fillColor.get(klass);
 }
 
 void FillLayer::setFillColor(PropertyValue<Color> value, const optional<std::string>& klass) {
@@ -101,8 +101,8 @@ PropertyValue<Color> FillLayer::getDefaultFillOutlineColor() {
     return { {} };
 }
 
-PropertyValue<Color> FillLayer::getFillOutlineColor() const {
-    return impl->paint.fillOutlineColor.get();
+PropertyValue<Color> FillLayer::getFillOutlineColor(const optional<std::string>& klass) const {
+    return impl->paint.fillOutlineColor.get(klass);
 }
 
 void FillLayer::setFillOutlineColor(PropertyValue<Color> value, const optional<std::string>& klass) {
@@ -113,8 +113,8 @@ PropertyValue<std::array<float, 2>> FillLayer::getDefaultFillTranslate() {
     return { {{ 0, 0 }} };
 }
 
-PropertyValue<std::array<float, 2>> FillLayer::getFillTranslate() const {
-    return impl->paint.fillTranslate.get();
+PropertyValue<std::array<float, 2>> FillLayer::getFillTranslate(const optional<std::string>& klass) const {
+    return impl->paint.fillTranslate.get(klass);
 }
 
 void FillLayer::setFillTranslate(PropertyValue<std::array<float, 2>> value, const optional<std::string>& klass) {
@@ -125,8 +125,8 @@ PropertyValue<TranslateAnchorType> FillLayer::getDefaultFillTranslateAnchor() {
     return { TranslateAnchorType::Map };
 }
 
-PropertyValue<TranslateAnchorType> FillLayer::getFillTranslateAnchor() const {
-    return impl->paint.fillTranslateAnchor.get();
+PropertyValue<TranslateAnchorType> FillLayer::getFillTranslateAnchor(const optional<std::string>& klass) const {
+    return impl->paint.fillTranslateAnchor.get(klass);
 }
 
 void FillLayer::setFillTranslateAnchor(PropertyValue<TranslateAnchorType> value, const optional<std::string>& klass) {
@@ -137,8 +137,8 @@ PropertyValue<std::string> FillLayer::getDefaultFillPattern() {
     return { "" };
 }
 
-PropertyValue<std::string> FillLayer::getFillPattern() const {
-    return impl->paint.fillPattern.get();
+PropertyValue<std::string> FillLayer::getFillPattern(const optional<std::string>& klass) const {
+    return impl->paint.fillPattern.get(klass);
 }
 
 void FillLayer::setFillPattern(PropertyValue<std::string> value, const optional<std::string>& klass) {
diff --git a/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs
index 16a137a008..75a8de8e77 100644
--- a/src/mbgl/style/layers/layer.cpp.ejs
+++ b/src/mbgl/style/layers/layer.cpp.ejs
@@ -95,8 +95,8 @@ PropertyValue<<%- propertyType(property) %>> <%- camelize(type) %>Layer::getDefa
     return { <%- defaultValue(property) %> };
 }
 
-PropertyValue<<%- propertyType(property) %>> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>() const {
-    return impl->paint.<%- camelizeWithLeadingLowercase(property.name) %>.get();
+PropertyValue<<%- propertyType(property) %>> <%- camelize(type) %>Layer::get<%- camelize(property.name) %>(const optional<std::string>& klass) const {
+    return impl->paint.<%- camelizeWithLeadingLowercase(property.name) %>.get(klass);
 }
 
 void <%- camelize(type) %>Layer::set<%- camelize(property.name) %>(PropertyValue<<%- propertyType(property) %>> value, const optional<std::string>& klass) {
diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp
index 1594985b6b..dbf4b682ba 100644
--- a/src/mbgl/style/layers/line_layer.cpp
+++ b/src/mbgl/style/layers/line_layer.cpp
@@ -109,8 +109,8 @@ PropertyValue<float> LineLayer::getDefaultLineOpacity() {
     return { 1 };
 }
 
-PropertyValue<float> LineLayer::getLineOpacity() const {
-    return impl->paint.lineOpacity.get();
+PropertyValue<float> LineLayer::getLineOpacity(const optional<std::string>& klass) const {
+    return impl->paint.lineOpacity.get(klass);
 }
 
 void LineLayer::setLineOpacity(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -121,8 +121,8 @@ PropertyValue<Color> LineLayer::getDefaultLineColor() {
     return { Color::black() };
 }
 
-PropertyValue<Color> LineLayer::getLineColor() const {
-    return impl->paint.lineColor.get();
+PropertyValue<Color> LineLayer::getLineColor(const optional<std::string>& klass) const {
+    return impl->paint.lineColor.get(klass);
 }
 
 void LineLayer::setLineColor(PropertyValue<Color> value, const optional<std::string>& klass) {
@@ -133,8 +133,8 @@ PropertyValue<std::array<float, 2>> LineLayer::getDefaultLineTranslate() {
     return { {{ 0, 0 }} };
 }
 
-PropertyValue<std::array<float, 2>> LineLayer::getLineTranslate() const {
-    return impl->paint.lineTranslate.get();
+PropertyValue<std::array<float, 2>> LineLayer::getLineTranslate(const optional<std::string>& klass) const {
+    return impl->paint.lineTranslate.get(klass);
 }
 
 void LineLayer::setLineTranslate(PropertyValue<std::array<float, 2>> value, const optional<std::string>& klass) {
@@ -145,8 +145,8 @@ PropertyValue<TranslateAnchorType> LineLayer::getDefaultLineTranslateAnchor() {
     return { TranslateAnchorType::Map };
 }
 
-PropertyValue<TranslateAnchorType> LineLayer::getLineTranslateAnchor() const {
-    return impl->paint.lineTranslateAnchor.get();
+PropertyValue<TranslateAnchorType> LineLayer::getLineTranslateAnchor(const optional<std::string>& klass) const {
+    return impl->paint.lineTranslateAnchor.get(klass);
 }
 
 void LineLayer::setLineTranslateAnchor(PropertyValue<TranslateAnchorType> value, const optional<std::string>& klass) {
@@ -157,8 +157,8 @@ PropertyValue<float> LineLayer::getDefaultLineWidth() {
     return { 1 };
 }
 
-PropertyValue<float> LineLayer::getLineWidth() const {
-    return impl->paint.lineWidth.get();
+PropertyValue<float> LineLayer::getLineWidth(const optional<std::string>& klass) const {
+    return impl->paint.lineWidth.get(klass);
 }
 
 void LineLayer::setLineWidth(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -169,8 +169,8 @@ PropertyValue<float> LineLayer::getDefaultLineGapWidth() {
     return { 0 };
 }
 
-PropertyValue<float> LineLayer::getLineGapWidth() const {
-    return impl->paint.lineGapWidth.get();
+PropertyValue<float> LineLayer::getLineGapWidth(const optional<std::string>& klass) const {
+    return impl->paint.lineGapWidth.get(klass);
 }
 
 void LineLayer::setLineGapWidth(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -181,8 +181,8 @@ PropertyValue<float> LineLayer::getDefaultLineOffset() {
     return { 0 };
 }
 
-PropertyValue<float> LineLayer::getLineOffset() const {
-    return impl->paint.lineOffset.get();
+PropertyValue<float> LineLayer::getLineOffset(const optional<std::string>& klass) const {
+    return impl->paint.lineOffset.get(klass);
 }
 
 void LineLayer::setLineOffset(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -193,8 +193,8 @@ PropertyValue<float> LineLayer::getDefaultLineBlur() {
     return { 0 };
 }
 
-PropertyValue<float> LineLayer::getLineBlur() const {
-    return impl->paint.lineBlur.get();
+PropertyValue<float> LineLayer::getLineBlur(const optional<std::string>& klass) const {
+    return impl->paint.lineBlur.get(klass);
 }
 
 void LineLayer::setLineBlur(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -205,8 +205,8 @@ PropertyValue<std::vector<float>> LineLayer::getDefaultLineDasharray() {
     return { {  } };
 }
 
-PropertyValue<std::vector<float>> LineLayer::getLineDasharray() const {
-    return impl->paint.lineDasharray.get();
+PropertyValue<std::vector<float>> LineLayer::getLineDasharray(const optional<std::string>& klass) const {
+    return impl->paint.lineDasharray.get(klass);
 }
 
 void LineLayer::setLineDasharray(PropertyValue<std::vector<float>> value, const optional<std::string>& klass) {
@@ -217,8 +217,8 @@ PropertyValue<std::string> LineLayer::getDefaultLinePattern() {
     return { "" };
 }
 
-PropertyValue<std::string> LineLayer::getLinePattern() const {
-    return impl->paint.linePattern.get();
+PropertyValue<std::string> LineLayer::getLinePattern(const optional<std::string>& klass) const {
+    return impl->paint.linePattern.get(klass);
 }
 
 void LineLayer::setLinePattern(PropertyValue<std::string> value, const optional<std::string>& klass) {
diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp
index fc966f2239..084b29ee33 100644
--- a/src/mbgl/style/layers/raster_layer.cpp
+++ b/src/mbgl/style/layers/raster_layer.cpp
@@ -48,8 +48,8 @@ PropertyValue<float> RasterLayer::getDefaultRasterOpacity() {
     return { 1 };
 }
 
-PropertyValue<float> RasterLayer::getRasterOpacity() const {
-    return impl->paint.rasterOpacity.get();
+PropertyValue<float> RasterLayer::getRasterOpacity(const optional<std::string>& klass) const {
+    return impl->paint.rasterOpacity.get(klass);
 }
 
 void RasterLayer::setRasterOpacity(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -60,8 +60,8 @@ PropertyValue<float> RasterLayer::getDefaultRasterHueRotate() {
     return { 0 };
 }
 
-PropertyValue<float> RasterLayer::getRasterHueRotate() const {
-    return impl->paint.rasterHueRotate.get();
+PropertyValue<float> RasterLayer::getRasterHueRotate(const optional<std::string>& klass) const {
+    return impl->paint.rasterHueRotate.get(klass);
 }
 
 void RasterLayer::setRasterHueRotate(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -72,8 +72,8 @@ PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMin() {
     return { 0 };
 }
 
-PropertyValue<float> RasterLayer::getRasterBrightnessMin() const {
-    return impl->paint.rasterBrightnessMin.get();
+PropertyValue<float> RasterLayer::getRasterBrightnessMin(const optional<std::string>& klass) const {
+    return impl->paint.rasterBrightnessMin.get(klass);
 }
 
 void RasterLayer::setRasterBrightnessMin(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -84,8 +84,8 @@ PropertyValue<float> RasterLayer::getDefaultRasterBrightnessMax() {
     return { 1 };
 }
 
-PropertyValue<float> RasterLayer::getRasterBrightnessMax() const {
-    return impl->paint.rasterBrightnessMax.get();
+PropertyValue<float> RasterLayer::getRasterBrightnessMax(const optional<std::string>& klass) const {
+    return impl->paint.rasterBrightnessMax.get(klass);
 }
 
 void RasterLayer::setRasterBrightnessMax(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -96,8 +96,8 @@ PropertyValue<float> RasterLayer::getDefaultRasterSaturation() {
     return { 0 };
 }
 
-PropertyValue<float> RasterLayer::getRasterSaturation() const {
-    return impl->paint.rasterSaturation.get();
+PropertyValue<float> RasterLayer::getRasterSaturation(const optional<std::string>& klass) const {
+    return impl->paint.rasterSaturation.get(klass);
 }
 
 void RasterLayer::setRasterSaturation(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -108,8 +108,8 @@ PropertyValue<float> RasterLayer::getDefaultRasterContrast() {
     return { 0 };
 }
 
-PropertyValue<float> RasterLayer::getRasterContrast() const {
-    return impl->paint.rasterContrast.get();
+PropertyValue<float> RasterLayer::getRasterContrast(const optional<std::string>& klass) const {
+    return impl->paint.rasterContrast.get(klass);
 }
 
 void RasterLayer::setRasterContrast(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -120,8 +120,8 @@ PropertyValue<float> RasterLayer::getDefaultRasterFadeDuration() {
     return { 300 };
 }
 
-PropertyValue<float> RasterLayer::getRasterFadeDuration() const {
-    return impl->paint.rasterFadeDuration.get();
+PropertyValue<float> RasterLayer::getRasterFadeDuration(const optional<std::string>& klass) const {
+    return impl->paint.rasterFadeDuration.get(klass);
 }
 
 void RasterLayer::setRasterFadeDuration(PropertyValue<float> value, const optional<std::string>& klass) {
diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp
index 7852969f7b..78fbfda6dd 100644
--- a/src/mbgl/style/layers/symbol_layer.cpp
+++ b/src/mbgl/style/layers/symbol_layer.cpp
@@ -439,8 +439,8 @@ PropertyValue<float> SymbolLayer::getDefaultIconOpacity() {
     return { 1 };
 }
 
-PropertyValue<float> SymbolLayer::getIconOpacity() const {
-    return impl->paint.iconOpacity.get();
+PropertyValue<float> SymbolLayer::getIconOpacity(const optional<std::string>& klass) const {
+    return impl->paint.iconOpacity.get(klass);
 }
 
 void SymbolLayer::setIconOpacity(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -451,8 +451,8 @@ PropertyValue<Color> SymbolLayer::getDefaultIconColor() {
     return { Color::black() };
 }
 
-PropertyValue<Color> SymbolLayer::getIconColor() const {
-    return impl->paint.iconColor.get();
+PropertyValue<Color> SymbolLayer::getIconColor(const optional<std::string>& klass) const {
+    return impl->paint.iconColor.get(klass);
 }
 
 void SymbolLayer::setIconColor(PropertyValue<Color> value, const optional<std::string>& klass) {
@@ -463,8 +463,8 @@ PropertyValue<Color> SymbolLayer::getDefaultIconHaloColor() {
     return { {} };
 }
 
-PropertyValue<Color> SymbolLayer::getIconHaloColor() const {
-    return impl->paint.iconHaloColor.get();
+PropertyValue<Color> SymbolLayer::getIconHaloColor(const optional<std::string>& klass) const {
+    return impl->paint.iconHaloColor.get(klass);
 }
 
 void SymbolLayer::setIconHaloColor(PropertyValue<Color> value, const optional<std::string>& klass) {
@@ -475,8 +475,8 @@ PropertyValue<float> SymbolLayer::getDefaultIconHaloWidth() {
     return { 0 };
 }
 
-PropertyValue<float> SymbolLayer::getIconHaloWidth() const {
-    return impl->paint.iconHaloWidth.get();
+PropertyValue<float> SymbolLayer::getIconHaloWidth(const optional<std::string>& klass) const {
+    return impl->paint.iconHaloWidth.get(klass);
 }
 
 void SymbolLayer::setIconHaloWidth(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -487,8 +487,8 @@ PropertyValue<float> SymbolLayer::getDefaultIconHaloBlur() {
     return { 0 };
 }
 
-PropertyValue<float> SymbolLayer::getIconHaloBlur() const {
-    return impl->paint.iconHaloBlur.get();
+PropertyValue<float> SymbolLayer::getIconHaloBlur(const optional<std::string>& klass) const {
+    return impl->paint.iconHaloBlur.get(klass);
 }
 
 void SymbolLayer::setIconHaloBlur(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -499,8 +499,8 @@ PropertyValue<std::array<float, 2>> SymbolLayer::getDefaultIconTranslate() {
     return { {{ 0, 0 }} };
 }
 
-PropertyValue<std::array<float, 2>> SymbolLayer::getIconTranslate() const {
-    return impl->paint.iconTranslate.get();
+PropertyValue<std::array<float, 2>> SymbolLayer::getIconTranslate(const optional<std::string>& klass) const {
+    return impl->paint.iconTranslate.get(klass);
 }
 
 void SymbolLayer::setIconTranslate(PropertyValue<std::array<float, 2>> value, const optional<std::string>& klass) {
@@ -511,8 +511,8 @@ PropertyValue<TranslateAnchorType> SymbolLayer::getDefaultIconTranslateAnchor()
     return { TranslateAnchorType::Map };
 }
 
-PropertyValue<TranslateAnchorType> SymbolLayer::getIconTranslateAnchor() const {
-    return impl->paint.iconTranslateAnchor.get();
+PropertyValue<TranslateAnchorType> SymbolLayer::getIconTranslateAnchor(const optional<std::string>& klass) const {
+    return impl->paint.iconTranslateAnchor.get(klass);
 }
 
 void SymbolLayer::setIconTranslateAnchor(PropertyValue<TranslateAnchorType> value, const optional<std::string>& klass) {
@@ -523,8 +523,8 @@ PropertyValue<float> SymbolLayer::getDefaultTextOpacity() {
     return { 1 };
 }
 
-PropertyValue<float> SymbolLayer::getTextOpacity() const {
-    return impl->paint.textOpacity.get();
+PropertyValue<float> SymbolLayer::getTextOpacity(const optional<std::string>& klass) const {
+    return impl->paint.textOpacity.get(klass);
 }
 
 void SymbolLayer::setTextOpacity(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -535,8 +535,8 @@ PropertyValue<Color> SymbolLayer::getDefaultTextColor() {
     return { Color::black() };
 }
 
-PropertyValue<Color> SymbolLayer::getTextColor() const {
-    return impl->paint.textColor.get();
+PropertyValue<Color> SymbolLayer::getTextColor(const optional<std::string>& klass) const {
+    return impl->paint.textColor.get(klass);
 }
 
 void SymbolLayer::setTextColor(PropertyValue<Color> value, const optional<std::string>& klass) {
@@ -547,8 +547,8 @@ PropertyValue<Color> SymbolLayer::getDefaultTextHaloColor() {
     return { {} };
 }
 
-PropertyValue<Color> SymbolLayer::getTextHaloColor() const {
-    return impl->paint.textHaloColor.get();
+PropertyValue<Color> SymbolLayer::getTextHaloColor(const optional<std::string>& klass) const {
+    return impl->paint.textHaloColor.get(klass);
 }
 
 void SymbolLayer::setTextHaloColor(PropertyValue<Color> value, const optional<std::string>& klass) {
@@ -559,8 +559,8 @@ PropertyValue<float> SymbolLayer::getDefaultTextHaloWidth() {
     return { 0 };
 }
 
-PropertyValue<float> SymbolLayer::getTextHaloWidth() const {
-    return impl->paint.textHaloWidth.get();
+PropertyValue<float> SymbolLayer::getTextHaloWidth(const optional<std::string>& klass) const {
+    return impl->paint.textHaloWidth.get(klass);
 }
 
 void SymbolLayer::setTextHaloWidth(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -571,8 +571,8 @@ PropertyValue<float> SymbolLayer::getDefaultTextHaloBlur() {
     return { 0 };
 }
 
-PropertyValue<float> SymbolLayer::getTextHaloBlur() const {
-    return impl->paint.textHaloBlur.get();
+PropertyValue<float> SymbolLayer::getTextHaloBlur(const optional<std::string>& klass) const {
+    return impl->paint.textHaloBlur.get(klass);
 }
 
 void SymbolLayer::setTextHaloBlur(PropertyValue<float> value, const optional<std::string>& klass) {
@@ -583,8 +583,8 @@ PropertyValue<std::array<float, 2>> SymbolLayer::getDefaultTextTranslate() {
     return { {{ 0, 0 }} };
 }
 
-PropertyValue<std::array<float, 2>> SymbolLayer::getTextTranslate() const {
-    return impl->paint.textTranslate.get();
+PropertyValue<std::array<float, 2>> SymbolLayer::getTextTranslate(const optional<std::string>& klass) const {
+    return impl->paint.textTranslate.get(klass);
 }
 
 void SymbolLayer::setTextTranslate(PropertyValue<std::array<float, 2>> value, const optional<std::string>& klass) {
@@ -595,8 +595,8 @@ PropertyValue<TranslateAnchorType> SymbolLayer::getDefaultTextTranslateAnchor()
     return { TranslateAnchorType::Map };
 }
 
-PropertyValue<TranslateAnchorType> SymbolLayer::getTextTranslateAnchor() const {
-    return impl->paint.textTranslateAnchor.get();
+PropertyValue<TranslateAnchorType> SymbolLayer::getTextTranslateAnchor(const optional<std::string>& klass) const {
+    return impl->paint.textTranslateAnchor.get(klass);
 }
 
 void SymbolLayer::setTextTranslateAnchor(PropertyValue<TranslateAnchorType> value, const optional<std::string>& klass) {