@maplibre/maplibre-react-native 10.0.0-alpha.2 → 10.0.0-alpha.4

package/docs/CustomHttpHeaders.md

@@ -14,14 +14,14 @@ None
 
 #### IOS
 
-To enable this on iOS you need to call `[[MGLCustomHeaders sharedInstance] initHeaders]` pretty early in the lifecycle of the application. This will swizzle the custom method.
+To enable this on iOS you need to call `[[MLNCustomHeaders sharedInstance] initHeaders]` pretty early in the lifecycle of the application. This will swizzle the custom method.
 Suggested location is `[AppDelegate application: didFinishLaunchingWithOptions:]`
 
 #### Working example (AppDelegate.m)
 
 ```obj-c
 // (1) Include the header file
-#import "MGLCustomHeaders.h"
+#import "MLNCustomHeaders.h"
 
 @implementation AppDelegate
 
@@ -32,9 +32,9 @@ Suggested location is `[AppDelegate application: didFinishLaunchingWithOptions:]
                                                    moduleName:@"SampleApp"
                                             initialProperties:nil];
   // (2) Init headers, add swizzle method
-  [[MGLCustomHeaders sharedInstance] initHeaders];
+  [[MLNCustomHeaders sharedInstance] initHeaders];
   // (3*) Optionally you can add some global headers here
-  [[MGLCustomHeaders sharedInstance] addHeader:@"IP" forHeaderName:@"X-For-Real"];
+  [[MLNCustomHeaders sharedInstance] addHeader:@"IP" forHeaderName:@"X-For-Real"];
 
   ...
   return YES;

package/docs/MapView.md

@@ -9,7 +9,7 @@
 | style | `ViewProps['style']` | `none` | `false` | Style for wrapping React Native View |
 | styleURL | `string` | `none` | `false` | Style URL for map - notice, if non is set it _will_ default to `MapLibreGL.StyleURL.Default` |
 | styleJSON | `string` | `none` | `false` | StyleJSON for map - according to TileJSON specs: https://github.com/mapbox/tilejson-spec |
-| preferredFramesPerSecond | `number` | `none` | `false` | iOS: The preferred frame rate at which the map view is rendered.<br/>The default value for this property is MGLMapViewPreferredFramesPerSecondDefault,<br/>which will adaptively set the preferred frame rate based on the capability of<br/>the user’s device to maintain a smooth experience. This property can be set to arbitrary integer values.<br/><br/>Android: The maximum frame rate at which the map view is rendered, but it can't excess the ability of device hardware.<br/>This property can be set to arbitrary integer values. |
+| preferredFramesPerSecond | `number` | `none` | `false` | iOS: The preferred frame rate at which the map view is rendered.<br/>The default value for this property is MLNMapViewPreferredFramesPerSecondDefault,<br/>which will adaptively set the preferred frame rate based on the capability of<br/>the user’s device to maintain a smooth experience. This property can be set to arbitrary integer values.<br/><br/>Android: The maximum frame rate at which the map view is rendered, but it can't excess the ability of device hardware.<br/>This property can be set to arbitrary integer values. |
 | localizeLabels | `boolean` | `false` | `false` | Automatically change the language of the map labels to the system’s preferred language,<br/>this is not something that can be toggled on/off |
 | zoomEnabled | `boolean` | `none` | `false` | Enable/Disable zoom on the map |
 | scrollEnabled | `boolean` | `true` | `false` | Enable/Disable scroll on the map |

package/docs/docs.json

@@ -232,7 +232,7 @@
         "required": false,
         "type": "ViewStyle",
         "default": "none",
