diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-07 12:35:27 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-09 11:16:26 -0600 |
| commit | f35ca0d9dfc8a6ba88273edbeda43e633ae0adce (patch) | |
| tree | 74c11b9c7125c22516a5cbc46322763a72964c43 /platform/darwin/test/MGLFillStyleLayerTests.mm | |
| parent | 9df24addfbfd922baada7d9778f402b91e69ed33 (diff) | |
| download | qtlocation-mapboxgl-f35ca0d9dfc8a6ba88273edbeda43e633ae0adce.tar.gz | |
[core, ios, macos] Refactor composite stop types and conversions
Diffstat (limited to 'platform/darwin/test/MGLFillStyleLayerTests.mm')
| -rw-r--r-- | platform/darwin/test/MGLFillStyleLayerTests.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/darwin/test/MGLFillStyleLayerTests.mm b/platform/darwin/test/MGLFillStyleLayerTests.mm index 9aeba53174..b3e0465c87 100644 --- a/platform/darwin/test/MGLFillStyleLayerTests.mm +++ b/platform/darwin/test/MGLFillStyleLayerTests.mm @@ -122,8 +122,8 @@ functionStyleValue = [MGLStyleValue<MGLColor *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.fillColor = functionStyleValue; - mbgl::style::ExponentialStops<mbgl::Color> innerStops = { { {18, { 1, 0, 0, 1 }}}, 1.0 }; - std::map<float, mbgl::style::ExponentialStops<mbgl::Color>> compositeStops = { {10.0, innerStops} }; + std::map<float, mbgl::Color> innerStops { {18, { 1, 0, 0, 1 }} }; + mbgl::style::CompositeExponentialStops<mbgl::Color> compositeStops { { {10.0, innerStops} }, 1.0 }; propertyValue = mbgl::style::CompositeFunction<mbgl::Color> { "keyName", compositeStops }; @@ -179,8 +179,8 @@ functionStyleValue = [MGLStyleValue<NSNumber *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.fillOpacity = functionStyleValue; - mbgl::style::ExponentialStops<float> innerStops = { { {18, 0xff}}, 1.0 }; - std::map<float, mbgl::style::ExponentialStops<float>> compositeStops = { {10.0, innerStops} }; + std::map<float, float> innerStops { {18, 0xff} }; + mbgl::style::CompositeExponentialStops<float> compositeStops { { {10.0, innerStops} }, 1.0 }; propertyValue = mbgl::style::CompositeFunction<float> { "keyName", compositeStops }; @@ -236,8 +236,8 @@ functionStyleValue = [MGLStyleValue<MGLColor *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.fillOutlineColor = functionStyleValue; - mbgl::style::ExponentialStops<mbgl::Color> innerStops = { { {18, { 1, 0, 0, 1 }}}, 1.0 }; - std::map<float, mbgl::style::ExponentialStops<mbgl::Color>> compositeStops = { {10.0, innerStops} }; + std::map<float, mbgl::Color> innerStops { {18, { 1, 0, 0, 1 }} }; + mbgl::style::CompositeExponentialStops<mbgl::Color> compositeStops { { {10.0, innerStops} }, 1.0 }; propertyValue = mbgl::style::CompositeFunction<mbgl::Color> { "keyName", compositeStops }; |