[ios, macos] Implement default value for identity functions

mapbox · Feb 3, 2017 · e5c9db4 · e5c9db4
1 parent 4867db5
commit e5c9db4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 25 deletions.
diff --git a/platform/darwin/src/MGLStyleValue_Private.h b/platform/darwin/src/MGLStyleValue_Private.h
@@ -367,13 +367,7 @@ class MGLStyleValueTransformer {
  }];
  mbgl::style::CategoricalStops<MBGLType> categoricalStops = {stops};
  mbgl::style::SourceFunction<MBGLType> sourceFunction = {sourceStyleFunction.attributeName.UTF8String, categoricalStops};
- if (sourceStyleFunction.defaultValue) {
- NSCAssert([sourceStyleFunction.defaultValue isKindOfClass:[MGLStyleConstantValue class]], @"Default value must be constant");
- MBGLType mbglValue;
- id mglValue = [(MGLStyleConstantValue<ObjCType> *)sourceStyleFunction.defaultValue rawValue];
- getMBGLValue(mglValue, mbglValue);
- sourceFunction.defaultValue = mbglValue;
- }
+ setDefaultMBGLValue(sourceStyleFunction, sourceFunction);
  return sourceFunction;
  }
 
@@ -387,13 +381,7 @@ class MGLStyleValueTransformer {
  }];
  mbgl::style::ExponentialStops<MBGLType> exponentialStops = {stops, (float)sourceStyleFunction.interpolationBase};
  mbgl::style::SourceFunction<MBGLType> sourceFunction = {sourceStyleFunction.attributeName.UTF8String, exponentialStops};
- if (sourceStyleFunction.defaultValue) {
- NSCAssert([sourceStyleFunction.defaultValue isKindOfClass:[MGLStyleConstantValue class]], @"Default value must be constant");
- MBGLType mbglValue;
- id mglValue = [(MGLStyleConstantValue<ObjCType> *)sourceStyleFunction.defaultValue rawValue];
- getMBGLValue(mglValue, mbglValue);
- sourceFunction.defaultValue = mbglValue;
- }
+ setDefaultMBGLValue(sourceStyleFunction, sourceFunction);
  return sourceFunction;
  }
 
@@ -407,22 +395,27 @@ class MGLStyleValueTransformer {
  }];
  mbgl::style::IntervalStops<MBGLType> intervalStops = {stops};
  mbgl::style::SourceFunction<MBGLType> sourceFunction = {sourceStyleFunction.attributeName.UTF8String, intervalStops};
- if (sourceStyleFunction.defaultValue) {
- NSCAssert([sourceStyleFunction.defaultValue isKindOfClass:[MGLStyleConstantValue class]], @"Default value must be constant");
- MBGLType mbglValue;
- id mglValue = [(MGLStyleConstantValue<ObjCType> *)sourceStyleFunction.defaultValue rawValue];
- getMBGLValue(mglValue, mbglValue);
- sourceFunction.defaultValue = mbglValue;
- }
+ setDefaultMBGLValue(sourceStyleFunction, sourceFunction);
  return sourceFunction;
  }
 
  mbgl::style::SourceFunction<MBGLType> toMBGLIdentitySourceFunction(MGLSourceStyleFunction<ObjCType> *sourceStyleFunction) {
  mbgl::style::IdentityStops<MBGLType> identityStops;
  mbgl::style::SourceFunction<MBGLType> sourceFunction = {sourceStyleFunction.attributeName.UTF8String, identityStops};
+ setDefaultMBGLValue(sourceStyleFunction, sourceFunction);
  return sourceFunction;
  }
 
+ void setDefaultMBGLValue(MGLSourceStyleFunction<ObjCType> *sourceStyleFunction, mbgl::style::SourceFunction<MBGLType> &sourceFunction) {
+ if (sourceStyleFunction.defaultValue) {
+ NSCAssert([sourceStyleFunction.defaultValue isKindOfClass:[MGLStyleConstantValue class]], @"Default value must be constant");
+ MBGLType mbglValue;
+ id mglValue = [(MGLStyleConstantValue<ObjCType> *)sourceStyleFunction.defaultValue rawValue];
+ getMBGLValue(mglValue, mbglValue);
+ sourceFunction.defaultValue = mbglValue;
+ }
+ }
+
  // Bool
  void getMBGLValue(NSNumber *rawValue, bool &mbglValue) {
  mbglValue = !!rawValue.boolValue;
@@ -638,9 +631,13 @@ class MGLStyleValueTransformer {
  }
 
  id operator()(const mbgl::style::IdentityStops<MBGLType> &mbglStops) {
- return [MGLSourceStyleFunction functionWithInterpolationMode:MGLInterpolationModeIdentity
- stops:nil
- attributeName:@(mbglFunction.property.c_str()) options:nil];
+ MGLSourceStyleFunction *sourceFunction = [MGLSourceStyleFunction functionWithInterpolationMode:MGLInterpolationModeIdentity
+ stops:nil
+ attributeName:@(mbglFunction.property.c_str()) options:nil];
+ if (mbglFunction.defaultValue) {
+ sourceFunction.defaultValue = [MGLStyleValue valueWithRawValue:toMGLRawStyleValue(*mbglFunction.defaultValue)];
+ }
+ return sourceFunction;
  }
 
  const mbgl::style::SourceFunction<MBGLType> &mbglFunction;

diff --git a/platform/darwin/test/MGLStyleValueTests.swift b/platform/darwin/test/MGLStyleValueTests.swift
@@ -164,7 +164,7 @@ extension MGLStyleValueTests {
  interpolationMode: .identity,
  sourceStops: nil,
  attributeName: "size",
- options: nil
+ options: [.defaultValue: MGLStyleValue<UIColor>(rawValue: .green)]
  )
  circleStyleLayer.circleColor = expectedSourceIdentityValue
  XCTAssertEqual(circleStyleLayer.circleColor, expectedSourceIdentityValue)