summaryrefslogtreecommitdiff
path: root/src/mbgl/style/layers/line_layer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/style/layers/line_layer.cpp')
-rw-r--r--src/mbgl/style/layers/line_layer.cpp366
1 files changed, 183 insertions, 183 deletions
diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp
index d50ae27098..0a6f0824f4 100644
--- a/src/mbgl/style/layers/line_layer.cpp
+++ b/src/mbgl/style/layers/line_layer.cpp
@@ -128,31 +128,31 @@ void LineLayer::setLineRoundLimit(const PropertyValue<float>& value) {
// Paint properties
-PropertyValue<float> LineLayer::getDefaultLineOpacity() {
- return { 1 };
+PropertyValue<float> LineLayer::getDefaultLineBlur() {
+ return { 0 };
}
-const PropertyValue<float>& LineLayer::getLineOpacity() const {
- return impl().paint.template get<LineOpacity>().value;
+const PropertyValue<float>& LineLayer::getLineBlur() const {
+ return impl().paint.template get<LineBlur>().value;
}
-void LineLayer::setLineOpacity(const PropertyValue<float>& value) {
- if (value == getLineOpacity())
+void LineLayer::setLineBlur(const PropertyValue<float>& value) {
+ if (value == getLineBlur())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LineOpacity>().value = value;
+ impl_->paint.template get<LineBlur>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLineOpacityTransition(const TransitionOptions& options) {
+void LineLayer::setLineBlurTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LineOpacity>().options = options;
+ impl_->paint.template get<LineBlur>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLineOpacityTransition() const {
- return impl().paint.template get<LineOpacity>().options;
+TransitionOptions LineLayer::getLineBlurTransition() const {
+ return impl().paint.template get<LineBlur>().options;
}
PropertyValue<Color> LineLayer::getDefaultLineColor() {
@@ -182,301 +182,301 @@ TransitionOptions LineLayer::getLineColorTransition() const {
return impl().paint.template get<LineColor>().options;
}
-PropertyValue<std::array<float, 2>> LineLayer::getDefaultLineTranslate() {
- return { {{ 0, 0 }} };
+PropertyValue<std::vector<float>> LineLayer::getDefaultLineDasharray() {
+ return { { } };
}
-const PropertyValue<std::array<float, 2>>& LineLayer::getLineTranslate() const {
- return impl().paint.template get<LineTranslate>().value;
+const PropertyValue<std::vector<float>>& LineLayer::getLineDasharray() const {
+ return impl().paint.template get<LineDasharray>().value;
}
-void LineLayer::setLineTranslate(const PropertyValue<std::array<float, 2>>& value) {
- if (value == getLineTranslate())
+void LineLayer::setLineDasharray(const PropertyValue<std::vector<float>>& value) {
+ if (value == getLineDasharray())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LineTranslate>().value = value;
+ impl_->paint.template get<LineDasharray>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLineTranslateTransition(const TransitionOptions& options) {
+void LineLayer::setLineDasharrayTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LineTranslate>().options = options;
+ impl_->paint.template get<LineDasharray>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLineTranslateTransition() const {
- return impl().paint.template get<LineTranslate>().options;
+TransitionOptions LineLayer::getLineDasharrayTransition() const {
+ return impl().paint.template get<LineDasharray>().options;
}
-PropertyValue<TranslateAnchorType> LineLayer::getDefaultLineTranslateAnchor() {
- return { TranslateAnchorType::Map };
+PropertyValue<float> LineLayer::getDefaultLineGapWidth() {
+ return { 0 };
}
-const PropertyValue<TranslateAnchorType>& LineLayer::getLineTranslateAnchor() const {
- return impl().paint.template get<LineTranslateAnchor>().value;
+const PropertyValue<float>& LineLayer::getLineGapWidth() const {
+ return impl().paint.template get<LineGapWidth>().value;
}
-void LineLayer::setLineTranslateAnchor(const PropertyValue<TranslateAnchorType>& value) {
- if (value == getLineTranslateAnchor())
+void LineLayer::setLineGapWidth(const PropertyValue<float>& value) {
+ if (value == getLineGapWidth())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LineTranslateAnchor>().value = value;
+ impl_->paint.template get<LineGapWidth>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLineTranslateAnchorTransition(const TransitionOptions& options) {
+void LineLayer::setLineGapWidthTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LineTranslateAnchor>().options = options;
+ impl_->paint.template get<LineGapWidth>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLineTranslateAnchorTransition() const {
- return impl().paint.template get<LineTranslateAnchor>().options;
+TransitionOptions LineLayer::getLineGapWidthTransition() const {
+ return impl().paint.template get<LineGapWidth>().options;
}
-PropertyValue<float> LineLayer::getDefaultLineWidth() {
- return { 1 };
+ColorRampPropertyValue LineLayer::getDefaultLineGradient() {
+ return { {} };
}
-const PropertyValue<float>& LineLayer::getLineWidth() const {
- return impl().paint.template get<LineWidth>().value;
+const ColorRampPropertyValue& LineLayer::getLineGradient() const {
+ return impl().paint.template get<LineGradient>().value;
}
-void LineLayer::setLineWidth(const PropertyValue<float>& value) {
- if (value == getLineWidth())
+void LineLayer::setLineGradient(const ColorRampPropertyValue& value) {
+ if (value == getLineGradient())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LineWidth>().value = value;
- impl_->paint.template get<LineFloorWidth>().value = value;
+ impl_->paint.template get<LineGradient>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLineWidthTransition(const TransitionOptions& options) {
+void LineLayer::setLineGradientTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LineWidth>().options = options;
+ impl_->paint.template get<LineGradient>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLineWidthTransition() const {
- return impl().paint.template get<LineWidth>().options;
+TransitionOptions LineLayer::getLineGradientTransition() const {
+ return impl().paint.template get<LineGradient>().options;
}
-PropertyValue<float> LineLayer::getDefaultLineGapWidth() {
+PropertyValue<float> LineLayer::getDefaultLineOffset() {
return { 0 };
}
-const PropertyValue<float>& LineLayer::getLineGapWidth() const {
- return impl().paint.template get<LineGapWidth>().value;
+const PropertyValue<float>& LineLayer::getLineOffset() const {
+ return impl().paint.template get<LineOffset>().value;
}
-void LineLayer::setLineGapWidth(const PropertyValue<float>& value) {
- if (value == getLineGapWidth())
+void LineLayer::setLineOffset(const PropertyValue<float>& value) {
+ if (value == getLineOffset())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LineGapWidth>().value = value;
+ impl_->paint.template get<LineOffset>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLineGapWidthTransition(const TransitionOptions& options) {
+void LineLayer::setLineOffsetTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LineGapWidth>().options = options;
+ impl_->paint.template get<LineOffset>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLineGapWidthTransition() const {
- return impl().paint.template get<LineGapWidth>().options;
+TransitionOptions LineLayer::getLineOffsetTransition() const {
+ return impl().paint.template get<LineOffset>().options;
}
-PropertyValue<float> LineLayer::getDefaultLineOffset() {
- return { 0 };
+PropertyValue<float> LineLayer::getDefaultLineOpacity() {
+ return { 1 };
}
-const PropertyValue<float>& LineLayer::getLineOffset() const {
- return impl().paint.template get<LineOffset>().value;
+const PropertyValue<float>& LineLayer::getLineOpacity() const {
+ return impl().paint.template get<LineOpacity>().value;
}
-void LineLayer::setLineOffset(const PropertyValue<float>& value) {
- if (value == getLineOffset())
+void LineLayer::setLineOpacity(const PropertyValue<float>& value) {
+ if (value == getLineOpacity())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LineOffset>().value = value;
+ impl_->paint.template get<LineOpacity>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLineOffsetTransition(const TransitionOptions& options) {
+void LineLayer::setLineOpacityTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LineOffset>().options = options;
+ impl_->paint.template get<LineOpacity>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLineOffsetTransition() const {
- return impl().paint.template get<LineOffset>().options;
+TransitionOptions LineLayer::getLineOpacityTransition() const {
+ return impl().paint.template get<LineOpacity>().options;
}
-PropertyValue<float> LineLayer::getDefaultLineBlur() {
- return { 0 };
+PropertyValue<std::string> LineLayer::getDefaultLinePattern() {
+ return { "" };
}
-const PropertyValue<float>& LineLayer::getLineBlur() const {
- return impl().paint.template get<LineBlur>().value;
+const PropertyValue<std::string>& LineLayer::getLinePattern() const {
+ return impl().paint.template get<LinePattern>().value;
}
-void LineLayer::setLineBlur(const PropertyValue<float>& value) {
- if (value == getLineBlur())
+void LineLayer::setLinePattern(const PropertyValue<std::string>& value) {
+ if (value == getLinePattern())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LineBlur>().value = value;
+ impl_->paint.template get<LinePattern>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLineBlurTransition(const TransitionOptions& options) {
+void LineLayer::setLinePatternTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LineBlur>().options = options;
+ impl_->paint.template get<LinePattern>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLineBlurTransition() const {
- return impl().paint.template get<LineBlur>().options;
+TransitionOptions LineLayer::getLinePatternTransition() const {
+ return impl().paint.template get<LinePattern>().options;
}
-PropertyValue<std::vector<float>> LineLayer::getDefaultLineDasharray() {
- return { { } };
+PropertyValue<std::array<float, 2>> LineLayer::getDefaultLineTranslate() {
+ return { {{ 0, 0 }} };
}
-const PropertyValue<std::vector<float>>& LineLayer::getLineDasharray() const {
- return impl().paint.template get<LineDasharray>().value;
+const PropertyValue<std::array<float, 2>>& LineLayer::getLineTranslate() const {
+ return impl().paint.template get<LineTranslate>().value;
}
-void LineLayer::setLineDasharray(const PropertyValue<std::vector<float>>& value) {
- if (value == getLineDasharray())
+void LineLayer::setLineTranslate(const PropertyValue<std::array<float, 2>>& value) {
+ if (value == getLineTranslate())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LineDasharray>().value = value;
+ impl_->paint.template get<LineTranslate>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLineDasharrayTransition(const TransitionOptions& options) {
+void LineLayer::setLineTranslateTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LineDasharray>().options = options;
+ impl_->paint.template get<LineTranslate>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLineDasharrayTransition() const {
- return impl().paint.template get<LineDasharray>().options;
+TransitionOptions LineLayer::getLineTranslateTransition() const {
+ return impl().paint.template get<LineTranslate>().options;
}
-PropertyValue<std::string> LineLayer::getDefaultLinePattern() {
- return { "" };
+PropertyValue<TranslateAnchorType> LineLayer::getDefaultLineTranslateAnchor() {
+ return { TranslateAnchorType::Map };
}
-const PropertyValue<std::string>& LineLayer::getLinePattern() const {
- return impl().paint.template get<LinePattern>().value;
+const PropertyValue<TranslateAnchorType>& LineLayer::getLineTranslateAnchor() const {
+ return impl().paint.template get<LineTranslateAnchor>().value;
}
-void LineLayer::setLinePattern(const PropertyValue<std::string>& value) {
- if (value == getLinePattern())
+void LineLayer::setLineTranslateAnchor(const PropertyValue<TranslateAnchorType>& value) {
+ if (value == getLineTranslateAnchor())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LinePattern>().value = value;
+ impl_->paint.template get<LineTranslateAnchor>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLinePatternTransition(const TransitionOptions& options) {
+void LineLayer::setLineTranslateAnchorTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LinePattern>().options = options;
+ impl_->paint.template get<LineTranslateAnchor>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLinePatternTransition() const {
- return impl().paint.template get<LinePattern>().options;
+TransitionOptions LineLayer::getLineTranslateAnchorTransition() const {
+ return impl().paint.template get<LineTranslateAnchor>().options;
}
-ColorRampPropertyValue LineLayer::getDefaultLineGradient() {
- return { {} };
+PropertyValue<float> LineLayer::getDefaultLineWidth() {
+ return { 1 };
}
-const ColorRampPropertyValue& LineLayer::getLineGradient() const {
- return impl().paint.template get<LineGradient>().value;
+const PropertyValue<float>& LineLayer::getLineWidth() const {
+ return impl().paint.template get<LineWidth>().value;
}
-void LineLayer::setLineGradient(const ColorRampPropertyValue& value) {
- if (value == getLineGradient())
+void LineLayer::setLineWidth(const PropertyValue<float>& value) {
+ if (value == getLineWidth())
return;
auto impl_ = mutableImpl();
- impl_->paint.template get<LineGradient>().value = value;
+ impl_->paint.template get<LineWidth>().value = value;
+ impl_->paint.template get<LineFloorWidth>().value = value;
baseImpl = std::move(impl_);
observer->onLayerChanged(*this);
}
-void LineLayer::setLineGradientTransition(const TransitionOptions& options) {
+void LineLayer::setLineWidthTransition(const TransitionOptions& options) {
auto impl_ = mutableImpl();
- impl_->paint.template get<LineGradient>().options = options;
+ impl_->paint.template get<LineWidth>().options = options;
baseImpl = std::move(impl_);
}
-TransitionOptions LineLayer::getLineGradientTransition() const {
- return impl().paint.template get<LineGradient>().options;
+TransitionOptions LineLayer::getLineWidthTransition() const {
+ return impl().paint.template get<LineWidth>().options;
}
using namespace conversion;
optional<Error> LineLayer::setPaintProperty(const std::string& name, const Convertible& value) {
enum class Property : uint8_t {
- LineOpacity,
+ LineBlur,
LineColor,
- LineTranslate,
- LineTranslateAnchor,
- LineWidth,
+ LineDasharray,
LineGapWidth,
+ LineGradient,
LineOffset,
- LineBlur,
- LineDasharray,
+ LineOpacity,
LinePattern,
- LineGradient,
- LineOpacityTransition,
+ LineTranslate,
+ LineTranslateAnchor,
+ LineWidth,
+ LineBlurTransition,
LineColorTransition,
- LineTranslateTransition,
- LineTranslateAnchorTransition,
- LineWidthTransition,
+ LineDasharrayTransition,
LineGapWidthTransition,
+ LineGradientTransition,
LineOffsetTransition,
- LineBlurTransition,
- LineDasharrayTransition,
+ LineOpacityTransition,
LinePatternTransition,
- LineGradientTransition,
+ LineTranslateTransition,
+ LineTranslateAnchorTransition,
+ LineWidthTransition,
};
MAPBOX_ETERNAL_CONSTEXPR const auto properties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>({
- { "line-opacity", static_cast<uint8_t>(Property::LineOpacity) },
+ { "line-blur", static_cast<uint8_t>(Property::LineBlur) },
{ "line-color", static_cast<uint8_t>(Property::LineColor) },
- { "line-translate", static_cast<uint8_t>(Property::LineTranslate) },
- { "line-translate-anchor", static_cast<uint8_t>(Property::LineTranslateAnchor) },
- { "line-width", static_cast<uint8_t>(Property::LineWidth) },
+ { "line-dasharray", static_cast<uint8_t>(Property::LineDasharray) },
{ "line-gap-width", static_cast<uint8_t>(Property::LineGapWidth) },
+ { "line-gradient", static_cast<uint8_t>(Property::LineGradient) },
{ "line-offset", static_cast<uint8_t>(Property::LineOffset) },
- { "line-blur", static_cast<uint8_t>(Property::LineBlur) },
- { "line-dasharray", static_cast<uint8_t>(Property::LineDasharray) },
+ { "line-opacity", static_cast<uint8_t>(Property::LineOpacity) },
{ "line-pattern", static_cast<uint8_t>(Property::LinePattern) },
- { "line-gradient", static_cast<uint8_t>(Property::LineGradient) },
- { "line-opacity-transition", static_cast<uint8_t>(Property::LineOpacityTransition) },
+ { "line-translate", static_cast<uint8_t>(Property::LineTranslate) },
+ { "line-translate-anchor", static_cast<uint8_t>(Property::LineTranslateAnchor) },
+ { "line-width", static_cast<uint8_t>(Property::LineWidth) },
+ { "line-blur-transition", static_cast<uint8_t>(Property::LineBlurTransition) },
{ "line-color-transition", static_cast<uint8_t>(Property::LineColorTransition) },
- { "line-translate-transition", static_cast<uint8_t>(Property::LineTranslateTransition) },
- { "line-translate-anchor-transition", static_cast<uint8_t>(Property::LineTranslateAnchorTransition) },
- { "line-width-transition", static_cast<uint8_t>(Property::LineWidthTransition) },
+ { "line-dasharray-transition", static_cast<uint8_t>(Property::LineDasharrayTransition) },
{ "line-gap-width-transition", static_cast<uint8_t>(Property::LineGapWidthTransition) },
+ { "line-gradient-transition", static_cast<uint8_t>(Property::LineGradientTransition) },
{ "line-offset-transition", static_cast<uint8_t>(Property::LineOffsetTransition) },
- { "line-blur-transition", static_cast<uint8_t>(Property::LineBlurTransition) },
- { "line-dasharray-transition", static_cast<uint8_t>(Property::LineDasharrayTransition) },
+ { "line-opacity-transition", static_cast<uint8_t>(Property::LineOpacityTransition) },
{ "line-pattern-transition", static_cast<uint8_t>(Property::LinePatternTransition) },
- { "line-gradient-transition", static_cast<uint8_t>(Property::LineGradientTransition) }
+ { "line-translate-transition", static_cast<uint8_t>(Property::LineTranslateTransition) },
+ { "line-translate-anchor-transition", static_cast<uint8_t>(Property::LineTranslateAnchorTransition) },
+ { "line-width-transition", static_cast<uint8_t>(Property::LineWidthTransition) }
});
const auto it = properties.find(name.c_str());
@@ -487,20 +487,15 @@ optional<Error> LineLayer::setPaintProperty(const std::string& name, const Conve
auto property = static_cast<Property>(it->second);
- if (property == Property::LineOpacity || property == Property::LineWidth || property == Property::LineGapWidth || property == Property::LineOffset || property == Property::LineBlur) {
+ if (property == Property::LineBlur || property == Property::LineGapWidth || property == Property::LineOffset || property == Property::LineOpacity || property == Property::LineWidth) {
Error error;
optional<PropertyValue<float>> typedValue = convert<PropertyValue<float>>(value, error, true, false);
if (!typedValue) {
return error;
}
- if (property == Property::LineOpacity) {
- setLineOpacity(*typedValue);
- return nullopt;
- }
-
- if (property == Property::LineWidth) {
- setLineWidth(*typedValue);
+ if (property == Property::LineBlur) {
+ setLineBlur(*typedValue);
return nullopt;
}
@@ -514,8 +509,13 @@ optional<Error> LineLayer::setPaintProperty(const std::string& name, const Conve
return nullopt;
}
- if (property == Property::LineBlur) {
- setLineBlur(*typedValue);
+ if (property == Property::LineOpacity) {
+ setLineOpacity(*typedValue);
+ return nullopt;
+ }
+
+ if (property == Property::LineWidth) {
+ setLineWidth(*typedValue);
return nullopt;
}
@@ -533,62 +533,62 @@ optional<Error> LineLayer::setPaintProperty(const std::string& name, const Conve
}
- if (property == Property::LineTranslate) {
+ if (property == Property::LineDasharray) {
Error error;
- optional<PropertyValue<std::array<float, 2>>> typedValue = convert<PropertyValue<std::array<float, 2>>>(value, error, false, false);
+ optional<PropertyValue<std::vector<float>>> typedValue = convert<PropertyValue<std::vector<float>>>(value, error, false, false);
if (!typedValue) {
return error;
}
- setLineTranslate(*typedValue);
+ setLineDasharray(*typedValue);
return nullopt;
}
- if (property == Property::LineTranslateAnchor) {
+ if (property == Property::LineGradient) {
Error error;
- optional<PropertyValue<TranslateAnchorType>> typedValue = convert<PropertyValue<TranslateAnchorType>>(value, error, false, false);
+ optional<ColorRampPropertyValue> typedValue = convert<ColorRampPropertyValue>(value, error, false, false);
if (!typedValue) {
return error;
}
- setLineTranslateAnchor(*typedValue);
+ setLineGradient(*typedValue);
return nullopt;
}
- if (property == Property::LineDasharray) {
+ if (property == Property::LinePattern) {
Error error;
- optional<PropertyValue<std::vector<float>>> typedValue = convert<PropertyValue<std::vector<float>>>(value, error, false, false);
+ optional<PropertyValue<std::string>> typedValue = convert<PropertyValue<std::string>>(value, error, true, false);
if (!typedValue) {
return error;
}
- setLineDasharray(*typedValue);
+ setLinePattern(*typedValue);
return nullopt;
}
- if (property == Property::LinePattern) {
+ if (property == Property::LineTranslate) {
Error error;
- optional<PropertyValue<std::string>> typedValue = convert<PropertyValue<std::string>>(value, error, true, false);
+ optional<PropertyValue<std::array<float, 2>>> typedValue = convert<PropertyValue<std::array<float, 2>>>(value, error, false, false);
if (!typedValue) {
return error;
}
- setLinePattern(*typedValue);
+ setLineTranslate(*typedValue);
return nullopt;
}
- if (property == Property::LineGradient) {
+ if (property == Property::LineTranslateAnchor) {
Error error;
- optional<ColorRampPropertyValue> typedValue = convert<ColorRampPropertyValue>(value, error, false, false);
+ optional<PropertyValue<TranslateAnchorType>> typedValue = convert<PropertyValue<TranslateAnchorType>>(value, error, false, false);
if (!typedValue) {
return error;
}
- setLineGradient(*typedValue);
+ setLineTranslateAnchor(*typedValue);
return nullopt;
}
@@ -600,8 +600,8 @@ optional<Error> LineLayer::setPaintProperty(const std::string& name, const Conve
return error;
}
- if (property == Property::LineOpacityTransition) {
- setLineOpacityTransition(*transition);
+ if (property == Property::LineBlurTransition) {
+ setLineBlurTransition(*transition);
return nullopt;
}
@@ -610,48 +610,48 @@ optional<Error> LineLayer::setPaintProperty(const std::string& name, const Conve
return nullopt;
}
- if (property == Property::LineTranslateTransition) {
- setLineTranslateTransition(*transition);
+ if (property == Property::LineDasharrayTransition) {
+ setLineDasharrayTransition(*transition);
return nullopt;
}
- if (property == Property::LineTranslateAnchorTransition) {
- setLineTranslateAnchorTransition(*transition);
+ if (property == Property::LineGapWidthTransition) {
+ setLineGapWidthTransition(*transition);
return nullopt;
}
- if (property == Property::LineWidthTransition) {
- setLineWidthTransition(*transition);
+ if (property == Property::LineGradientTransition) {
+ setLineGradientTransition(*transition);
return nullopt;
}
- if (property == Property::LineGapWidthTransition) {
- setLineGapWidthTransition(*transition);
+ if (property == Property::LineOffsetTransition) {
+ setLineOffsetTransition(*transition);
return nullopt;
}
- if (property == Property::LineOffsetTransition) {
- setLineOffsetTransition(*transition);
+ if (property == Property::LineOpacityTransition) {
+ setLineOpacityTransition(*transition);
return nullopt;
}
- if (property == Property::LineBlurTransition) {
- setLineBlurTransition(*transition);
+ if (property == Property::LinePatternTransition) {
+ setLinePatternTransition(*transition);
return nullopt;
}
- if (property == Property::LineDasharrayTransition) {
- setLineDasharrayTransition(*transition);
+ if (property == Property::LineTranslateTransition) {
+ setLineTranslateTransition(*transition);
return nullopt;
}
- if (property == Property::LinePatternTransition) {
- setLinePatternTransition(*transition);
+ if (property == Property::LineTranslateAnchorTransition) {
+ setLineTranslateAnchorTransition(*transition);
return nullopt;
}
- if (property == Property::LineGradientTransition) {
- setLineGradientTransition(*transition);
+ if (property == Property::LineWidthTransition) {
+ setLineWidthTransition(*transition);
return nullopt;
}