[ios] check rgba value

3 files changed, 13 insertions, 2 deletions

diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index a7bab2108a..d6388f3495 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -871,7 +871,10 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
     MGLStyleValue *waterColorFunction = [MGLStyleValue<UIColor *> valueWithInterpolationMode:MGLInterpolationModeExponential
                                                                                  cameraStops:waterColorStops
                                                                                      options: nil];
-    waterLayer.fillColor = waterColorFunction;
+//    waterLayer.fillColor = waterColorFunction;
+    
+    // jk
+    waterLayer.fillColor = [MGLStyleValue valueWithRawValue:[UIColor colorWithRed:40 green:0 blue:10 alpha:1]];
 
     NSDictionary *fillAntialiasedStops = @{@11: [MGLStyleValue<NSNumber *> valueWithRawValue:@YES],
                                            @12: [MGLStyleValue<NSNumber *> valueWithRawValue:@NO],
diff --git a/platform/ios/src/UIColor+MGLAdditions.h b/platform/ios/src/UIColor+MGLAdditions.h
index ea415d9db9..ca96ba3d90 100644
--- a/platform/ios/src/UIColor+MGLAdditions.h
+++ b/platform/ios/src/UIColor+MGLAdditions.h
@@ -9,6 +9,8 @@
 
 - (mbgl::style::PropertyValue<mbgl::Color>)mgl_colorPropertyValue;
 
+- (CGFloat)cap_rgba:(CGFloat)num;
+
 + (UIColor *)mgl_colorWithColor:(mbgl::Color)color;
 
 @end
diff --git a/platform/ios/src/UIColor+MGLAdditions.mm b/platform/ios/src/UIColor+MGLAdditions.mm
index 41c066c206..54698fae2a 100644
--- a/platform/ios/src/UIColor+MGLAdditions.mm
+++ b/platform/ios/src/UIColor+MGLAdditions.mm
@@ -5,8 +5,9 @@
 - (mbgl::Color)mgl_color
 {
     CGFloat r, g, b, a;
+    
     [self getRed:&r green:&g blue:&b alpha:&a];
-    return { (float)r, (float)g, (float)b, (float)a };
+    return { (float)[self cap_rgba:r], (float)[self cap_rgba:g], (float)[self cap_rgba:b], (float)[self cap_rgba:a] };
 }
 
 - (mbgl::style::PropertyValue<mbgl::Color>)mgl_colorPropertyValue
@@ -15,6 +16,11 @@
     return {{ color.r, color.g, color.b, color.a }};
 }
 
+- (CGFloat)cap_rgba:(CGFloat)num
+{
+    return (num > 1.0) ? 1.0 : (num < 0.0) ? 0.0 : num;
+}
+
 + (UIColor *)mgl_colorWithColor:(mbgl::Color)color
 {
     return [UIColor colorWithRed:color.r green:color.g blue:color.b alpha:color.a];