diff options
Diffstat (limited to 'src/mbgl/style/layers/circle_layer.cpp')
| -rw-r--r-- | src/mbgl/style/layers/circle_layer.cpp | 324 |
1 files changed, 162 insertions, 162 deletions
diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp index 2759549e1c..a95193d651 100644 --- a/src/mbgl/style/layers/circle_layer.cpp +++ b/src/mbgl/style/layers/circle_layer.cpp @@ -63,31 +63,31 @@ void CircleLayer::Impl::stringifyLayout(rapidjson::Writer<rapidjson::StringBuffe // Paint properties -PropertyValue<float> CircleLayer::getDefaultCircleRadius() { - return { 5 }; +PropertyValue<float> CircleLayer::getDefaultCircleBlur() { + return { 0 }; } -const PropertyValue<float>& CircleLayer::getCircleRadius() const { - return impl().paint.template get<CircleRadius>().value; +const PropertyValue<float>& CircleLayer::getCircleBlur() const { + return impl().paint.template get<CircleBlur>().value; } -void CircleLayer::setCircleRadius(const PropertyValue<float>& value) { - if (value == getCircleRadius()) +void CircleLayer::setCircleBlur(const PropertyValue<float>& value) { + if (value == getCircleBlur()) return; auto impl_ = mutableImpl(); - impl_->paint.template get<CircleRadius>().value = value; + impl_->paint.template get<CircleBlur>().value = value; baseImpl = std::move(impl_); observer->onLayerChanged(*this); } -void CircleLayer::setCircleRadiusTransition(const TransitionOptions& options) { +void CircleLayer::setCircleBlurTransition(const TransitionOptions& options) { auto impl_ = mutableImpl(); - impl_->paint.template get<CircleRadius>().options = options; + impl_->paint.template get<CircleBlur>().options = options; baseImpl = std::move(impl_); } -TransitionOptions CircleLayer::getCircleRadiusTransition() const { - return impl().paint.template get<CircleRadius>().options; +TransitionOptions CircleLayer::getCircleBlurTransition() const { + return impl().paint.template get<CircleBlur>().options; } PropertyValue<Color> CircleLayer::getDefaultCircleColor() { @@ -117,166 +117,166 @@ TransitionOptions CircleLayer::getCircleColorTransition() const { return impl().paint.template get<CircleColor>().options; } -PropertyValue<float> CircleLayer::getDefaultCircleBlur() { - return { 0 }; +PropertyValue<float> CircleLayer::getDefaultCircleOpacity() { + return { 1 }; } -const PropertyValue<float>& CircleLayer::getCircleBlur() const { - return impl().paint.template get<CircleBlur>().value; +const PropertyValue<float>& CircleLayer::getCircleOpacity() const { + return impl().paint.template get<CircleOpacity>().value; } -void CircleLayer::setCircleBlur(const PropertyValue<float>& value) { - if (value == getCircleBlur()) +void CircleLayer::setCircleOpacity(const PropertyValue<float>& value) { + if (value == getCircleOpacity()) return; auto impl_ = mutableImpl(); - impl_->paint.template get<CircleBlur>().value = value; + impl_->paint.template get<CircleOpacity>().value = value; baseImpl = std::move(impl_); observer->onLayerChanged(*this); } -void CircleLayer::setCircleBlurTransition(const TransitionOptions& options) { +void CircleLayer::setCircleOpacityTransition(const TransitionOptions& options) { auto impl_ = mutableImpl(); - impl_->paint.template get<CircleBlur>().options = options; + impl_->paint.template get<CircleOpacity>().options = options; baseImpl = std::move(impl_); } -TransitionOptions CircleLayer::getCircleBlurTransition() const { - return impl().paint.template get<CircleBlur>().options; +TransitionOptions CircleLayer::getCircleOpacityTransition() const { + return impl().paint.template get<CircleOpacity>().options; } -PropertyValue<float> CircleLayer::getDefaultCircleOpacity() { - return { 1 }; +PropertyValue<AlignmentType> CircleLayer::getDefaultCirclePitchAlignment() { + return { AlignmentType::Viewport }; } -const PropertyValue<float>& CircleLayer::getCircleOpacity() const { - return impl().paint.template get<CircleOpacity>().value; +const PropertyValue<AlignmentType>& CircleLayer::getCirclePitchAlignment() const { + return impl().paint.template get<CirclePitchAlignment>().value; } -void CircleLayer::setCircleOpacity(const PropertyValue<float>& value) { - if (value == getCircleOpacity()) +void CircleLayer::setCirclePitchAlignment(const PropertyValue<AlignmentType>& value) { + if (value == getCirclePitchAlignment()) return; auto impl_ = mutableImpl(); - impl_->paint.template get<CircleOpacity>().value = value; + impl_->paint.template get<CirclePitchAlignment>().value = value; baseImpl = std::move(impl_); observer->onLayerChanged(*this); } -void CircleLayer::setCircleOpacityTransition(const TransitionOptions& options) { +void CircleLayer::setCirclePitchAlignmentTransition(const TransitionOptions& options) { auto impl_ = mutableImpl(); - impl_->paint.template get<CircleOpacity>().options = options; + impl_->paint.template get<CirclePitchAlignment>().options = options; baseImpl = std::move(impl_); } -TransitionOptions CircleLayer::getCircleOpacityTransition() const { - return impl().paint.template get<CircleOpacity>().options; +TransitionOptions CircleLayer::getCirclePitchAlignmentTransition() const { + return impl().paint.template get<CirclePitchAlignment>().options; } -PropertyValue<std::array<float, 2>> CircleLayer::getDefaultCircleTranslate() { - return { {{ 0, 0 }} }; +PropertyValue<CirclePitchScaleType> CircleLayer::getDefaultCirclePitchScale() { + return { CirclePitchScaleType::Map }; } -const PropertyValue<std::array<float, 2>>& CircleLayer::getCircleTranslate() const { - return impl().paint.template get<CircleTranslate>().value; +const PropertyValue<CirclePitchScaleType>& CircleLayer::getCirclePitchScale() const { + return impl().paint.template get<CirclePitchScale>().value; } -void CircleLayer::setCircleTranslate(const PropertyValue<std::array<float, 2>>& value) { - if (value == getCircleTranslate()) +void CircleLayer::setCirclePitchScale(const PropertyValue<CirclePitchScaleType>& value) { + if (value == getCirclePitchScale()) return; auto impl_ = mutableImpl(); - impl_->paint.template get<CircleTranslate>().value = value; + impl_->paint.template get<CirclePitchScale>().value = value; baseImpl = std::move(impl_); observer->onLayerChanged(*this); } -void CircleLayer::setCircleTranslateTransition(const TransitionOptions& options) { +void CircleLayer::setCirclePitchScaleTransition(const TransitionOptions& options) { auto impl_ = mutableImpl(); - impl_->paint.template get<CircleTranslate>().options = options; + impl_->paint.template get<CirclePitchScale>().options = options; baseImpl = std::move(impl_); } -TransitionOptions CircleLayer::getCircleTranslateTransition() const { - return impl().paint.template get<CircleTranslate>().options; +TransitionOptions CircleLayer::getCirclePitchScaleTransition() const { + return impl().paint.template get<CirclePitchScale>().options; } -PropertyValue<TranslateAnchorType> CircleLayer::getDefaultCircleTranslateAnchor() { - return { TranslateAnchorType::Map }; +PropertyValue<float> CircleLayer::getDefaultCircleRadius() { + return { 5 }; } -const PropertyValue<TranslateAnchorType>& CircleLayer::getCircleTranslateAnchor() const { - return impl().paint.template get<CircleTranslateAnchor>().value; +const PropertyValue<float>& CircleLayer::getCircleRadius() const { + return impl().paint.template get<CircleRadius>().value; } -void CircleLayer::setCircleTranslateAnchor(const PropertyValue<TranslateAnchorType>& value) { - if (value == getCircleTranslateAnchor()) +void CircleLayer::setCircleRadius(const PropertyValue<float>& value) { + if (value == getCircleRadius()) return; auto impl_ = mutableImpl(); - impl_->paint.template get<CircleTranslateAnchor>().value = value; + impl_->paint.template get<CircleRadius>().value = value; baseImpl = std::move(impl_); observer->onLayerChanged(*this); } -void CircleLayer::setCircleTranslateAnchorTransition(const TransitionOptions& options) { +void CircleLayer::setCircleRadiusTransition(const TransitionOptions& options) { auto impl_ = mutableImpl(); - impl_->paint.template get<CircleTranslateAnchor>().options = options; + impl_->paint.template get<CircleRadius>().options = options; baseImpl = std::move(impl_); } -TransitionOptions CircleLayer::getCircleTranslateAnchorTransition() const { - return impl().paint.template get<CircleTranslateAnchor>().options; +TransitionOptions CircleLayer::getCircleRadiusTransition() const { + return impl().paint.template get<CircleRadius>().options; } -PropertyValue<CirclePitchScaleType> CircleLayer::getDefaultCirclePitchScale() { - return { CirclePitchScaleType::Map }; +PropertyValue<Color> CircleLayer::getDefaultCircleStrokeColor() { + return { Color::black() }; } -const PropertyValue<CirclePitchScaleType>& CircleLayer::getCirclePitchScale() const { - return impl().paint.template get<CirclePitchScale>().value; +const PropertyValue<Color>& CircleLayer::getCircleStrokeColor() const { + return impl().paint.template get<CircleStrokeColor>().value; } -void CircleLayer::setCirclePitchScale(const PropertyValue<CirclePitchScaleType>& value) { - if (value == getCirclePitchScale()) +void CircleLayer::setCircleStrokeColor(const PropertyValue<Color>& value) { + if (value == getCircleStrokeColor()) return; auto impl_ = mutableImpl(); - impl_->paint.template get<CirclePitchScale>().value = value; + impl_->paint.template get<CircleStrokeColor>().value = value; baseImpl = std::move(impl_); observer->onLayerChanged(*this); } -void CircleLayer::setCirclePitchScaleTransition(const TransitionOptions& options) { +void CircleLayer::setCircleStrokeColorTransition(const TransitionOptions& options) { auto impl_ = mutableImpl(); - impl_->paint.template get<CirclePitchScale>().options = options; + impl_->paint.template get<CircleStrokeColor>().options = options; baseImpl = std::move(impl_); } -TransitionOptions CircleLayer::getCirclePitchScaleTransition() const { - return impl().paint.template get<CirclePitchScale>().options; +TransitionOptions CircleLayer::getCircleStrokeColorTransition() const { + return impl().paint.template get<CircleStrokeColor>().options; } -PropertyValue<AlignmentType> CircleLayer::getDefaultCirclePitchAlignment() { - return { AlignmentType::Viewport }; +PropertyValue<float> CircleLayer::getDefaultCircleStrokeOpacity() { + return { 1 }; } -const PropertyValue<AlignmentType>& CircleLayer::getCirclePitchAlignment() const { - return impl().paint.template get<CirclePitchAlignment>().value; +const PropertyValue<float>& CircleLayer::getCircleStrokeOpacity() const { + return impl().paint.template get<CircleStrokeOpacity>().value; } -void CircleLayer::setCirclePitchAlignment(const PropertyValue<AlignmentType>& value) { - if (value == getCirclePitchAlignment()) +void CircleLayer::setCircleStrokeOpacity(const PropertyValue<float>& value) { + if (value == getCircleStrokeOpacity()) return; auto impl_ = mutableImpl(); - impl_->paint.template get<CirclePitchAlignment>().value = value; + impl_->paint.template get<CircleStrokeOpacity>().value = value; baseImpl = std::move(impl_); observer->onLayerChanged(*this); } -void CircleLayer::setCirclePitchAlignmentTransition(const TransitionOptions& options) { +void CircleLayer::setCircleStrokeOpacityTransition(const TransitionOptions& options) { auto impl_ = mutableImpl(); - impl_->paint.template get<CirclePitchAlignment>().options = options; + impl_->paint.template get<CircleStrokeOpacity>().options = options; baseImpl = std::move(impl_); } -TransitionOptions CircleLayer::getCirclePitchAlignmentTransition() const { - return impl().paint.template get<CirclePitchAlignment>().options; +TransitionOptions CircleLayer::getCircleStrokeOpacityTransition() const { + return impl().paint.template get<CircleStrokeOpacity>().options; } PropertyValue<float> CircleLayer::getDefaultCircleStrokeWidth() { @@ -306,111 +306,111 @@ TransitionOptions CircleLayer::getCircleStrokeWidthTransition() const { return impl().paint.template get<CircleStrokeWidth>().options; } -PropertyValue<Color> CircleLayer::getDefaultCircleStrokeColor() { - return { Color::black() }; +PropertyValue<std::array<float, 2>> CircleLayer::getDefaultCircleTranslate() { + return { {{ 0, 0 }} }; } -const PropertyValue<Color>& CircleLayer::getCircleStrokeColor() const { - return impl().paint.template get<CircleStrokeColor>().value; +const PropertyValue<std::array<float, 2>>& CircleLayer::getCircleTranslate() const { + return impl().paint.template get<CircleTranslate>().value; } -void CircleLayer::setCircleStrokeColor(const PropertyValue<Color>& value) { - if (value == getCircleStrokeColor()) +void CircleLayer::setCircleTranslate(const PropertyValue<std::array<float, 2>>& value) { + if (value == getCircleTranslate()) return; auto impl_ = mutableImpl(); - impl_->paint.template get<CircleStrokeColor>().value = value; + impl_->paint.template get<CircleTranslate>().value = value; baseImpl = std::move(impl_); observer->onLayerChanged(*this); } -void CircleLayer::setCircleStrokeColorTransition(const TransitionOptions& options) { +void CircleLayer::setCircleTranslateTransition(const TransitionOptions& options) { auto impl_ = mutableImpl(); - impl_->paint.template get<CircleStrokeColor>().options = options; + impl_->paint.template get<CircleTranslate>().options = options; baseImpl = std::move(impl_); } -TransitionOptions CircleLayer::getCircleStrokeColorTransition() const { - return impl().paint.template get<CircleStrokeColor>().options; +TransitionOptions CircleLayer::getCircleTranslateTransition() const { + return impl().paint.template get<CircleTranslate>().options; } -PropertyValue<float> CircleLayer::getDefaultCircleStrokeOpacity() { - return { 1 }; +PropertyValue<TranslateAnchorType> CircleLayer::getDefaultCircleTranslateAnchor() { + return { TranslateAnchorType::Map }; } -const PropertyValue<float>& CircleLayer::getCircleStrokeOpacity() const { - return impl().paint.template get<CircleStrokeOpacity>().value; +const PropertyValue<TranslateAnchorType>& CircleLayer::getCircleTranslateAnchor() const { + return impl().paint.template get<CircleTranslateAnchor>().value; } -void CircleLayer::setCircleStrokeOpacity(const PropertyValue<float>& value) { - if (value == getCircleStrokeOpacity()) +void CircleLayer::setCircleTranslateAnchor(const PropertyValue<TranslateAnchorType>& value) { + if (value == getCircleTranslateAnchor()) return; auto impl_ = mutableImpl(); - impl_->paint.template get<CircleStrokeOpacity>().value = value; + impl_->paint.template get<CircleTranslateAnchor>().value = value; baseImpl = std::move(impl_); observer->onLayerChanged(*this); } -void CircleLayer::setCircleStrokeOpacityTransition(const TransitionOptions& options) { +void CircleLayer::setCircleTranslateAnchorTransition(const TransitionOptions& options) { auto impl_ = mutableImpl(); - impl_->paint.template get<CircleStrokeOpacity>().options = options; + impl_->paint.template get<CircleTranslateAnchor>().options = options; baseImpl = std::move(impl_); } -TransitionOptions CircleLayer::getCircleStrokeOpacityTransition() const { - return impl().paint.template get<CircleStrokeOpacity>().options; +TransitionOptions CircleLayer::getCircleTranslateAnchorTransition() const { + return impl().paint.template get<CircleTranslateAnchor>().options; } using namespace conversion; optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Convertible& value) { enum class Property : uint8_t { - CircleRadius, - CircleColor, CircleBlur, + CircleColor, CircleOpacity, - CircleTranslate, - CircleTranslateAnchor, - CirclePitchScale, CirclePitchAlignment, - CircleStrokeWidth, + CirclePitchScale, + CircleRadius, CircleStrokeColor, CircleStrokeOpacity, - CircleRadiusTransition, - CircleColorTransition, + CircleStrokeWidth, + CircleTranslate, + CircleTranslateAnchor, CircleBlurTransition, + CircleColorTransition, CircleOpacityTransition, - CircleTranslateTransition, - CircleTranslateAnchorTransition, - CirclePitchScaleTransition, CirclePitchAlignmentTransition, - CircleStrokeWidthTransition, + CirclePitchScaleTransition, + CircleRadiusTransition, CircleStrokeColorTransition, CircleStrokeOpacityTransition, + CircleStrokeWidthTransition, + CircleTranslateTransition, + CircleTranslateAnchorTransition, }; MAPBOX_ETERNAL_CONSTEXPR const auto properties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>({ - { "circle-radius", static_cast<uint8_t>(Property::CircleRadius) }, - { "circle-color", static_cast<uint8_t>(Property::CircleColor) }, { "circle-blur", static_cast<uint8_t>(Property::CircleBlur) }, + { "circle-color", static_cast<uint8_t>(Property::CircleColor) }, { "circle-opacity", static_cast<uint8_t>(Property::CircleOpacity) }, - { "circle-translate", static_cast<uint8_t>(Property::CircleTranslate) }, - { "circle-translate-anchor", static_cast<uint8_t>(Property::CircleTranslateAnchor) }, - { "circle-pitch-scale", static_cast<uint8_t>(Property::CirclePitchScale) }, { "circle-pitch-alignment", static_cast<uint8_t>(Property::CirclePitchAlignment) }, - { "circle-stroke-width", static_cast<uint8_t>(Property::CircleStrokeWidth) }, + { "circle-pitch-scale", static_cast<uint8_t>(Property::CirclePitchScale) }, + { "circle-radius", static_cast<uint8_t>(Property::CircleRadius) }, { "circle-stroke-color", static_cast<uint8_t>(Property::CircleStrokeColor) }, { "circle-stroke-opacity", static_cast<uint8_t>(Property::CircleStrokeOpacity) }, - { "circle-radius-transition", static_cast<uint8_t>(Property::CircleRadiusTransition) }, - { "circle-color-transition", static_cast<uint8_t>(Property::CircleColorTransition) }, + { "circle-stroke-width", static_cast<uint8_t>(Property::CircleStrokeWidth) }, + { "circle-translate", static_cast<uint8_t>(Property::CircleTranslate) }, + { "circle-translate-anchor", static_cast<uint8_t>(Property::CircleTranslateAnchor) }, { "circle-blur-transition", static_cast<uint8_t>(Property::CircleBlurTransition) }, + { "circle-color-transition", static_cast<uint8_t>(Property::CircleColorTransition) }, { "circle-opacity-transition", static_cast<uint8_t>(Property::CircleOpacityTransition) }, - { "circle-translate-transition", static_cast<uint8_t>(Property::CircleTranslateTransition) }, - { "circle-translate-anchor-transition", static_cast<uint8_t>(Property::CircleTranslateAnchorTransition) }, - { "circle-pitch-scale-transition", static_cast<uint8_t>(Property::CirclePitchScaleTransition) }, { "circle-pitch-alignment-transition", static_cast<uint8_t>(Property::CirclePitchAlignmentTransition) }, - { "circle-stroke-width-transition", static_cast<uint8_t>(Property::CircleStrokeWidthTransition) }, + { "circle-pitch-scale-transition", static_cast<uint8_t>(Property::CirclePitchScaleTransition) }, + { "circle-radius-transition", static_cast<uint8_t>(Property::CircleRadiusTransition) }, { "circle-stroke-color-transition", static_cast<uint8_t>(Property::CircleStrokeColorTransition) }, - { "circle-stroke-opacity-transition", static_cast<uint8_t>(Property::CircleStrokeOpacityTransition) } + { "circle-stroke-opacity-transition", static_cast<uint8_t>(Property::CircleStrokeOpacityTransition) }, + { "circle-stroke-width-transition", static_cast<uint8_t>(Property::CircleStrokeWidthTransition) }, + { "circle-translate-transition", static_cast<uint8_t>(Property::CircleTranslateTransition) }, + { "circle-translate-anchor-transition", static_cast<uint8_t>(Property::CircleTranslateAnchorTransition) } }); const auto it = properties.find(name.c_str()); @@ -421,18 +421,13 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con auto property = static_cast<Property>(it->second); - if (property == Property::CircleRadius || property == Property::CircleBlur || property == Property::CircleOpacity || property == Property::CircleStrokeWidth || property == Property::CircleStrokeOpacity) { + if (property == Property::CircleBlur || property == Property::CircleOpacity || property == Property::CircleRadius || property == Property::CircleStrokeOpacity || property == Property::CircleStrokeWidth) { Error error; optional<PropertyValue<float>> typedValue = convert<PropertyValue<float>>(value, error, true, false); if (!typedValue) { return error; } - if (property == Property::CircleRadius) { - setCircleRadius(*typedValue); - return nullopt; - } - if (property == Property::CircleBlur) { setCircleBlur(*typedValue); return nullopt; @@ -443,8 +438,8 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con return nullopt; } - if (property == Property::CircleStrokeWidth) { - setCircleStrokeWidth(*typedValue); + if (property == Property::CircleRadius) { + setCircleRadius(*typedValue); return nullopt; } @@ -453,6 +448,11 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con return nullopt; } + if (property == Property::CircleStrokeWidth) { + setCircleStrokeWidth(*typedValue); + return nullopt; + } + } if (property == Property::CircleColor || property == Property::CircleStrokeColor) { @@ -474,50 +474,50 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con } - if (property == Property::CircleTranslate) { + if (property == Property::CirclePitchAlignment) { Error error; - optional<PropertyValue<std::array<float, 2>>> typedValue = convert<PropertyValue<std::array<float, 2>>>(value, error, false, false); + optional<PropertyValue<AlignmentType>> typedValue = convert<PropertyValue<AlignmentType>>(value, error, false, false); if (!typedValue) { return error; } - setCircleTranslate(*typedValue); + setCirclePitchAlignment(*typedValue); return nullopt; } - if (property == Property::CircleTranslateAnchor) { + if (property == Property::CirclePitchScale) { Error error; - optional<PropertyValue<TranslateAnchorType>> typedValue = convert<PropertyValue<TranslateAnchorType>>(value, error, false, false); + optional<PropertyValue<CirclePitchScaleType>> typedValue = convert<PropertyValue<CirclePitchScaleType>>(value, error, false, false); if (!typedValue) { return error; } - setCircleTranslateAnchor(*typedValue); + setCirclePitchScale(*typedValue); return nullopt; } - if (property == Property::CirclePitchScale) { + if (property == Property::CircleTranslate) { Error error; - optional<PropertyValue<CirclePitchScaleType>> typedValue = convert<PropertyValue<CirclePitchScaleType>>(value, error, false, false); + optional<PropertyValue<std::array<float, 2>>> typedValue = convert<PropertyValue<std::array<float, 2>>>(value, error, false, false); if (!typedValue) { return error; } - setCirclePitchScale(*typedValue); + setCircleTranslate(*typedValue); return nullopt; } - if (property == Property::CirclePitchAlignment) { + if (property == Property::CircleTranslateAnchor) { Error error; - optional<PropertyValue<AlignmentType>> typedValue = convert<PropertyValue<AlignmentType>>(value, error, false, false); + optional<PropertyValue<TranslateAnchorType>> typedValue = convert<PropertyValue<TranslateAnchorType>>(value, error, false, false); if (!typedValue) { return error; } - setCirclePitchAlignment(*typedValue); + setCircleTranslateAnchor(*typedValue); return nullopt; } @@ -529,8 +529,8 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con return error; } - if (property == Property::CircleRadiusTransition) { - setCircleRadiusTransition(*transition); + if (property == Property::CircleBlurTransition) { + setCircleBlurTransition(*transition); return nullopt; } @@ -539,33 +539,33 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con return nullopt; } - if (property == Property::CircleBlurTransition) { - setCircleBlurTransition(*transition); + if (property == Property::CircleOpacityTransition) { + setCircleOpacityTransition(*transition); return nullopt; } - if (property == Property::CircleOpacityTransition) { - setCircleOpacityTransition(*transition); + if (property == Property::CirclePitchAlignmentTransition) { + setCirclePitchAlignmentTransition(*transition); return nullopt; } - if (property == Property::CircleTranslateTransition) { - setCircleTranslateTransition(*transition); + if (property == Property::CirclePitchScaleTransition) { + setCirclePitchScaleTransition(*transition); return nullopt; } - if (property == Property::CircleTranslateAnchorTransition) { - setCircleTranslateAnchorTransition(*transition); + if (property == Property::CircleRadiusTransition) { + setCircleRadiusTransition(*transition); return nullopt; } - if (property == Property::CirclePitchScaleTransition) { - setCirclePitchScaleTransition(*transition); + if (property == Property::CircleStrokeColorTransition) { + setCircleStrokeColorTransition(*transition); return nullopt; } - if (property == Property::CirclePitchAlignmentTransition) { - setCirclePitchAlignmentTransition(*transition); + if (property == Property::CircleStrokeOpacityTransition) { + setCircleStrokeOpacityTransition(*transition); return nullopt; } @@ -574,13 +574,13 @@ optional<Error> CircleLayer::setPaintProperty(const std::string& name, const Con return nullopt; } - if (property == Property::CircleStrokeColorTransition) { - setCircleStrokeColorTransition(*transition); + if (property == Property::CircleTranslateTransition) { + setCircleTranslateTransition(*transition); return nullopt; } - if (property == Property::CircleStrokeOpacityTransition) { - setCircleStrokeOpacityTransition(*transition); + if (property == Property::CircleTranslateAnchorTransition) { + setCircleTranslateAnchorTransition(*transition); return nullopt; } |