diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-13 17:02:30 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-20 12:35:00 -0700 |
| commit | af89318b1d3bef15e92e591887c9d65b10be54ce (patch) | |
| tree | d3ccb07da91bb56197607f5319100e64f7493211 /platform | |
| parent | a3d988ab8520ea12272bb80a746a2d91cbc332f5 (diff) | |
| download | qtlocation-mapboxgl-af89318b1d3bef15e92e591887c9d65b10be54ce.tar.gz | |
[core] Convert token strings to expressions
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/darwin/src/MGLStyleValue_Private.h | 2 | ||||
| -rw-r--r-- | platform/glfw/glfw_view.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLStyleValue_Private.h b/platform/darwin/src/MGLStyleValue_Private.h index c1958fc032..d6e2edf3eb 100644 --- a/platform/darwin/src/MGLStyleValue_Private.h +++ b/platform/darwin/src/MGLStyleValue_Private.h @@ -86,7 +86,7 @@ public: mbgl::style::conversion::Error valueError; auto value = mbgl::style::conversion::convert<MBGLValue>( - mbgl::style::conversion::makeConvertible(jsonExpression), valueError); + mbgl::style::conversion::makeConvertible(jsonExpression), valueError, false); if (!value) { [NSException raise:NSInvalidArgumentException format:@"Invalid property value: %@", @(valueError.message.c_str())]; diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index d7cabf6244..f1cbdbbaeb 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -639,9 +639,9 @@ void GLFWView::toggle3DExtrusions(bool visible) { extrusionLayer->setFilter(Filter(eq(get("extrude"), literal("true")))); extrusionLayer->setFillExtrusionColor(PropertyExpression<mbgl::Color>( interpolate(linear(), number(get("height")), - 0.f, toColor("#160e23"), - 50.f, toColor("#00615f"), - 100.f, toColor("#55e9ff")))); + 0.f, toColor(literal("#160e23")), + 50.f, toColor(literal("#00615f")), + 100.f, toColor(literal("#55e9ff"))))); extrusionLayer->setFillExtrusionOpacity(0.6f); extrusionLayer->setFillExtrusionHeight(PropertyExpression<float>(get("height"))); extrusionLayer->setFillExtrusionBase(PropertyExpression<float>(get("min_height"))); |