Merge branch 'ios-unused'

Left in MGLTypes.h, which is now a platform-neutral (iOS + OS X) place for MGLUserTrackingMode.

6 files changed, 0 insertions, 68 deletions

diff --git a/include/mbgl/ios/MGLStyleFunctionValue.h b/include/mbgl/ios/MGLStyleFunctionValue.h
deleted file mode 100644
index 27a867548b..0000000000
--- a/include/mbgl/ios/MGLStyleFunctionValue.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface MGLStyleFunctionValue : NSObject
-
-+ (instancetype)linearFunctionWithBaseZoomLevel:(CGFloat)zBase
-                                   initialValue:(CGFloat)val
-                                          slope:(CGFloat)slope
-                                   minimumValue:(CGFloat)min
-                                   maximumValue:(CGFloat)max;
-
-+ (instancetype)exponentialFunctionWithBaseZoomLevel:(CGFloat)zBase
-                                        initialValue:(CGFloat)val
-                                               slope:(CGFloat)slope
-                                        minimumValue:(CGFloat)min
-                                        maximumValue:(CGFloat)max;
-
-+ (instancetype)minimumZoomLevelFunction:(CGFloat)minimumZoom;
-
-+ (instancetype)maximumZoomLevelFunction:(CGFloat)maximumZoom;
-
-+ (instancetype)stopsFunctionWithZoomLevelsAndValues:(NSNumber *)firstZoom, ... NS_REQUIRES_NIL_TERMINATION;
-
-@end
diff --git a/include/mbgl/ios/MGLTypes.h b/include/mbgl/ios/MGLTypes.h
index 0d7ae5f6d1..4c2e58b24b 100644
--- a/include/mbgl/ios/MGLTypes.h
+++ b/include/mbgl/ios/MGLTypes.h
@@ -1,21 +1,5 @@
 #import <Foundation/Foundation.h>
 
-// style property value types
-//
-extern NSString *const MGLStyleValueTypeBoolean;
-extern NSString *const MGLStyleValueTypeNumber;
-extern NSString *const MGLStyleValueTypeNumberPair;
-extern NSString *const MGLStyleValueTypeColor;
-extern NSString *const MGLStyleValueTypeString;
-
-// style property function types
-//
-extern NSString *const MGLStyleValueTypeFunctionMinimumZoom;
-extern NSString *const MGLStyleValueTypeFunctionMaximumZoom;
-extern NSString *const MGLStyleValueTypeFunctionLinear;
-extern NSString *const MGLStyleValueTypeFunctionExponential;
-extern NSString *const MGLStyleValueTypeFunctionStops;
-
 /// The degree to which the map view tracks the user’s location.
 typedef NS_ENUM(NSUInteger, MGLUserTrackingMode)
 {
diff --git a/include/mbgl/ios/MapboxGL.h b/include/mbgl/ios/MapboxGL.h
index 48ea908bba..c32915bc76 100644
--- a/include/mbgl/ios/MapboxGL.h
+++ b/include/mbgl/ios/MapboxGL.h
@@ -1,8 +1,4 @@
 #import "MGLAnnotation.h"
 #import "MGLMapView.h"
-#import "MGLStyleFunctionValue.h"
 #import "MGLTypes.h"
 #import "MGLUserLocation.h"
-#import "NSArray+MGLAdditions.h"
-#import "NSDictionary+MGLAdditions.h"
-#import "UIColor+MGLAdditions.h"
diff --git a/include/mbgl/ios/NSArray+MGLAdditions.h b/include/mbgl/ios/NSArray+MGLAdditions.h
deleted file mode 100644
index 4b87614330..0000000000
--- a/include/mbgl/ios/NSArray+MGLAdditions.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface NSArray (MGLAdditions)
-
-- (NSMutableArray *)deepMutableCopy;
-
-@end
diff --git a/include/mbgl/ios/NSDictionary+MGLAdditions.h b/include/mbgl/ios/NSDictionary+MGLAdditions.h
deleted file mode 100644
index 04c3396d41..0000000000
--- a/include/mbgl/ios/NSDictionary+MGLAdditions.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface NSDictionary (MGLAdditions)
-
-- (NSMutableDictionary *)deepMutableCopy;
-
-@end
diff --git a/include/mbgl/ios/UIColor+MGLAdditions.h b/include/mbgl/ios/UIColor+MGLAdditions.h
deleted file mode 100644
index 3758c04eef..0000000000
--- a/include/mbgl/ios/UIColor+MGLAdditions.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface UIColor (MGLAdditions)
-
-+ (UIColor *)colorWithRGBAString:(NSString *)rgbaString;
-- (NSString *)rgbaStringFromColor;
-
-+ (UIColor *)colorWithHexString:(NSString *)hexString;
-- (NSString *)hexStringFromColor;
-
-@end