tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept constant expressions in non-dds properties (#11961)

Browse Source 
Closes #11940
This commit is contained in:
Anand Thakker
2018-05-24 09:06:20 -04:00
committed by GitHub
parent 755a58ca82
commit 40da4daded
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/mbgl/style/conversion/property_value.hpp
View File

@@ -29,11 +29,19 @@ struct Converter<PropertyValue<T>> {
return {};
}
if (isFeatureConstant(**expression)) {
return { CameraFunction<T>(std::move(*expression)) };
} else {
if (!isFeatureConstant(**expression)) {
error = { "property expressions not supported" };
return {};
} else if (!isZoomConstant(**expression)) {
return { CameraFunction<T>(std::move(*expression)) };
} else {
auto literal = dynamic_cast<Literal*>(expression->get());
assert(literal);
optional<T> constant = fromExpressionValue<T>(literal->getValue());
if (!constant) {
return {};
}
return PropertyValue<T>(*constant);
}
} else if (isObject(value)) {
optional<CameraFunction<T>> function = convert<CameraFunction<T>>(value, error);