Merge pull request #1193 from mapbox/location-fixes

fix compilation error with private category property

3 files changed, 8 insertions, 2 deletions

diff --git a/platform/ios/MGLUserLocation.m b/platform/ios/MGLUserLocation.m
index acc3de75b5..91e8e30103 100644
--- a/platform/ios/MGLUserLocation.m
+++ b/platform/ios/MGLUserLocation.m
@@ -2,6 +2,12 @@
 
 #import "MGLMapView.h"
 
+@interface MGLUserLocation ()
+
+@property (nonatomic, weak) MGLMapView *mapView;
+
+@end
+
 @implementation MGLUserLocation
 
 - (instancetype)init
diff --git a/platform/ios/MGLUserLocationAnnotationView.h b/platform/ios/MGLUserLocationAnnotationView.h
index c72d64ed8f..a9f3bb0a0e 100644
--- a/platform/ios/MGLUserLocationAnnotationView.h
+++ b/platform/ios/MGLUserLocationAnnotationView.h
@@ -1,9 +1,8 @@
 #import <UIKit/UIKit.h>
 #import <CoreLocation/CoreLocation.h>
 
-#import "MGLUserLocation.h"
-
 @class MGLMapView;
+@class MGLUserLocation;
 
 /** The MGLUserLocationAnnotationView class defines a specific type of annotation that identifies the user’s current location. You do not create instances of this class directly. Instead, you retrieve an existing MGLUserLocationAnnotationView object from the userLocation property of the map view displayed in your application. */
 @interface MGLUserLocationAnnotationView : UIView
diff --git a/platform/ios/MGLUserLocationAnnotationView.m b/platform/ios/MGLUserLocationAnnotationView.m
index 0dcc48076f..7a68d711f0 100644
--- a/platform/ios/MGLUserLocationAnnotationView.m
+++ b/platform/ios/MGLUserLocationAnnotationView.m
@@ -1,5 +1,6 @@
 #import "MGLUserLocationAnnotationView.h"
 
+#import "MGLUserLocation.h"
 #import "MGLUserLocation_Private.h"
 #import "MGLAnnotation.h"
 #import "MGLMapView.h"