-        "description": "Style property for the native RCTMGLCallout container, set at your own risk."
+        "description": "Style property for the native RCTMLNCallout container, set at your own risk."
       },
       {
         "name": "contentStyle",
@@ -2444,7 +2444,7 @@
         "required": false,
         "type": "number",
         "default": "none",
-        "description": "iOS: The preferred frame rate at which the map view is rendered.\nThe default value for this property is MGLMapViewPreferredFramesPerSecondDefault,\nwhich will adaptively set the preferred frame rate based on the capability of\nthe user’s device to maintain a smooth experience. This property can be set to arbitrary integer values.\n\nAndroid: The maximum frame rate at which the map view is rendered, but it can't excess the ability of device hardware.\nThis property can be set to arbitrary integer values."
+        "description": "iOS: The preferred frame rate at which the map view is rendered.\nThe default value for this property is MLNMapViewPreferredFramesPerSecondDefault,\nwhich will adaptively set the preferred frame rate based on the capability of\nthe user’s device to maintain a smooth experience. This property can be set to arbitrary integer values.\n\nAndroid: The maximum frame rate at which the map view is rendered, but it can't excess the ability of device hardware.\nThis property can be set to arbitrary integer values."
       },
       {
         "name": "localizeLabels",

package/ios/{RCTMGL → RCTMLN}/CameraMode.h

@@ -1,6 +1,6 @@
 //
 //  CameraMode.h
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/6/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.

package/ios/{RCTMGL → RCTMLN}/CameraMode.m

@@ -1,6 +1,6 @@
 //
 //  CameraMode.m
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/6/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.

package/ios/{RCTMGL → RCTMLN}/CameraStop.h

@@ -1,13 +1,13 @@
 //
 //  CameraStop.h
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/5/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-@import Mapbox;
-#import "RCTMGLCamera.h"
+@import MapLibre;
+#import "RCTMLNCamera.h"
 
 @interface CameraStop : NSObject
 
@@ -18,7 +18,7 @@
 @property (nonatomic, assign) NSTimeInterval duration;
 
 @property (nonatomic, assign) CLLocationCoordinate2D coordinate;
-@property (nonatomic, assign) MGLCoordinateBounds bounds;
+@property (nonatomic, assign) MLNCoordinateBounds bounds;
 @property (nonatomic, assign) UIEdgeInsets padding;
 
 + (CameraStop*)fromDictionary:(NSDictionary*)args;

package/ios/{RCTMGL → RCTMLN}/CameraStop.m

@@ -1,6 +1,6 @@
 //
 //  CameraStop.m
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/5/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
@@ -8,8 +8,8 @@
 
 #import "CameraStop.h"
 #import "CameraMode.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLCamera.h"
+#import "RCTMLNUtils.h"
+#import "RCTMLNCamera.h"
 
 @implementation CameraStop
 
@@ -31,7 +31,7 @@
 -(id)init {
      if (self = [super init])  {
          self.coordinate = kCLLocationCoordinate2DInvalid;
-         self.bounds = MGLCoordinateBoundsMake(kCLLocationCoordinate2DInvalid, kCLLocationCoordinate2DInvalid);
+         self.bounds = MLNCoordinateBoundsMake(kCLLocationCoordinate2DInvalid, kCLLocationCoordinate2DInvalid);
      }
      return self;
 }
@@ -50,7 +50,7 @@
     }
 
     if (args[@"centerCoordinate"]) {
-        stop.coordinate = [RCTMGLUtils fromFeature:args[@"centerCoordinate"]];
+        stop.coordinate = [RCTMLNUtils fromFeature:args[@"centerCoordinate"]];
     }
     
     if (args[@"zoom"]) {
@@ -62,7 +62,7 @@
     }
     
     if (args[@"bounds"]) {
-        stop.bounds = [RCTMGLUtils fromFeatureCollection:args[@"bounds"]];
+        stop.bounds = [RCTMLNUtils fromFeatureCollection:args[@"bounds"]];
     }
     
     CGFloat paddingTop = args[@"paddingTop"] ? [args[@"paddingTop"] floatValue] : 0.0;
@@ -73,7 +73,7 @@
     
     NSTimeInterval duration = 2.0;
     if (args[@"duration"]) {
-        duration = [RCTMGLUtils fromMS:args[@"duration"]];
+        duration = [RCTMLNUtils fromMS:args[@"duration"]];
     }
     stop.duration = duration;
     

package/ios/{RCTMGL → RCTMLN}/CameraUpdateItem.h

@@ -1,18 +1,18 @@
 //
 //  CameraUpdateItem.h
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/6/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
 #import "CameraStop.h"
-#import "RCTMGLMapView.h"
+#import "RCTMLNMapView.h"
 
 @interface CameraUpdateItem : NSObject
 
 @property (nonatomic, strong) CameraStop* _Nonnull cameraStop;
 
-- (void)execute:(RCTMGLMapView* _Nonnull)mapView withCompletionHandler:(nullable void (^)(void))completionHandler;
+- (void)execute:(RCTMLNMapView* _Nonnull)mapView withCompletionHandler:(nullable void (^)(void))completionHandler;
 
 @end

