@maplibre/maplibre-react-native 11.0.0-alpha.1 → 11.0.0-alpha.10

package/ios/MLRNImageQueueOperation.m

@@ -1,131 +0,0 @@
-#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,
-};
-
-@interface MLRNImageQueueOperation ()
-@property (nonatomic) MLRNImageQueueOperationState state;
-@end
-
-@implementation MLRNImageQueueOperation {
-  RCTImageLoaderCancellationBlock _cancellationBlock;
-  BOOL _cancelled;
-}
-
-- (instancetype)init {
-  self = [super init];
-  if (self) {
-    _state = IOState_Initial;
-    _cancelled = false;
-  }
-  return self;
-}
-
-- (BOOL)isExecuting {
-  @synchronized(self) {
-    return self.state == IOState_Executing;
-  }
-}
-
-- (BOOL)isFinished {
-  @synchronized(self) {
-    return (self.state == IOState_Finished || self.state == IOState_CancelledDoNotExecute);
-  }
-}
-
-- (BOOL)isCancelled {
-  @synchronized(self) {
-    return self.state == IOState_CancelledDoNotExecute;
-  }
-}
-
-- (void)setCancellationBlock:(dispatch_block_t)block {
-  _cancellationBlock = block;
-}
-
-- (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;
-    }
-  }
-  [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
-                                  except:(MLRNImageQueueOperationState)except {
-  return [self setState:newState only:IOState_Filter_All except:except];
-}
-
-- (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];
-    }
-  });
-}
-
-- (void)cancel {
-  if ([self setState:IOState_CancelledDoNotExecute except:IOState_Finished] == IOState_Executing) {
-    [self callCancellationBlock];
-  }
-}
-
-@end

package/ios/MLRNImages.h

@@ -1,24 +0,0 @@
-#import <React/RCTBridge.h>
-#import <React/RCTComponent.h>
-#import <UIKit/UIKit.h>
-
-@import MapLibre;
-
-@class MLRNMapView;
-
-@interface MLRNImages : UIView
-
-@property (nonatomic, weak) RCTBridge *bridge;
-
-@property (nonatomic, strong) MLRNMapView *map;
-
-@property (nonatomic, strong) NSDictionary<NSString *, NSString *> *images;
-@property (nonatomic, strong) NSArray<NSString *> *nativeImages;
-
-@property (nonatomic, copy) RCTBubblingEventBlock onImageMissing;
-@property (nonatomic, assign) BOOL hasOnImageMissing;
-
-- (BOOL)addMissingImageToStyle:(NSString *)imageName;
-- (void)sendImageMissingEvent:(NSString *)imageName;
-
-@end

package/ios/MLRNImages.m

@@ -1,124 +0,0 @@
-#import "MLRNImages.h"
-#import <React/UIView+React.h>
-#import "MLRNEvent.h"
-#import "MLRNEventTypes.h"
-#import "MLRNMapView.h"
-#import "MLRNUtils.h"
-
-@implementation MLRNImages : UIView
-
-static UIImage *_placeHolderImage;
-
-- (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)_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];
-    }
-  }
-}
-
-- (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)_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];
-    }
-  }
-}
-
-- (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)_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;
-}
-
-@end

package/ios/MLRNLayer.h

