diff options
Diffstat (limited to 'platform/darwin/src/MGLStyleValue_Private.h')
| -rw-r--r-- | platform/darwin/src/MGLStyleValue_Private.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/platform/darwin/src/MGLStyleValue_Private.h b/platform/darwin/src/MGLStyleValue_Private.h index 492ce20f1a..2c3de3fb74 100644 --- a/platform/darwin/src/MGLStyleValue_Private.h +++ b/platform/darwin/src/MGLStyleValue_Private.h @@ -4,7 +4,6 @@ #import "NSValue+MGLStyleAttributeAdditions.h" #import "MGLTypes.h" -#import "MGLLineStyleLayer.h" #import <mbgl/util/enum.hpp> #if TARGET_OS_IPHONE @@ -42,7 +41,7 @@ public: for (const auto &mbglStop : mbglStops) { stops[@(mbglStop.first)] = toEnumStyleConstantValue<>(mbglStop.second); } - return [MGLStyleFunction<NSValue *> functionWithBase:mbglValue.asFunction().getBase() stops:stops]; + return [MGLStyleFunction<NSValue *> functionWithInterpolationBase:mbglValue.asFunction().getBase() stops:stops]; } else { return nil; } @@ -62,7 +61,7 @@ public: NSCAssert(mbglStopValue.isConstant(), @"Stops must be constant"); mbglStops.emplace_back(zoomKey.floatValue, mbglStopValue.asConstant()); }]; - return mbgl::style::Function<MBGLType>({{mbglStops}}, function.base); + return mbgl::style::Function<MBGLType>({{mbglStops}}, function.interpolationBase); } else if (value) { [NSException raise:@"MGLAbstractClassException" format: @"The style value %@ cannot be applied to the style. " @@ -92,7 +91,7 @@ public: NSCAssert(mbglStopValue.isConstant(), @"Stops must be constant"); mbglStops.emplace_back(zoomKey.floatValue, mbglStopValue.asConstant()); }]; - return mbgl::style::Function<MBGLEnum>({{mbglStops}}, function.base); + return mbgl::style::Function<MBGLEnum>({{mbglStops}}, function.interpolationBase); } else if (value) { [NSException raise:@"MGLAbstractClassException" format: @"The style value %@ cannot be applied to the style. " @@ -118,7 +117,7 @@ private: auto rawValue = toMGLRawStyleValue(mbglStop.second); stops[@(mbglStop.first)] = [MGLStyleValue valueWithRawValue:rawValue]; } - return [MGLStyleFunction<ObjCType> functionWithBase:mbglFunction.getBase() stops:stops]; + return [MGLStyleFunction<ObjCType> functionWithInterpolationBase:mbglFunction.getBase() stops:stops]; } template <typename MBGLEnum = MBGLType, |