package/ios/{RCTMGL → RCTMLN}/CameraUpdateItem.m

@@ -1,6 +1,6 @@
 //
 //  CameraUpdateItem.m
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/6/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
@@ -10,24 +10,24 @@
 #import "CameraMode.h"
 
 
-@interface MGLMapView(FlyToWithPadding)
-- (void)_flyToCamera:(MGLMapCamera *)camera edgePadding:(UIEdgeInsets)insets withDuration:(NSTimeInterval)duration peakAltitude:(CLLocationDistance)peakAltitude completionHandler:(nullable void (^)(void))completion;
+@interface MLNMapView(FlyToWithPadding)
+- (void)_flyToCamera:(MLNMapCamera *)camera edgePadding:(UIEdgeInsets)insets withDuration:(NSTimeInterval)duration peakAltitude:(CLLocationDistance)peakAltitude completionHandler:(nullable void (^)(void))completion;
 @end
 
-@interface RCTMGLCameraWithPadding : MGLMapCamera
+@interface RCTMLNCameraWithPadding : MLNMapCamera
 
-@property (nonatomic) MGLMapCamera* _Nonnull camera;
+@property (nonatomic) MLNMapCamera* _Nonnull camera;
 @property (nonatomic) UIEdgeInsets boundsPadding;
 
 @end
 
-@implementation RCTMGLCameraWithPadding
+@implementation RCTMLNCameraWithPadding
 
 @end
 
 @implementation CameraUpdateItem
 
-- (void)execute:(RCTMGLMapView *)mapView withCompletionHandler:(void (^)(void))completionHandler
+- (void)execute:(RCTMLNMapView *)mapView withCompletionHandler:(void (^)(void))completionHandler
 {
     if (_cameraStop.mode == [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_FLIGHT]) {
         [self _flyToCamera:mapView withCompletionHandler:completionHandler];
@@ -40,9 +40,9 @@
     }
 }
 