@@ -1,42 +0,0 @@
-#import <React/RCTBridge.h>
-#import <UIKit/UIKit.h>
-
-@class MLRNMapView;
-
-@import MapLibre;
-
-@interface MLRNLayer<T> : UIView
-
-@property (nonatomic, weak, nullable) RCTBridge *bridge;
-
-@property (nonatomic, strong, nullable) MLNStyleLayer *styleLayer;
-@property (nonatomic, strong, nullable) MLNStyle *style;
-@property (nonatomic, weak, nullable) MLRNMapView *map;
-@property (nonatomic, strong, nullable) NSDictionary *reactStyle;
-@property (nonatomic, strong, nullable) NSArray *filter;
-
-@property (nonatomic, copy, nullable) NSString *id;
-@property (nonatomic, copy, nullable) NSString *sourceID;
-
-@property (nonatomic, copy, nullable) NSString *aboveLayerID;
-@property (nonatomic, copy, nullable) NSString *belowLayerID;
-@property (nonatomic, copy, nullable) NSNumber *layerIndex;
-
-@property (nonatomic, copy, nullable) NSNumber *maxZoomLevel;
-@property (nonatomic, copy, nullable) NSNumber *minZoomLevel;
-
-- (void)addToMap:(nonnull MLRNMapView *)map style:(nonnull MLNStyle *)style;
-- (void)addedToMap;
-- (void)removeFromMap:(nonnull MLNStyle *)style;
-- (nullable T)makeLayer:(nonnull MLNStyle *)style;
-- (void)addStyles;
-- (void)insertAbove:(nonnull NSString *)layer;
-- (void)insertBelow:(nonnull NSString *)layer;
-- (void)insertAtIndex:(NSUInteger)index;
-- (void)setZoomBounds;
-
-- (BOOL)isAddedToMap;
-
-- (nullable MLNSource *)layerWithSourceIDInStyle:(nonnull MLNStyle *)style;
-
-@end

package/ios/MLRNLayer.m

