diff options
Diffstat (limited to 'src/mbgl/style/layers/circle_layer.cpp')
-rw-r--r-- | src/mbgl/style/layers/circle_layer.cpp | 78 |
1 files changed, 63 insertions, 15 deletions
diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp index a2b8d316d6..389ab93403 100644 --- a/src/mbgl/style/layers/circle_layer.cpp +++ b/src/mbgl/style/layers/circle_layer.cpp @@ -2,6 +2,7 @@ #include <mbgl/style/layers/circle_layer.hpp> #include <mbgl/style/layers/circle_layer_impl.hpp> +#include <mbgl/style/conversion/stringify.hpp> namespace mbgl { namespace style { @@ -27,11 +28,13 @@ std::unique_ptr<Layer> CircleLayer::Impl::clone() const { std::unique_ptr<Layer> CircleLayer::Impl::cloneRef(const std::string& id_) const { auto result = std::make_unique<CircleLayer>(*this); result->impl->id = id_; - result->impl->ref = this->id; result->impl->paint = CirclePaintProperties(); return std::move(result); } +void CircleLayer::Impl::stringifyLayout(rapidjson::Writer<rapidjson::StringBuffer>&) const { +} + // Source const std::string& CircleLayer::getSourceID() const { @@ -67,13 +70,13 @@ PropertyValue<float> CircleLayer::getDefaultCircleRadius() { } PropertyValue<float> CircleLayer::getCircleRadius(const optional<std::string>& klass) const { - return impl->paint.circleRadius.get(klass); + return impl->paint.get<CircleRadius>(klass); } void CircleLayer::setCircleRadius(PropertyValue<float> value, const optional<std::string>& klass) { if (value == getCircleRadius(klass)) return; - impl->paint.circleRadius.set(value, klass); + impl->paint.set<CircleRadius>(value, klass); impl->observer->onLayerPaintPropertyChanged(*this); } @@ -82,13 +85,13 @@ PropertyValue<Color> CircleLayer::getDefaultCircleColor() { } PropertyValue<Color> CircleLayer::getCircleColor(const optional<std::string>& klass) const { - return impl->paint.circleColor.get(klass); + return impl->paint.get<CircleColor>(klass); } void CircleLayer::setCircleColor(PropertyValue<Color> value, const optional<std::string>& klass) { if (value == getCircleColor(klass)) return; - impl->paint.circleColor.set(value, klass); + impl->paint.set<CircleColor>(value, klass); impl->observer->onLayerPaintPropertyChanged(*this); } @@ -97,13 +100,13 @@ PropertyValue<float> CircleLayer::getDefaultCircleBlur() { } PropertyValue<float> CircleLayer::getCircleBlur(const optional<std::string>& klass) const { - return impl->paint.circleBlur.get(klass); + return impl->paint.get<CircleBlur>(klass); } void CircleLayer::setCircleBlur(PropertyValue<float> value, const optional<std::string>& klass) { if (value == getCircleBlur(klass)) return; - impl->paint.circleBlur.set(value, klass); + impl->paint.set<CircleBlur>(value, klass); impl->observer->onLayerPaintPropertyChanged(*this); } @@ -112,13 +115,13 @@ PropertyValue<float> CircleLayer::getDefaultCircleOpacity() { } PropertyValue<float> CircleLayer::getCircleOpacity(const optional<std::string>& klass) const { - return impl->paint.circleOpacity.get(klass); + return impl->paint.get<CircleOpacity>(klass); } void CircleLayer::setCircleOpacity(PropertyValue<float> value, const optional<std::string>& klass) { if (value == getCircleOpacity(klass)) return; - impl->paint.circleOpacity.set(value, klass); + impl->paint.set<CircleOpacity>(value, klass); impl->observer->onLayerPaintPropertyChanged(*this); } @@ -127,13 +130,13 @@ PropertyValue<std::array<float, 2>> CircleLayer::getDefaultCircleTranslate() { } PropertyValue<std::array<float, 2>> CircleLayer::getCircleTranslate(const optional<std::string>& klass) const { - return impl->paint.circleTranslate.get(klass); + return impl->paint.get<CircleTranslate>(klass); } void CircleLayer::setCircleTranslate(PropertyValue<std::array<float, 2>> value, const optional<std::string>& klass) { if (value == getCircleTranslate(klass)) return; - impl->paint.circleTranslate.set(value, klass); + impl->paint.set<CircleTranslate>(value, klass); impl->observer->onLayerPaintPropertyChanged(*this); } @@ -142,13 +145,13 @@ PropertyValue<TranslateAnchorType> CircleLayer::getDefaultCircleTranslateAnchor( } PropertyValue<TranslateAnchorType> CircleLayer::getCircleTranslateAnchor(const optional<std::string>& klass) const { - return impl->paint.circleTranslateAnchor.get(klass); + return impl->paint.get<CircleTranslateAnchor>(klass); } void CircleLayer::setCircleTranslateAnchor(PropertyValue<TranslateAnchorType> value, const optional<std::string>& klass) { if (value == getCircleTranslateAnchor(klass)) return; - impl->paint.circleTranslateAnchor.set(value, klass); + impl->paint.set<CircleTranslateAnchor>(value, klass); impl->observer->onLayerPaintPropertyChanged(*this); } @@ -157,13 +160,58 @@ PropertyValue<CirclePitchScaleType> CircleLayer::getDefaultCirclePitchScale() { } PropertyValue<CirclePitchScaleType> CircleLayer::getCirclePitchScale(const optional<std::string>& klass) const { - return impl->paint.circlePitchScale.get(klass); + return impl->paint.get<CirclePitchScale>(klass); } void CircleLayer::setCirclePitchScale(PropertyValue<CirclePitchScaleType> value, const optional<std::string>& klass) { if (value == getCirclePitchScale(klass)) return; - impl->paint.circlePitchScale.set(value, klass); + impl->paint.set<CirclePitchScale>(value, klass); + impl->observer->onLayerPaintPropertyChanged(*this); +} + +PropertyValue<float> CircleLayer::getDefaultCircleStrokeWidth() { + return { 0 }; +} + +PropertyValue<float> CircleLayer::getCircleStrokeWidth(const optional<std::string>& klass) const { + return impl->paint.get<CircleStrokeWidth>(klass); +} + +void CircleLayer::setCircleStrokeWidth(PropertyValue<float> value, const optional<std::string>& klass) { + if (value == getCircleStrokeWidth(klass)) + return; + impl->paint.set<CircleStrokeWidth>(value, klass); + impl->observer->onLayerPaintPropertyChanged(*this); +} + +PropertyValue<Color> CircleLayer::getDefaultCircleStrokeColor() { + return { Color::black() }; +} + +PropertyValue<Color> CircleLayer::getCircleStrokeColor(const optional<std::string>& klass) const { + return impl->paint.get<CircleStrokeColor>(klass); +} + +void CircleLayer::setCircleStrokeColor(PropertyValue<Color> value, const optional<std::string>& klass) { + if (value == getCircleStrokeColor(klass)) + return; + impl->paint.set<CircleStrokeColor>(value, klass); + impl->observer->onLayerPaintPropertyChanged(*this); +} + +PropertyValue<float> CircleLayer::getDefaultCircleStrokeOpacity() { + return { 1 }; +} + +PropertyValue<float> CircleLayer::getCircleStrokeOpacity(const optional<std::string>& klass) const { + return impl->paint.get<CircleStrokeOpacity>(klass); +} + +void CircleLayer::setCircleStrokeOpacity(PropertyValue<float> value, const optional<std::string>& klass) { + if (value == getCircleStrokeOpacity(klass)) + return; + impl->paint.set<CircleStrokeOpacity>(value, klass); impl->observer->onLayerPaintPropertyChanged(*this); } |