diff options
author | Molly Lloyd <molly@mapbox.com> | 2018-08-02 17:14:19 -0700 |
---|---|---|
committer | Molly Lloyd <molly@mapbox.com> | 2018-08-27 13:13:47 -0700 |
commit | a1932e46ec4ce2893222750d1f05e18452401e56 (patch) | |
tree | db69d5dfbba9773e58509ee56be83723ae8656ca | |
parent | 6182f4d48a99a8c9699d47aeea214db7ec462ee0 (diff) | |
download | qtlocation-mapboxgl-a1932e46ec4ce2893222750d1f05e18452401e56.tar.gz |
[core] DDPropertyValue --> PropertyValue
-rw-r--r-- | include/mbgl/style/layers/line_layer.hpp | 6 | ||||
-rw-r--r-- | platform/darwin/test/MGLLineStyleLayerTests.mm | 2 | ||||
-rw-r--r-- | src/mbgl/style/layers/line_layer.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/style/paint_property.hpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp index 530f531d2f..9350b3d102 100644 --- a/include/mbgl/style/layers/line_layer.hpp +++ b/include/mbgl/style/layers/line_layer.hpp @@ -114,9 +114,9 @@ public: void setLineDasharrayTransition(const TransitionOptions&); TransitionOptions getLineDasharrayTransition() const; - static DataDrivenPropertyValue<std::string> getDefaultLinePattern(); - DataDrivenPropertyValue<std::string> getLinePattern() const; - void setLinePattern(DataDrivenPropertyValue<std::string>); + static PropertyValue<std::string> getDefaultLinePattern(); + PropertyValue<std::string> getLinePattern() const; + void setLinePattern(PropertyValue<std::string>); void setLinePatternTransition(const TransitionOptions&); TransitionOptions getLinePatternTransition() const; diff --git a/platform/darwin/test/MGLLineStyleLayerTests.mm b/platform/darwin/test/MGLLineStyleLayerTests.mm index 3b00f02c0a..7289debb94 100644 --- a/platform/darwin/test/MGLLineStyleLayerTests.mm +++ b/platform/darwin/test/MGLLineStyleLayerTests.mm @@ -661,7 +661,7 @@ NSExpression *constantExpression = [NSExpression expressionWithFormat:@"'Line Pattern'"]; layer.linePattern = constantExpression; - mbgl::style::DataDrivenPropertyValue<std::string> propertyValue = { "Line Pattern" }; + mbgl::style::PropertyValue<std::string> propertyValue = { "Line Pattern" }; XCTAssertEqual(rawLayer->getLinePattern(), propertyValue, @"Setting linePattern to a constant value expression should update line-pattern."); XCTAssertEqualObjects(layer.linePattern, constantExpression, diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp index 6ca533b5fb..1ddc690cc7 100644 --- a/src/mbgl/style/layers/line_layer.cpp +++ b/src/mbgl/style/layers/line_layer.cpp @@ -411,15 +411,15 @@ TransitionOptions LineLayer::getLineDasharrayTransition() const { return impl().paint.template get<LineDasharray>().options; } -DataDrivenPropertyValue<std::string> LineLayer::getDefaultLinePattern() { +PropertyValue<std::string> LineLayer::getDefaultLinePattern() { return { "" }; } -DataDrivenPropertyValue<std::string> LineLayer::getLinePattern() const { +PropertyValue<std::string> LineLayer::getLinePattern() const { return impl().paint.template get<LinePattern>().value; } -void LineLayer::setLinePattern(DataDrivenPropertyValue<std::string> value) { +void LineLayer::setLinePattern(PropertyValue<std::string> value) { if (value == getLinePattern()) return; auto impl_ = mutableImpl(); diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index 48d7609910..58de3354fb 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -42,8 +42,8 @@ public: template <class T, class A1, class U1, class A2, class U2> class CrossFadedDataDrivenPaintProperty { public: - using TransitionableType = Transitionable<DataDrivenPropertyValue<T>>; - using UnevaluatedType = Transitioning<DataDrivenPropertyValue<T>>; + using TransitionableType = Transitionable<PropertyValue<T>>; + using UnevaluatedType = Transitioning<PropertyValue<T>>; using EvaluatorType = DataDrivenPropertyEvaluator<Faded<T>>; using PossiblyEvaluatedType = PossiblyEvaluatedPropertyValue<Faded<T>>; using Type = T; |