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

package/ios/MLRN/MLRNEventTypes.m

@@ -1,41 +0,0 @@
-#import "MLRNEventTypes.h"
-
-@implementation MLRNEventTypes
-
-NSString *const RCT_MAPBOX_EVENT_TAP = @"press";
-NSString *const RCT_MAPBOX_EVENT_LONGPRESS = @"longpress";
-
-NSString *const RCT_MAPBOX_USER_TRACKING_MODE_CHANGE = @"usertrackingmodechange";
-
-NSString *const RCT_MAPBOX_REGION_WILL_CHANGE_EVENT = @"regionwillchange";
-NSString *const RCT_MAPBOX_REGION_IS_CHANGING = @"regionischanging";
-NSString *const RCT_MAPBOX_REGION_DID_CHANGE = @"regiondidchange";
-
-NSString *const RCT_MAPBOX_WILL_START_LOADING_MAP = @"willstartloadingmap";
-NSString *const RCT_MAPBOX_DID_FINISH_LOADING_MAP = @"didfinishloadingmap";
-NSString *const RCT_MAPBOX_DID_FAIL_LOADING_MAP = @"didfailoadingmap";
-
-NSString *const RCT_MAPBOX_WILL_START_RENDERING_FRAME = @"willstartrenderingframe";
-NSString *const RCT_MAPBOX_DID_FINSIH_RENDERING_FRAME = @"didfinishrenderingframe";
-NSString *const RCT_MAPBOX_DID_FINISH_RENDERING_FRAME_FULLY = @"didfinishrenderingframefully";
-
-NSString *const RCT_MAPBOX_WILL_START_RENDERING_MAP = @"willstartrenderingmap";
-NSString *const RCT_MAPBOX_DID_FINISH_RENDERING_MAP = @"didfinishrenderingmap";
-NSString *const RCT_MAPBOX_DID_FINISH_RENDERING_MAP_FULLY = @"didfinishrenderingmapfully";
-
-NSString *const RCT_MAPBOX_DID_FINISH_LOADING_STYLE = @"didfinishloadingstyle";
-
-NSString *const RCT_MAPBOX_ANNOTATION_TAP = @"annotationtap";
-
-NSString *const RCT_MAPBOX_OFFLINE_PROGRESS = @"offlinestatus";
-NSString *const RCT_MAPBOX_OFFLINE_ERROR = @"offlineerror";
-NSString *const RCT_MAPBOX_OFFLINE_TILE_LIMIT = @"offlinetilelimit";
-
-NSString *const RCT_MAPBOX_SHAPE_SOURCE_LAYER_PRESS = @"shapesourcelayerpress";
-NSString *const RCT_MAPBOX_VECTOR_SOURCE_LAYER_PRESS = @"vectorsourcelayerpress";
-
-NSString *const RCT_MAPBOX_IMAGES_MISSING_IMAGE = @"imagesmissingimage";
-
-NSString *const RCT_MAPBOX_USER_LOCATION_UPDATE = @"MapboxUserLocationUpdate";
-
-@end

package/ios/MLRN/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/MLRN/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/MLRN/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/MLRN/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/MLRN/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/MLRN/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/MLRN/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

package/ios/MLRN/MLRNMapTouchEvent.m

@@ -1,70 +0,0 @@
-#import "MLRNMapTouchEvent.h"
-#import "MLRNEventTypes.h"
-#import "MLRNPointAnnotation.h"
-@import MapLibre;
-
-@implementation MLRNMapTouchEvent
-
-- (NSDictionary *)payload {
-  MLNPointFeature *feature = [[MLNPointFeature alloc] init];
-  feature.coordinate = _coordinate;
-  if (_id == nil) {
-    feature.attributes = @{
-      @"screenPointX" : [NSNumber numberWithDouble:_screenPoint.x],
-      @"screenPointY" : [NSNumber numberWithDouble:_screenPoint.y]
-    };
-  } else {
-    feature.attributes = @{
-      @"id" : _id,
-      @"screenPointX" : [NSNumber numberWithDouble:_screenPoint.x],
-      @"screenPointY" : [NSNumber numberWithDouble:_screenPoint.y]
-    };
-  }
-  return [feature geoJSONDictionary];
-}
-
-+ (MLRNMapTouchEvent *)makeTapEvent:(MLNMapView *)mapView withPoint:(CGPoint)point {
-  return [MLRNMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MAPBOX_EVENT_TAP];
-}
-
-+ (MLRNMapTouchEvent *)makeLongPressEvent:(MLNMapView *)mapView withPoint:(CGPoint)point {
-  return [MLRNMapTouchEvent _fromPoint:point
-                           withMapView:mapView
-                          andEventType:RCT_MAPBOX_EVENT_LONGPRESS];
-}
-
-+ (MLRNMapTouchEvent *)makeAnnotationTapEvent:(MLRNPointAnnotation *)pointAnnotation {
-  MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
-  event.type = RCT_MAPBOX_ANNOTATION_TAP;
-  event.id = pointAnnotation.id;
-  event.coordinate = pointAnnotation.coordinate;
-  event.screenPoint = [pointAnnotation.superview convertPoint:pointAnnotation.frame.origin
-                                                       toView:nil];
-  return event;
-}
-
-+ (MLRNMapTouchEvent *)makeAnnotationTapEventOnDrag:(MLRNPointAnnotation *)pointAnnotation {
-  MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
-  event.type = RCT_MAPBOX_ANNOTATION_TAP;
-  event.id = pointAnnotation.id;
-  CGPoint screenPoint = [pointAnnotation.superview convertPoint:pointAnnotation.layer.position
-                                                         toView:nil];
-  screenPoint.x -= (pointAnnotation.layer.bounds.size.width * pointAnnotation.layer.anchorPoint.x);
-  screenPoint.y -= (pointAnnotation.layer.bounds.size.height * pointAnnotation.layer.anchorPoint.y);
-  event.screenPoint = screenPoint;
-  event.coordinate = [pointAnnotation.map convertPoint:pointAnnotation.layer.position
-                                  toCoordinateFromView:pointAnnotation.map];
-  return event;
-}
-
-+ (MLRNMapTouchEvent *)_fromPoint:(CGPoint)point
-                      withMapView:(MLNMapView *)mapView
-                     andEventType:(NSString *)eventType {
-  MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
-  event.type = eventType;
-  event.coordinate = [mapView convertPoint:point toCoordinateFromView:mapView];
-  event.screenPoint = point;
-  return event;
-}
-
-@end