summaryrefslogtreecommitdiff
path: root/src/mbgl/style/property_parsing.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/style/property_parsing.cpp')
-rw-r--r--src/mbgl/style/property_parsing.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/style/property_parsing.cpp b/src/mbgl/style/property_parsing.cpp
index 67baa3ec8d..9f60ddf3b6 100644
--- a/src/mbgl/style/property_parsing.cpp
+++ b/src/mbgl/style/property_parsing.cpp
@@ -1,11 +1,11 @@
#include <mbgl/style/property_parsing.hpp>
-#include <mbgl/style/property_transition.hpp>
#include <mbgl/platform/log.hpp>
#include <csscolorparser/csscolorparser.hpp>
namespace mbgl {
+namespace style {
template <>
optional<bool> parseConstant(const char* name, const JSValue& value) {
@@ -264,7 +264,7 @@ optional<std::vector<std::string>> parseConstant(const char* name, const JSValue
return result;
}
-optional<PropertyTransition> parsePropertyTransition(const char *, const JSValue& value) {
+optional<TransitionOptions> parseTransitionOptions(const char *, const JSValue& value) {
if (!value.IsObject()) {
return {};
}
@@ -283,7 +283,8 @@ optional<PropertyTransition> parsePropertyTransition(const char *, const JSValue
return {};
}
- return PropertyTransition(duration, delay);
+ return TransitionOptions(duration, delay);
}
+} // namespace style
} // namespace mbgl