-- (void)_flyToCamera:(RCTMGLMapView*)mapView withCompletionHandler:(void (^)(void))completionHandler
+- (void)_flyToCamera:(RCTMLNMapView*)mapView withCompletionHandler:(void (^)(void))completionHandler
 {
-    RCTMGLCameraWithPadding *nextCamera = [self _makeCamera:mapView];
+    RCTMLNCameraWithPadding *nextCamera = [self _makeCamera:mapView];
 
     if ([mapView respondsToSelector:@selector(_flyToCamera:edgePadding:withDuration:peakAltitude:completionHandler:)]) {
         [mapView
@@ -59,9 +59,9 @@
     }
 }
 
-- (void)_moveCamera:(RCTMGLMapView*)mapView animated:(BOOL)animated ease:(BOOL)ease withCompletionHandler:(void (^)(void))completionHandler
+- (void)_moveCamera:(RCTMLNMapView*)mapView animated:(BOOL)animated ease:(BOOL)ease withCompletionHandler:(void (^)(void))completionHandler
 {
-        RCTMGLCameraWithPadding *nextCamera = [self _makeCamera:mapView];
+        RCTMLNCameraWithPadding *nextCamera = [self _makeCamera:mapView];
         NSString *easeFunctionName = ease ? kCAMediaTimingFunctionEaseInEaseOut : kCAMediaTimingFunctionLinear;
 
         [mapView setCamera:nextCamera.camera
@@ -71,9 +71,9 @@
                  completionHandler:completionHandler];
 }
 
-- (RCTMGLCameraWithPadding*)_makeCamera:(RCTMGLMapView*)mapView
+- (RCTMLNCameraWithPadding*)_makeCamera:(RCTMLNMapView*)mapView
 {
-    MGLMapCamera *nextCamera = [mapView.camera copy];
+    MLNMapCamera *nextCamera = [mapView.camera copy];
 
     UIEdgeInsets padding = [self _clippedPadding:_cameraStop.padding forView:mapView];
     if (padding.top <= 0 && padding.bottom <= 0) {
@@ -86,14 +86,14 @@
     bool hasSetAltitude = false;
     
     if ([self _isCoordValid:_cameraStop.coordinate]) {
-        MGLCoordinateBounds boundsFromCoord = { .sw =  _cameraStop.coordinate, .ne =  _cameraStop.coordinate };
-        MGLMapCamera *boundsCamera = [mapView
+        MLNCoordinateBounds boundsFromCoord = { .sw =  _cameraStop.coordinate, .ne =  _cameraStop.coordinate };
+        MLNMapCamera *boundsCamera = [mapView
             camera:nextCamera
             fittingCoordinateBounds:boundsFromCoord
             edgePadding: padding];
         nextCamera.centerCoordinate = boundsCamera.centerCoordinate;
     } else if ([self _areBoundsValid:_cameraStop.bounds]) {
-        MGLMapCamera *boundsCamera = [mapView
+        MLNMapCamera *boundsCamera = [mapView
             camera:nextCamera
             fittingCoordinateBounds:_cameraStop.bounds
             edgePadding: padding];
@@ -117,13 +117,13 @@
            atPitch:nextCamera.pitch];
     }
   
-    RCTMGLCameraWithPadding* cameraWithPadding = [[RCTMGLCameraWithPadding alloc] init];
+    RCTMLNCameraWithPadding* cameraWithPadding = [[RCTMLNCameraWithPadding alloc] init];
     cameraWithPadding.camera = nextCamera;
     cameraWithPadding.boundsPadding = padding;
     return cameraWithPadding;
 }
 
-- (UIEdgeInsets)_clippedPadding:(UIEdgeInsets)padding forView:(RCTMGLMapView*)mapView
+- (UIEdgeInsets)_clippedPadding:(UIEdgeInsets)padding forView:(RCTMLNMapView*)mapView
 {
     UIEdgeInsets result = padding;
     if ((padding.top + padding.bottom) >= mapView.frame.size.height) {
@@ -141,7 +141,7 @@
     return result;
 }
 
-- (BOOL)_areBoundsValid:(MGLCoordinateBounds)bounds {
+- (BOOL)_areBoundsValid:(MLNCoordinateBounds)bounds {
     BOOL isValid = CLLocationCoordinate2DIsValid(bounds.ne) && CLLocationCoordinate2DIsValid(bounds.sw);
     
     if (!isValid) {

package/ios/{RCTMGL → RCTMLN}/CameraUpdateQueue.h

@@ -1,6 +1,6 @@
 //
 //  CameraUpdateQueue.h
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/6/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
@@ -8,7 +8,7 @@
 
 #import "CameraStop.h"
 #import "CameraUpdateItem.h"
-#import "RCTMGLMapView.h"
+#import "RCTMLNMapView.h"
 
 @interface CameraUpdateQueue : NSObject
 
@@ -16,6 +16,6 @@
 - (CameraStop* _Nonnull)dequeue;
 - (void)flush;
 - (BOOL)isEmpty;
-- (void)execute:(RCTMGLMapView* _Nonnull)mapView;
+- (void)execute:(RCTMLNMapView* _Nonnull)mapView;
 
 @end

package/ios/{RCTMGL → RCTMLN}/CameraUpdateQueue.m

@@ -1,6 +1,6 @@
 //
 //  CameraUpdateQueue.m
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/6/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
@@ -47,7 +47,7 @@
     return queue.count == 0;
 }
 
-- (void)execute:(RCTMGLMapView*)mapView
+- (void)execute:(RCTMLNMapView*)mapView
 {
     if (mapView == nil) {
         return;
@@ -66,7 +66,7 @@
     item.cameraStop = stop;
     
     __weak CameraUpdateQueue *weakSelf = self;
-    __weak RCTMGLMapView *weakMap = mapView;
+    __weak RCTMLNMapView *weakMap = mapView;
     
     [item execute:mapView withCompletionHandler:^{ [weakSelf execute:weakMap]; }];
 }

package/ios/{RCTMGL → RCTMLN}/FilterParser.h

@@ -1,6 +1,6 @@
 //
 //  FilterParser.h
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 10/3/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.

package/ios/{RCTMGL → RCTMLN}/FilterParser.m

@@ -1,13 +1,13 @@
 //
 //  FilterParser.m
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 10/3/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
 #import "FilterParser.h"
-#import <Mapbox/Mapbox.h>
+#import <MapLibre/MapLibre.h>
 
 @implementation FilterParser
 
@@ -16,7 +16,7 @@
     if (filterList == nil || filterList.count < 1) {
         return nil;
     }
-    return [NSPredicate predicateWithMGLJSONObject:filterList];
+    return [NSPredicate predicateWithMLNJSONObject:filterList];
 }
 
 @end

package/ios/{RCTMGL/MGLCustomHeaders.h → RCTMLN/MLNCustomHeaders.h}

@@ -1,6 +1,6 @@
 //
-//  MGLCustomHeaders.h
-//  RCTMGL
+//  MLNCustomHeaders.h
+//  RCTMLN
 //
 
 #import <Foundation/Foundation.h>
@@ -8,7 +8,7 @@
 @interface NSMutableURLRequest (CustomHeaders)
 @end
 
-@interface MGLCustomHeaders : NSObject
+@interface MLNCustomHeaders : NSObject
 
 @property (nonatomic, strong) NSMutableDictionary<NSString*, NSString*> *currentHeaders;
 

package/ios/{RCTMGL/MGLCustomHeaders.m → RCTMLN/MLNCustomHeaders.m}

@@ -1,13 +1,13 @@
 //
-//  MGLCustomHeaders.h
-//  RCTMGL
+//  MLNCustomHeaders.h
+//  RCTMLN
 //
 
 #import <objc/runtime.h>
 
-#import "MGLCustomHeaders.h"
-#import <Mapbox/Mapbox.h>
-#import <Mapbox/MGLNetworkConfiguration.h>
+#import "MLNCustomHeaders.h"
+#import <MapLibre/MapLibre.h>
+#import <MapLibre/MLNNetworkConfiguration.h>
 
 @implementation NSMutableURLRequest (CustomHeaders)
 
@@ -26,7 +26,7 @@
         }
 
         NSMutableURLRequest *req = [NSMutableURLRequest __swizzle_requestWithURL:url];
-        NSDictionary<NSString*, NSString*> *currentHeaders = [[[MGLCustomHeaders sharedInstance] currentHeaders] copy];
+        NSDictionary<NSString*, NSString*> *currentHeaders = [[[MLNCustomHeaders sharedInstance] currentHeaders] copy];
         if(currentHeaders != nil && [currentHeaders count]>0) {
             for (NSString* headerName in currentHeaders) {
                 id headerValue = currentHeaders[headerName];
@@ -38,21 +38,21 @@
 
 @end
 
-@implementation MGLCustomHeaders {
+@implementation MLNCustomHeaders {
     NSMutableDictionary<NSString*, NSString*> *_currentHeaders;
     BOOL areHeadersAdded;
 }
 
 + (id)sharedInstance
 {
-    static MGLCustomHeaders *customHeaders;
+    static MLNCustomHeaders *customHeaders;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{ customHeaders = [[self alloc] init]; });
     return customHeaders;
 }
 
 // This replaces the [NSMutableURLRequest requestWithURL:] with custom implementation which
-// adds runtime headers copied from [MGLCustomHeaders _currentHeaders]
+// adds runtime headers copied from [MLNCustomHeaders _currentHeaders]
 -(void)initHeaders
 {
     if (!areHeadersAdded) {
@@ -84,7 +84,7 @@
     }
 
     [_currentHeaders setObject:value forKey:headerName];
-    [[[MGLNetworkConfiguration sharedManager] sessionConfiguration] setHTTPAdditionalHeaders:_currentHeaders];
+    [[[MLNNetworkConfiguration sharedManager] sessionConfiguration] setHTTPAdditionalHeaders:_currentHeaders];
 }
 
 - (void)removeHeader:(NSString *)header {

package/ios/RCTMLN/MLNFaux3DUserLocationAnnotationView.h

@@ -0,0 +1,23 @@
+//
+//  MLNFaux3DUserLocationAnnotationView.h
+//  RCTMLN
+//
+//  Created by Nick Italiano on 12/20/17.
+//  Copyright © 2017 Mapbox Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+@import MapLibre;
+
+extern const CGFloat MLNUserLocationAnnotationDotSize;
+extern const CGFloat MLNUserLocationAnnotationHaloSize;
+
+extern const CGFloat MLNUserLocationAnnotationPuckSize;
+extern const CGFloat MLNUserLocationAnnotationArrowSize;
+
+// Threshold in radians between heading indicator rotation updates.
+extern const CGFloat MLNUserLocationHeadingUpdateThreshold;
+
+@interface MLNFaux3DUserLocationAnnotationView : MLNUserLocationAnnotationView
+
+@end