@@ -1,216 +0,0 @@
-#import "MLRNLayer.h"
-#import "MLRNMapView.h"
-#import "MLRNSource.h"
-#import "MLRNStyleValue.h"
-#import "MLRNUtils.h"
-
-@implementation MLRNLayer
-
-- (void)setMinZoomLevel:(NSNumber *)minZoomLevel {
-  _minZoomLevel = minZoomLevel;
-
-  if (_styleLayer != nil) {
-    _styleLayer.minimumZoomLevel = [_minZoomLevel doubleValue];
-  }
-}
-
-- (void)setMaxZoomLevel:(NSNumber *)maxZoomLevel {
-  _maxZoomLevel = maxZoomLevel;
-
-  if (_styleLayer != nil) {
-    _styleLayer.maximumZoomLevel = [_maxZoomLevel doubleValue];
-  }
-}
-
-- (void)setAboveLayerID:(NSString *)aboveLayerID {
-  if (_aboveLayerID != nil && _aboveLayerID == aboveLayerID) {
-    return;
-  }
-
-  _aboveLayerID = aboveLayerID;
-  if (_styleLayer != nil) {
-    [self removeFromMap:_style];
-    [self insertAbove:aboveLayerID];
-  }
-}
-
-- (void)setBelowLayerID:(NSString *)belowLayerID {
-  if (_belowLayerID != nil && _belowLayerID == belowLayerID) {
-    return;
-  }
-
-  _belowLayerID = belowLayerID;
-  if (_styleLayer != nil) {
-    [self removeFromMap:_style];
-    [self insertBelow:_belowLayerID];
-  }
-}
-
-- (void)setLayerIndex:(NSNumber *)layerIndex {
-  if (_layerIndex != nil && _layerIndex == layerIndex) {
-    return;
-  }
-
-  _layerIndex = layerIndex;
-  if (_styleLayer != nil) {
-    [self removeFromMap:_style];
-    [self insertAtIndex:_layerIndex.unsignedIntegerValue];
-  }
-}
-
-- (void)setMap:(MLRNMapView *)map {
-  if (map == nil) {
-    [self removeFromMap:_map.style];
-    _map = nil;
-  } else {
-    _map = map;
-    [self addToMap:map style:map.style];
-  }
-}
-
-- (void)setReactStyle:(NSDictionary *)reactStyle {
-  _reactStyle = reactStyle;
-
-  if (_styleLayer != nil) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [self addStyles];
-    });
-  }
-}
-
-- (void)addToMap:(MLRNMapView *)map style:(MLNStyle *)style {
-  if (style == nil) {
-    return;
-  }
-  _map = map;
-  _style = style;
-  if (_id == nil) {
-    RCTLogError(@"Cannot add a layer without id to the map: %@", self);
-    return;
-  }
-  MLNStyleLayer *existingLayer = [style layerWithIdentifier:_id];
-  if (existingLayer != nil) {
-    _styleLayer = existingLayer;
-  } else {
-    _styleLayer = [self makeLayer:style];
-    if (_styleLayer == nil) {
-      RCTLogError(@"Failed to make layer: %@", _id);
-      return;
-    }
-    [self insertLayer:map];
-  }
-
-  [self addStyles];
-  [self addedToMap];
-}
-
-- (nullable MLNSource *)layerWithSourceIDInStyle:(nonnull MLNStyle *)style {
-  MLNSource *result = [style sourceWithIdentifier:self.sourceID];
-  if (result == NULL) {
-    RCTLogError(@"Cannot find layer with id: %@ referenced by layer:%@", self.sourceID, _id);
-  }
-  return result;
-}
-
-- (void)removeFromMap:(MLNStyle *)style {
-  if (_styleLayer != nil) {
-    [style removeLayer:_styleLayer];
-  }
-  _style = nil;
-}
-
-- (BOOL)isAddedToMap {
-  return (_style != nil);
-}
-
-- (nullable MLNStyleLayer *)makeLayer:(MLNStyle *)style {
-  @throw [NSException
-      exceptionWithName:NSInternalInconsistencyException
-                 reason:[NSString stringWithFormat:@"You must override %@ in a subclass",
-                                                   NSStringFromSelector(_cmd)]
-               userInfo:nil];
-}
-
-- (void)addStyles {
-  @throw [NSException
-      exceptionWithName:NSInternalInconsistencyException
-                 reason:[NSString stringWithFormat:@"You must override %@ in a subclass",
-                                                   NSStringFromSelector(_cmd)]
-               userInfo:nil];
-}
-
-- (void)addedToMap {
-  // override if you want
-}
-
-- (void)insertLayer:(MLRNMapView *)map {
-  if ([_style layerWithIdentifier:_id] != nil) {
-    return;  // prevent layer from being added twice
-  }
-
-  if (_aboveLayerID != nil) {
-    [self insertAbove:_aboveLayerID];
-  } else if (_belowLayerID != nil) {
-    [self insertBelow:_belowLayerID];
-  } else if (_layerIndex != nil) {
-    [self insertAtIndex:_layerIndex.unsignedIntegerValue];
-  } else {
-    [_style addLayer:_styleLayer];
-    [_map layerAdded:_styleLayer];
-  }
-
-  [self setZoomBounds];
-}
-
-- (void)setZoomBounds {
-  if (_maxZoomLevel != nil) {
-    _styleLayer.maximumZoomLevel = [_maxZoomLevel doubleValue];
-  }
-
-  if (_minZoomLevel != nil) {
-    _styleLayer.minimumZoomLevel = [_minZoomLevel doubleValue];
-  }
-}
-
-- (void)insertAbove:(NSString *)aboveLayerIDs {
-  [_map waitForLayerWithID:aboveLayerIDs
-                      then:^void(MLNStyleLayer *layer) {
-                        if (![self _hasInitialized]) {
-                          return;
-                        }
-                        [self->_style insertLayer:self->_styleLayer aboveLayer:layer];
-                        [self->_map layerAdded:self->_styleLayer];
-                      }];
-}
-
-- (void)insertBelow:(NSString *)belowLayerID {
-  [_map waitForLayerWithID:belowLayerID
-                      then:^void(MLNStyleLayer *layer) {
-                        if (![self _hasInitialized]) {
-                          return;
-                        }
-
-                        [self->_style insertLayer:self->_styleLayer belowLayer:layer];
-                        [self->_map layerAdded:self->_styleLayer];
-                      }];
-}
-
-- (void)insertAtIndex:(NSUInteger)index {
-  if (![self _hasInitialized]) {
-    return;
-  }
-  NSArray *layers = _style.layers;
-  if (index >= layers.count) {
-    RCTLogWarn(@"Layer index is greater than number of layers on map. Layer inserted at end of "
-               @"layer stack.");
-    index = layers.count - 1;
-  }
-  [_style insertLayer:self->_styleLayer atIndex:index];
-  [_map layerAdded:self->_styleLayer];
-}
-
-- (BOOL)_hasInitialized {
-  return _style != nil && _styleLayer != nil;
-}
-
-@end

