[core] DDPropertyValue --> PropertyValue

mapbox · Aug 3, 2018 · fa383f5 · fa383f5
1 parent e7534fc
commit fa383f5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
@@ -109,9 +109,9 @@ class LineLayer : public Layer {
     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
@@ -661,7 +661,7 @@ - (void)testProperties {
 
         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
@@ -404,15 +404,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
@@ -42,8 +42,8 @@ class DataDrivenPaintProperty {
 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;