@maplibre/maplibre-react-native 10.1.0 → 10.1.2

package/ios/MLRN/MLRNImageQueueOperation.m

@@ -1,130 +1,131 @@
 #import "MLRNImageQueueOperation.h"
 
-
 typedef NS_ENUM(NSInteger, MLRNImageQueueOperationState) {
-    IOState_Initial,
-    IOState_CancelledDoNotExecute,
-    IOState_Executing, // cancellationBlock is set
-    IOState_Finished,
-
-    /* Not sates, just selectors for only and except params */
-    IOState_Filter_None,
-    IOState_Filter_All,
+  IOState_Initial,
+  IOState_CancelledDoNotExecute,
+  IOState_Executing,  // cancellationBlock is set
+  IOState_Finished,
+
+  /* Not sates, just selectors for only and except params */
+  IOState_Filter_None,
+  IOState_Filter_All,
 };
 
-@interface MLRNImageQueueOperation()
+@interface MLRNImageQueueOperation ()
 @property (nonatomic) MLRNImageQueueOperationState state;
 @end
 
-@implementation MLRNImageQueueOperation
-{
-    RCTImageLoaderCancellationBlock _cancellationBlock;
-    BOOL _cancelled;
+@implementation MLRNImageQueueOperation {
+  RCTImageLoaderCancellationBlock _cancellationBlock;
+  BOOL _cancelled;
 }
 
 - (instancetype)init {
-    self = [super init];
-    if (self) {
-        _state = IOState_Initial;
-        _cancelled = false;
-    }
-    return self;
+  self = [super init];
+  if (self) {
+    _state = IOState_Initial;
+    _cancelled = false;
+  }
+  return self;
 }
 
 - (BOOL)isExecuting {
-    @synchronized (self) {
-        return self.state == IOState_Executing;
-    }
+  @synchronized(self) {
+    return self.state == IOState_Executing;
+  }
 }
 
 - (BOOL)isFinished {
-    @synchronized (self) {
-        return (self.state == IOState_Finished || self.state == IOState_CancelledDoNotExecute);
-    }
+  @synchronized(self) {
+    return (self.state == IOState_Finished || self.state == IOState_CancelledDoNotExecute);
+  }
 }
 
 - (BOOL)isCancelled {
-    @synchronized (self) {
-        return self.state == IOState_CancelledDoNotExecute;
-    }
+  @synchronized(self) {
+    return self.state == IOState_CancelledDoNotExecute;
+  }
 }
 
-- (void)setCancellationBlock:(dispatch_block_t) block {
-    _cancellationBlock = block;
+- (void)setCancellationBlock:(dispatch_block_t)block {
+  _cancellationBlock = block;
 }
 
--(void)callCancellationBlock {
-    if (_cancellationBlock) {
-        _cancellationBlock();
-    }
+- (void)callCancellationBlock {
+  if (_cancellationBlock) {
+    _cancellationBlock();
+  }
 }
 
-- (MLRNImageQueueOperationState)setState:(MLRNImageQueueOperationState)newState only:(MLRNImageQueueOperationState)only except:(MLRNImageQueueOperationState) except
-{
-    MLRNImageQueueOperationState prevState = IOState_Filter_None;
-    [self willChangeValueForKey:@"isExecuting"];
-    [self willChangeValueForKey:@"isFinished"];
-    [self willChangeValueForKey:@"isCancelled"];
-
-    @synchronized (self) {
-        BOOL allowed = YES;
-        prevState = self.state;
-        if (! (only == IOState_Filter_All || prevState == only)) {
-            allowed = NO;
-        }
-        if (prevState == except) {
-            allowed = NO;
-        }
-        if (allowed) {
-            self.state = newState;
-        }
+- (MLRNImageQueueOperationState)setState:(MLRNImageQueueOperationState)newState
+                                    only:(MLRNImageQueueOperationState)only
+                                  except:(MLRNImageQueueOperationState)except {
+  MLRNImageQueueOperationState prevState = IOState_Filter_None;
+  [self willChangeValueForKey:@"isExecuting"];
+  [self willChangeValueForKey:@"isFinished"];
+  [self willChangeValueForKey:@"isCancelled"];
+
+  @synchronized(self) {
+    BOOL allowed = YES;
+    prevState = self.state;
+    if (!(only == IOState_Filter_All || prevState == only)) {
+      allowed = NO;
+    }
+    if (prevState == except) {
+      allowed = NO;
     }
-    [self didChangeValueForKey:@"isExecuting"];
-    [self didChangeValueForKey:@"isFinished"];
-    [self didChangeValueForKey:@"isCancelled"];
-    return prevState;
+    if (allowed) {
+      self.state = newState;
+    }
+  }
+  [self didChangeValueForKey:@"isExecuting"];
+  [self didChangeValueForKey:@"isFinished"];
+  [self didChangeValueForKey:@"isCancelled"];
+  return prevState;
 }
 
-- (MLRNImageQueueOperationState)setState:(MLRNImageQueueOperationState)newState only:(MLRNImageQueueOperationState)only
-{
-    return [self setState: newState only:only except:IOState_Filter_None];
+- (MLRNImageQueueOperationState)setState:(MLRNImageQueueOperationState)newState
+                                    only:(MLRNImageQueueOperationState)only {
+  return [self setState:newState only:only except:IOState_Filter_None];
 }
 
-- (MLRNImageQueueOperationState)setState:(MLRNImageQueueOperationState)newState except:(MLRNImageQueueOperationState)except
-{
-    return [self setState: newState only:IOState_Filter_All except:except];
+- (MLRNImageQueueOperationState)setState:(MLRNImageQueueOperationState)newState
+                                  except:(MLRNImageQueueOperationState)except {
+  return [self setState:newState only:IOState_Filter_All except:except];
 }
 
-- (void)start
-{
-    if (self.state == IOState_CancelledDoNotExecute) {
-        return;
+- (void)start {
+  if (self.state == IOState_CancelledDoNotExecute) {
+    return;
+  }
+  __weak MLRNImageQueueOperation *weakSelf = self;
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+    [weakSelf
+        setCancellationBlock:[[weakSelf.bridge moduleForName:@"ImageLoader"
+                                       lazilyLoadIfNecessary:YES]
+                                 loadImageWithURLRequest:weakSelf.urlRequest
+                                                    size:CGSizeZero
+                                                   scale:weakSelf.scale
+                                                 clipped:YES
+                                              resizeMode:RCTResizeModeStretch
+                                           progressBlock:nil
+                                        partialLoadBlock:nil
+                                         completionBlock:^void(NSError *error, UIImage *image) {
+                                           weakSelf.completionHandler(error, image);
+                                           [weakSelf setState:IOState_Finished
+                                                       except:IOState_Finished];
+                                         }]];
+    if ([weakSelf setState:IOState_Executing
+                      only:IOState_Initial] == IOState_CancelledDoNotExecute) {
+      [weakSelf callCancellationBlock];
     }
-    __weak MLRNImageQueueOperation *weakSelf = self;
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-        [weakSelf setCancellationBlock: [[weakSelf.bridge moduleForName:@"ImageLoader" lazilyLoadIfNecessary:YES]
-                             loadImageWithURLRequest:weakSelf.urlRequest
-                             size:CGSizeZero
-                             scale:weakSelf.scale
-                             clipped:YES
-                             resizeMode:RCTResizeModeStretch
-                             progressBlock:nil
-                             partialLoadBlock:nil
-                             completionBlock:^void (NSError *error, UIImage *image){
-                                weakSelf.completionHandler(error, image);
-                                [weakSelf setState:IOState_Finished except:IOState_Finished];
-                             }]];
-        if ([weakSelf setState:IOState_Executing only:IOState_Initial] == IOState_CancelledDoNotExecute) {
-            [weakSelf callCancellationBlock];
-        }
-    });
+  });
 }
 
-- (void)cancel
-{
-    if ([self setState:IOState_CancelledDoNotExecute except:IOState_Finished] == IOState_Executing) {
-        [self callCancellationBlock];
-    }
+- (void)cancel {
+  if ([self setState:IOState_CancelledDoNotExecute except:IOState_Finished] == IOState_Executing) {
+    [self callCancellationBlock];
+  }
 }
 
 @end

package/ios/MLRN/MLRNImageSource.m

@@ -3,50 +3,48 @@
 
 @implementation MLRNImageSource
 
-- (void)setUrl:(NSString *)url
-{
-    _url = url;
-
-    if (self.source != nil) {
-        MLNImageSource *source = (MLNImageSource *)self.source;
-        source.URL = [NSURL URLWithString:_url];
-    }
+- (void)setUrl:(NSString *)url {
+  _url = url;
+
+  if (self.source != nil) {
+    MLNImageSource *source = (MLNImageSource *)self.source;
+    source.URL = [NSURL URLWithString:_url];
+  }
 }
 
-- (void)setCoordinates:(NSArray<NSArray<NSNumber *> *> *)coordinates
-{
-    _coordinates = coordinates;
-    if (self.source != nil) {
-        MLNImageSource *source = (MLNImageSource *)self.source;
-        source.coordinates = [self _makeCoordQuad];
-    }
+- (void)setCoordinates:(NSArray<NSArray<NSNumber *> *> *)coordinates {
+  _coordinates = coordinates;
+  if (self.source != nil) {
+    MLNImageSource *source = (MLNImageSource *)self.source;
+    source.coordinates = [self _makeCoordQuad];
+  }
 }
 
-- (nullable MLNSource *)makeSource
-{
-    NSURL *myURL;
-
-    if ([[_url substringToIndex:4] isEqualToString:@"http"]) {
-        myURL = [NSURL URLWithString:_url];
-    }
-    else
-    {
-        //Default consider it file url path
-        myURL = [NSURL fileURLWithPath:_url];
-    }
-
-    return [[MLNImageSource alloc] initWithIdentifier:self.id
-                                   coordinateQuad:[self _makeCoordQuad]
-                                   URL:myURL];
+- (nullable MLNSource *)makeSource {
+  NSURL *myURL;
+
+  if ([[_url substringToIndex:4] isEqualToString:@"http"]) {
+    myURL = [NSURL URLWithString:_url];
+  } else {
+    // Default consider it file url path
+    myURL = [NSURL fileURLWithPath:_url];
+  }
+
+  return [[MLNImageSource alloc] initWithIdentifier:self.id
+                                     coordinateQuad:[self _makeCoordQuad]
+                                                URL:myURL];
 }
 
-- (MLNCoordinateQuad)_makeCoordQuad
-{
-    CLLocationCoordinate2D topLeft = CLLocationCoordinate2DMake([self.coordinates[0][1] floatValue], [self.coordinates[0][0] floatValue]);
-    CLLocationCoordinate2D topRight = CLLocationCoordinate2DMake([self.coordinates[1][1] floatValue], [self.coordinates[1][0] floatValue]);
-    CLLocationCoordinate2D bottomRight = CLLocationCoordinate2DMake([self.coordinates[2][1] floatValue], [self.coordinates[2][0] floatValue]);
-    CLLocationCoordinate2D bottomLeft = CLLocationCoordinate2DMake([self.coordinates[3][1] floatValue], [self.coordinates[3][0] floatValue]);
-    return MLNCoordinateQuadMake(topLeft, bottomLeft, bottomRight, topRight);
+- (MLNCoordinateQuad)_makeCoordQuad {
+  CLLocationCoordinate2D topLeft = CLLocationCoordinate2DMake([self.coordinates[0][1] floatValue],
+                                                              [self.coordinates[0][0] floatValue]);
+  CLLocationCoordinate2D topRight = CLLocationCoordinate2DMake([self.coordinates[1][1] floatValue],
+                                                               [self.coordinates[1][0] floatValue]);
+  CLLocationCoordinate2D bottomRight = CLLocationCoordinate2DMake(
+      [self.coordinates[2][1] floatValue], [self.coordinates[2][0] floatValue]);
+  CLLocationCoordinate2D bottomLeft = CLLocationCoordinate2DMake(
+      [self.coordinates[3][1] floatValue], [self.coordinates[3][0] floatValue]);
+  return MLNCoordinateQuadMake(topLeft, bottomLeft, bottomRight, topRight);
 }
 
 @end

package/ios/MLRN/MLRNImageSourceManager.m

@@ -9,9 +9,8 @@ RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(url, NSString)
 RCT_EXPORT_VIEW_PROPERTY(coordinates, NSArray)
 
-- (UIView*)view
-{
-    return [MLRNImageSource new];
+- (UIView*)view {
+  return [MLRNImageSource new];
 }
 
 @end

package/ios/MLRN/MLRNImageUtils.h

@@ -1,9 +1,9 @@
-#import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 @interface MLRNImageUtils : NSObject
 
-+(NSString *)createTempFile:(UIImage *)image;
-+(NSString *)createBase64:(UIImage *)image;
++ (NSString *)createTempFile:(UIImage *)image;
++ (NSString *)createBase64:(UIImage *)image;
 
 @end

package/ios/MLRN/MLRNImageUtils.m

@@ -2,22 +2,23 @@
 
 @implementation MLRNImageUtils
 
-+ (NSString *)createTempFile:(UIImage *)image
-{
-    NSString *fileID = [[NSUUID UUID] UUIDString];
-    NSString *pathComponent = [NSString stringWithFormat:@"Documents/mlrn-snapshot-%@.%@", fileID, @"png"];
-    NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent: pathComponent];
-    
-    NSData *data = UIImagePNGRepresentation(image);
-    [data writeToFile:filePath atomically:YES];
-    
-    return filePath;
++ (NSString *)createTempFile:(UIImage *)image {
+  NSString *fileID = [[NSUUID UUID] UUIDString];
+  NSString *pathComponent =
+      [NSString stringWithFormat:@"Documents/mlrn-snapshot-%@.%@", fileID, @"png"];
+  NSString *filePath = [NSHomeDirectory() stringByAppendingPathComponent:pathComponent];
+
+  NSData *data = UIImagePNGRepresentation(image);
+  [data writeToFile:filePath atomically:YES];
+
+  return filePath;
 }
 
-+ (NSString *)createBase64:(UIImage *)image
-{
-    NSData *data = UIImagePNGRepresentation(image);
-    return [NSString stringWithFormat:@"%@%@",  @"data:image/png;base64,", [data base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn]];
++ (NSString *)createBase64:(UIImage *)image {
+  NSData *data = UIImagePNGRepresentation(image);
+  return [NSString stringWithFormat:@"%@%@", @"data:image/png;base64,",
+                                    [data base64EncodedStringWithOptions:
+                                              NSDataBase64EncodingEndLineWithCarriageReturn]];
 }
 
 @end

package/ios/MLRN/MLRNImages.h

@@ -22,4 +22,3 @@
 - (void)sendImageMissingEvent:(NSString *)imageName;
 
 @end
-

package/ios/MLRN/MLRNImages.m

@@ -1,126 +1,124 @@
 #import "MLRNImages.h"
 #import <React/UIView+React.h>
-#import "MLRNMapView.h"
-#import "MLRNUtils.h"
 #import "MLRNEvent.h"
 #import "MLRNEventTypes.h"
-
+#import "MLRNMapView.h"
+#import "MLRNUtils.h"
 
 @implementation MLRNImages : UIView
 
-static UIImage * _placeHolderImage;
+static UIImage *_placeHolderImage;
 
-- (void)addToMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-    [self _addNativeImages:_nativeImages];
-    [self _addRemoteImages:_images];
+- (void)addToMap {
+  if (self.map.style == nil) {
+    return;
+  }
+  [self _addNativeImages:_nativeImages];
+  [self _addRemoteImages:_images];
 }
 
-- (void)removeFromMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-    
-    [self _removeImages];
+- (void)removeFromMap {
+  if (self.map.style == nil) {
+    return;
+  }
+
+  [self _removeImages];
 }
 
-- (void)_removeImages
-{
-    if ([self _hasImages]) {
-        NSArray<NSString *> *imageNames = _images.allKeys;
-        
-        for (NSString *imageName in imageNames) {
-            [self.map.style removeImageForName:imageName];
-        }
+- (void)_removeImages {
+  if ([self _hasImages]) {
+    NSArray<NSString *> *imageNames = _images.allKeys;
+
+    for (NSString *imageName in imageNames) {
+      [self.map.style removeImageForName:imageName];
     }
-    
-    if ([self _hasNativeImages]) {
-        for (NSString *imageName in _nativeImages) {
-            [self.map.style removeImageForName:imageName];
-        }
+  }
+
+  if ([self _hasNativeImages]) {
+    for (NSString *imageName in _nativeImages) {
+      [self.map.style removeImageForName:imageName];
     }
+  }
 }
 
--(BOOL)addMissingImageToStyle:(NSString *)imageName {
-    if (_nativeImages && [_nativeImages containsObject:imageName]) {
-        [self _addNativeImages:@[imageName]];
-        return true;
-    }
-    
-    NSString *remoteImage = _images != nil ? [_images objectForKey:imageName] : nil;
-    if (remoteImage) {
-        [self _addRemoteImages:@{imageName: remoteImage}];
-        return true;
-    }
-    return false;
+- (BOOL)addMissingImageToStyle:(NSString *)imageName {
+  if (_nativeImages && [_nativeImages containsObject:imageName]) {
+    [self _addNativeImages:@[ imageName ]];
+    return true;
+  }
+
+  NSString *remoteImage = _images != nil ? [_images objectForKey:imageName] : nil;
+  if (remoteImage) {
+    [self _addRemoteImages:@{imageName : remoteImage}];
+    return true;
+  }
+  return false;
 }
 
-- (void) sendImageMissingEvent:(NSString *)imageName {
-    NSDictionary *payload = @{ @"imageKey": imageName };
-    MLRNEvent *event = [MLRNEvent makeEvent:RCT_MAPBOX_IMAGES_MISSING_IMAGE withPayload:payload];
-    if (_onImageMissing) {
-        _onImageMissing([event toJSON]);
-    }
+- (void)sendImageMissingEvent:(NSString *)imageName {
+  NSDictionary *payload = @{@"imageKey" : imageName};
+  MLRNEvent *event = [MLRNEvent makeEvent:RCT_MAPBOX_IMAGES_MISSING_IMAGE withPayload:payload];
+  if (_onImageMissing) {
+    _onImageMissing([event toJSON]);
+  }
 }
 
-- (void)_addNativeImages:(NSArray<NSString *>*)nativeImages
-{
-    if (!nativeImages) return;
+- (void)_addNativeImages:(NSArray<NSString *> *)nativeImages {
+  if (!nativeImages) return;
 
-    for (NSString *imageName in nativeImages) {
-        // only add native images if they are not in the style yet (similar to [MLRNUtils fetchImages: style:])
-        if (![self.map.style imageForName:imageName]) {
-            UIImage *image = [UIImage imageNamed:imageName];
-            [self.map.style setImage:image forName:imageName];
-        }
+  for (NSString *imageName in nativeImages) {
+    // only add native images if they are not in the style yet (similar to [MLRNUtils fetchImages:
+    // style:])
+    if (![self.map.style imageForName:imageName]) {
+      UIImage *image = [UIImage imageNamed:imageName];
+      [self.map.style setImage:image forName:imageName];
     }
+  }
 }
 
-- (void)_addRemoteImages:(NSDictionary<NSString *, NSString *>*)remoteImages
-{
-    if (!remoteImages) return;
-    NSDictionary<NSString *, NSString *> *missingImages = [NSMutableDictionary new];
-    
-    // Add image placeholder for images that are not yet available in the style. This way
-    // we can load the images asynchronously and add the ShapeSource to the map without delay.
-    // The same is required when this ShapeSource is updated with new/added images and the
-    // data references them. In which case addMissingImageToStyle will take care of loading
-    // them in a similar way.
-    //
-    // See also: https://github.com/mapbox/mapbox-gl-native/pull/14253#issuecomment-478827792
-    for (NSString *imageName in remoteImages.allKeys) {
-        if (![self.map.style imageForName:imageName]) {
-            [self.map.style setImage:[MLRNImages placeholderImage] forName:imageName];
-            [missingImages setValue:_images[imageName] forKey:imageName];
-        }
-    }
-    
-    if (missingImages.count > 0) {
-        // forceUpdate to ensure the placeholder images are updated
-        [MLRNUtils fetchImages:_bridge style:self.map.style objects:_images forceUpdate:true callback:^{ }];
+- (void)_addRemoteImages:(NSDictionary<NSString *, NSString *> *)remoteImages {
+  if (!remoteImages) return;
+  NSDictionary<NSString *, NSString *> *missingImages = [NSMutableDictionary new];
+
+  // Add image placeholder for images that are not yet available in the style. This way
+  // we can load the images asynchronously and add the ShapeSource to the map without delay.
+  // The same is required when this ShapeSource is updated with new/added images and the
+  // data references them. In which case addMissingImageToStyle will take care of loading
+  // them in a similar way.
+  //
+  // See also: https://github.com/mapbox/mapbox-gl-native/pull/14253#issuecomment-478827792
+  for (NSString *imageName in remoteImages.allKeys) {
+    if (![self.map.style imageForName:imageName]) {
+      [self.map.style setImage:[MLRNImages placeholderImage] forName:imageName];
+      [missingImages setValue:_images[imageName] forKey:imageName];
     }
+  }
+
+  if (missingImages.count > 0) {
+    // forceUpdate to ensure the placeholder images are updated
+    [MLRNUtils fetchImages:_bridge
+                     style:self.map.style
+                   objects:_images
+               forceUpdate:true
+                  callback:^{
+                  }];
+  }
 }
 
-- (BOOL)_hasImages
-{
-    return _images != nil && _images.count > 0;
+- (BOOL)_hasImages {
+  return _images != nil && _images.count > 0;
 }
 
-- (BOOL)_hasNativeImages
-{
-    return _nativeImages != nil && _nativeImages.count > 0;
+- (BOOL)_hasNativeImages {
+  return _nativeImages != nil && _nativeImages.count > 0;
 }
 
 + (UIImage *)placeholderImage {
-    if (_placeHolderImage) return _placeHolderImage;
-    UIGraphicsBeginImageContextWithOptions(CGSizeMake(1, 1), NO, 0.0);
-    _placeHolderImage = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    return _placeHolderImage;
+  if (_placeHolderImage) return _placeHolderImage;
+  UIGraphicsBeginImageContextWithOptions(CGSizeMake(1, 1), NO, 0.0);
+  _placeHolderImage = UIGraphicsGetImageFromCurrentImageContext();
+  UIGraphicsEndImageContext();
+  return _placeHolderImage;
 }
 
 @end

package/ios/MLRN/MLRNImagesManager.m

@@ -11,11 +11,10 @@ RCT_EXPORT_VIEW_PROPERTY(nativeImages, NSArray)
 
 RCT_REMAP_VIEW_PROPERTY(onImageMissing, onImageMissing, RCTBubblingEventBlock)
 
-- (UIView*)view
-{
-    MLRNImages *images = [MLRNImages new];
-    images.bridge = self.bridge;
-    return images;
+- (UIView *)view {
+  MLRNImages *images = [MLRNImages new];
+  images.bridge = self.bridge;
+  return images;
 }
 
 @end