package/ios/MLRNLight.h

@@ -1,9 +0,0 @@
-#import <UIKit/UIKit.h>
-@import MapLibre;
-
-@interface MLRNLight : UIView
-
-@property (nonatomic, strong) MLNMapView *map;
-@property (nonatomic, strong) NSDictionary *reactStyle;
-
-@end

package/ios/MLRNLocationModule.m

@@ -1,76 +0,0 @@
-#import <CoreLocation/CoreLocation.h>
-
-#import "MLRNEventTypes.h"
-#import "MLRNLocation.h"
-#import "MLRNLocationManager.h"
-#import "MLRNLocationManagerDelegate.h"
-#import "MLRNLocationModule.h"
-
-@interface MLRNLocationModule () <MLRNLocationManagerDelegate>
-@end
-
-@implementation MLRNLocationModule {
-  MLRNLocationManager *locationManager;
-  BOOL hasListeners;
-}
-
-RCT_EXPORT_MODULE();
-
-+ (BOOL)requiresMainQueueSetup {
-  return NO;
-}
-
-- (instancetype)init {
-  if (self = [super init]) {
-    locationManager = [[MLRNLocationManager alloc] init];
-    locationManager.delegate = self;
-  }
-  return self;
-}
-
-- (void)startObserving {
-  [super startObserving];
-  hasListeners = YES;
-}
-
-- (void)stopObserving {
-  [super stopObserving];
-  hasListeners = NO;
-}
-
-- (NSArray<NSString *> *)supportedEvents {
-  return @[ RCT_MAPBOX_USER_LOCATION_UPDATE ];
-}
-
-RCT_EXPORT_METHOD(start : (CLLocationDistance)minDisplacement) {
-  [locationManager start:minDisplacement];
-}
-
-RCT_EXPORT_METHOD(pause) { [locationManager stop]; }
-
-RCT_EXPORT_METHOD(stop) { [locationManager stop]; }
-
-RCT_EXPORT_METHOD(setMinDisplacement : (CLLocationDistance)minDisplacement) {
-  [locationManager setMinDisplacement:minDisplacement];
-}
-
-RCT_EXPORT_METHOD(getLastKnownLocation : (RCTPromiseResolveBlock)
-                      resolve rejecter : (RCTPromiseRejectBlock)reject) {
-  MLRNLocation *lastKnownLocation = [locationManager getLastKnownLocation];
-  resolve(lastKnownLocation);
-}
-
-- (void)locationManager:(MLRNLocationManager *)locationManager
-      didUpdateLocation:(MLRNLocation *)location {
-  if (!hasListeners) {
-    return;
-  }
-
-  if (self.bridge == nil) {
-    return;
-  }
-
-  [self sendEventWithName:RCT_MAPBOX_USER_LOCATION_UPDATE body:[location toJSON]];
-}
-
-@end

package/ios/MLRNMapTouchEvent.h

@@ -1,17 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "MLRNEvent.h"
-#import "MLRNPointAnnotation.h"
-@import MapLibre;
-
-@interface MLRNMapTouchEvent : MLRNEvent
-
-@property (nonatomic, copy) NSString *id;
-@property (nonatomic, assign) CLLocationCoordinate2D coordinate;
-@property (nonatomic, assign) CGPoint screenPoint;
-
-+ (MLRNMapTouchEvent *)makeTapEvent:(MLNMapView *)mapView withPoint:(CGPoint)point;
-+ (MLRNMapTouchEvent *)makeLongPressEvent:(MLNMapView *)mapView withPoint:(CGPoint)point;
-+ (MLRNMapTouchEvent *)makeAnnotationTapEvent:(MLRNPointAnnotation *)pointAnnotation;
-+ (MLRNMapTouchEvent *)makeAnnotationTapEventOnDrag:(MLRNPointAnnotation *)pointAnnotation;
-
-@end