diff options
Diffstat (limited to 'platform/darwin/test/MGLCircleStyleLayerTests.mm')
-rw-r--r-- | platform/darwin/test/MGLCircleStyleLayerTests.mm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/platform/darwin/test/MGLCircleStyleLayerTests.mm b/platform/darwin/test/MGLCircleStyleLayerTests.mm index 2bf8aab195..2976093708 100644 --- a/platform/darwin/test/MGLCircleStyleLayerTests.mm +++ b/platform/darwin/test/MGLCircleStyleLayerTests.mm @@ -82,8 +82,8 @@ functionStyleValue = [MGLStyleValue<NSNumber *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.circleBlur = 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 }; @@ -139,8 +139,8 @@ functionStyleValue = [MGLStyleValue<MGLColor *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.circleColor = 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 }; @@ -196,8 +196,8 @@ functionStyleValue = [MGLStyleValue<NSNumber *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.circleOpacity = 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 }; @@ -253,8 +253,8 @@ functionStyleValue = [MGLStyleValue<NSNumber *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.circleRadius = 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 }; @@ -350,8 +350,8 @@ functionStyleValue = [MGLStyleValue<MGLColor *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.circleStrokeColor = 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 }; @@ -407,8 +407,8 @@ functionStyleValue = [MGLStyleValue<NSNumber *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.circleStrokeOpacity = 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 }; @@ -464,8 +464,8 @@ functionStyleValue = [MGLStyleValue<NSNumber *> valueWithInterpolationMode:MGLInterpolationModeExponential compositeStops:@{@10: @{@18: constantStyleValue}} attributeName:@"keyName" options:nil]; layer.circleStrokeWidth = 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 }; |