@maplibre/maplibre-react-native 10.0.0-alpha.8 → 10.0.0-beta.1

package/ios/MLRN/MLRNPointAnnotation.m

@@ -0,0 +1,243 @@
+#import "MLRNPointAnnotation.h"
+#import "MLRNMapTouchEvent.h"
+#import "MLRNUtils.h"
+#import <React/UIView+React.h>
+
+const float CENTER_X_OFFSET_BASE = -0.5f;
+const float CENTER_Y_OFFSET_BASE = -0.5f;
+
+@implementation MLRNPointAnnotation
+{
+    UITapGestureRecognizer *customViewTap;
+}
+
+- (id)init
+{
+    if (self = [super init]) {
+        customViewTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_handleTap:)];
+    }
+    return self;
+}
+
+- (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
+{
+    if ([subview isKindOfClass:[MLRNCallout class]]) {
+        self.calloutView = (MLRNCallout *)subview;
+        self.calloutView.representedObject = self;
+    } else {
+        [super insertReactSubview:subview atIndex:0];
+    }
+}
+
+- (void)removeReactSubview:(UIView *)subview
+{
+    if ([subview isKindOfClass:[MLRNCallout class]]) {
+        self.calloutView = nil;
+    } else {
+        [super removeReactSubview:subview];
+    }
+}
+
+- (void)reactSetFrame:(CGRect)frame
+{
+    if ([_map.annotations containsObject:self]) {
+        [_map removeAnnotation:self];
+    }
+    [super reactSetFrame:frame];
+    [self _setCenterOffset:frame];
+    [self _addAnnotation];
+}
+
+- (void)setAnchor:(NSDictionary<NSString *, NSNumber *> *)anchor
+{
+    _anchor = anchor;
+    [self _setCenterOffset:self.frame];
+}
+
+- (void)setMap:(MLNMapView *)map
+{
+    if (map == nil) {
+        [_map removeAnnotation:self];
+        _map = nil;
+    } else {
+        _map = map;
+
+        // prevents annotations from flying in from the top left corner
+        // if the frame hasn't been set yet
+        if (![self _isFrameSet]) {
+            return;
+        }
+
+        [self _addAnnotation];
+    }
+}
+
+- (void)setReactSelected:(BOOL)reactSelected
+{
+    _reactSelected = reactSelected;
+
+    if (_map != nil) {
+        if (_reactSelected) {
+            [_map selectAnnotation:self animated:NO completionHandler:nil];
+        } else {
+            [_map deselectAnnotation:self animated:NO];
+        }
+    }
+}
+
+- (void)setReactDraggable:(BOOL)reactDraggable
+{
+    _reactDraggable = reactDraggable;
+    self.draggable = _reactDraggable;
+}
+
+- (void)setReactCoordinate:(NSString *)reactCoordinate
+{
+    _reactCoordinate = reactCoordinate;
+    [self _updateCoordinate];
+}
+
+- (NSString *)reuseIdentifier
+{
+    return _id;
+}
+
+- (NSString *)title
+{
+    return _reactTitle;
+}
+
+- (NSString *)subtitle
+{
+    return _reactSnippet;
+}
+
+- (NSString *)toolTip
+{
+    return _reactTitle;
+}
+
+- (MLNAnnotationView *)getAnnotationView
+{
+    if (self.reactSubviews.count == 0) {
+        // default pin view
+        return nil;
+    } else {
+        // custom view
+        self.enabled = YES;
+        const CGFloat defaultZPosition = 0.0;
+        if (self.layer.zPosition == defaultZPosition) {
+            self.layer.zPosition = [self _getZPosition];
+        }
+        [self addGestureRecognizer:customViewTap];
+        return self;
+    }
+}
+
+- (CGFloat)_getZPosition
+{
+    double latitudeMax = 90.0;
+    return latitudeMax - self.coordinate.latitude;
+}
+
+- (void)_handleTap:(UITapGestureRecognizer *)recognizer
+{
+    [_map selectAnnotation:self animated:NO completionHandler:nil];
+}
+
+- (void)_setCenterOffset:(CGRect)frame
+{
+    if (frame.size.width == 0 || frame.size.height == 0 || _anchor == nil) {
+        return;
+    }
+
+    float x = [_anchor[@"x"] floatValue];
+    float y = [_anchor[@"y"] floatValue];
+
+    float dx = -(x * frame.size.width - (frame.size.width / 2));
+    float dy = -(y * frame.size.height - (frame.size.height / 2));
+
+    // special cases 0 and 1
+
+    if (x == 0) {
+        dx = frame.size.width / 2;
+    } else if (x == 1) {
+        dx = -frame.size.width / 2;
+    }
+
+    if (y == 0) {
+        dy = frame.size.height / 2;
+    } else if (y == 1) {
+        dy = -frame.size.height / 2;
+    }
+
+    self.centerOffset = CGVectorMake(dx, dy);
+}
+
+
+- (void)_updateCoordinate
+{
+    if (_reactCoordinate == nil) {
+        return;
+    }
+
+    MLNPointFeature *feature = (MLNPointFeature *)[MLRNUtils shapeFromGeoJSON:_reactCoordinate];
+    if (feature == nil) {
+        return;
+    }
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+       self.coordinate = feature.coordinate;
+    });
+}
+
+- (void)_addAnnotation
+{
+    if ([_map.annotations containsObject:self]) {
+        return;
+    }
+
+    [_map addAnnotation:self];
+    if (_reactSelected) {
+        [_map selectAnnotation:self animated:NO completionHandler:nil];
+    }
+}
+
+- (BOOL)_isFrameSet
+{
+    return self.frame.size.width > 0 && self.frame.size.height > 0;
+}
+
+- (void)setDragState:(MLNAnnotationViewDragState)dragState animated:(BOOL)animated {
+    [super setDragState:dragState animated:animated];
+    switch (dragState) {
+        case MLNAnnotationViewDragStateStarting: {
+            if (self.onDragStart != nil) {
+                MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEvent:self];
+                self.onDragStart([event toJSON]);
+            }
+            break;
+        }
+
+        case MLNAnnotationViewDragStateDragging:
+            if (self.onDrag != nil) {
+                MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEventOnDrag:self];
+                self.onDrag([event toJSON]);
+            }
+            break;
+
+        case MLNAnnotationViewDragStateEnding:
+        case MLNAnnotationViewDragStateCanceling: {
+            if (self.onDragEnd != nil) {
+                MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEvent:self];
+                self.onDragEnd([event toJSON]);
+            }
+            break;
+        }
+
+        case MLNAnnotationViewDragStateNone:
+            return;
+    }
+}
+
+@end

package/ios/MLRN/MLRNPointAnnotationManager.h

@@ -0,0 +1,5 @@
+#import "ViewManager.h"
+
+@interface MLRNPointAnnotationManager : ViewManager
+
+@end

package/ios/MLRN/MLRNPointAnnotationManager.m

@@ -0,0 +1,28 @@
+#import "MLRNPointAnnotationManager.h"
+#import "MLRNPointAnnotation.h"
+
+@implementation MLRNPointAnnotationManager
+
+RCT_EXPORT_MODULE()
+
+RCT_EXPORT_VIEW_PROPERTY(id, NSString)
+RCT_EXPORT_VIEW_PROPERTY(anchor, NSDictionary)
+
+RCT_REMAP_VIEW_PROPERTY(selected, reactSelected, BOOL)
+RCT_REMAP_VIEW_PROPERTY(title, reactTitle, NSString)
+RCT_REMAP_VIEW_PROPERTY(snippet, reactSnippet, NSString)
+RCT_REMAP_VIEW_PROPERTY(coordinate, reactCoordinate, NSString)
+RCT_REMAP_VIEW_PROPERTY(draggable, reactDraggable, BOOL)
+
+RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationSelected, onSelected, RCTBubblingEventBlock)
+RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDeselected, onDeselected, RCTBubblingEventBlock)
+RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDragStart, onDragStart, RCTBubblingEventBlock)
+RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDrag, onDrag, RCTBubblingEventBlock)
+RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDragEnd, onDragEnd, RCTBubblingEventBlock)
+
+- (UIView *)view
+{
+    return [[MLRNPointAnnotation alloc] init];
+}
+
+@end

package/ios/MLRN/MLRNRasterLayer.h

@@ -0,0 +1,6 @@
+#import "MLRNLayer.h"
+@import MapLibre;
+
+@interface MLRNRasterLayer : MLRNLayer
+
+@end

package/ios/MLRN/MLRNRasterLayer.m

@@ -0,0 +1,22 @@
+#import "MLRNRasterLayer.h"
+#import "MLRNStyle.h"
+
+@implementation MLRNRasterLayer
+
+- (MLNStyleLayer*)makeLayer:(MLNStyle*)style
+{
+    MLNSource *source =  [style sourceWithIdentifier:self.sourceID];
+    if (source == nil) { return nil; }
+    MLNRasterStyleLayer *layer = [[MLNRasterStyleLayer alloc] initWithIdentifier:self.id source:source];
+    return layer;
+}
+
+- (void)addStyles
+{
+    MLRNStyle *style = [[MLRNStyle alloc] initWithMLNStyle:self.style];
+    style.bridge = self.bridge;
+    [style rasterLayer:(MLNRasterStyleLayer*)self.styleLayer withReactStyle:self.reactStyle isValid:^{ return [self isAddedToMap];
+    }];
+}
+
+@end

package/ios/MLRN/MLRNRasterLayerManager.h

@@ -0,0 +1,5 @@
+#import "ViewManager.h"
+
+@interface MLRNRasterLayerManager : ViewManager
+
+@end

package/ios/MLRN/MLRNRasterLayerManager.m

@@ -0,0 +1,27 @@
+#import "MLRNRasterLayerManager.h"
+#import "MLRNRasterLayer.h"
+
+@implementation MLRNRasterLayerManager
+
+RCT_EXPORT_MODULE()
+
+// standard layer props
+RCT_EXPORT_VIEW_PROPERTY(id, NSString);
+RCT_EXPORT_VIEW_PROPERTY(sourceID, NSString);
+
+RCT_EXPORT_VIEW_PROPERTY(aboveLayerID, NSString);
+RCT_EXPORT_VIEW_PROPERTY(belowLayerID, NSString);
+RCT_EXPORT_VIEW_PROPERTY(layerIndex, NSNumber);
+RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
+
+RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber);
+RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber);
+
+- (UIView*)view
+{
+    MLRNRasterLayer *layer = [[MLRNRasterLayer alloc] init];
+    layer.bridge = self.bridge;
+    return layer;
+}
+
+@end

package/ios/MLRN/MLRNRasterSource.h

@@ -0,0 +1,8 @@
+#import "MLRNTileSource.h"
+@import MapLibre;
+
+@interface MLRNRasterSource : MLRNTileSource
+
+@property (nonatomic, strong) NSNumber *tileSize;
+
+@end

package/ios/MLRN/MLRNRasterSource.m

@@ -0,0 +1,27 @@
+#import "MLRNRasterSource.h"
+
+@implementation MLRNRasterSource
+
+- (nullable MLNSource*)makeSource
+{
+    if (self.url != nil) {
+        NSURL *url = [NSURL URLWithString:self.url];
+        if (self.tileSize != nil) {
+            return [[MLNRasterTileSource alloc] initWithIdentifier:self.id configurationURL:url tileSize:[self.tileSize floatValue]];
+        }
+        return [[MLNRasterTileSource alloc] initWithIdentifier:self.id configurationURL:url];
+    }
+    return [[MLNRasterTileSource alloc] initWithIdentifier:self.id tileURLTemplates:self.tileUrlTemplates options:[self getOptions]];
+}
+
+- (NSDictionary<MLNTileSourceOption,id> *)getOptions {
+    NSMutableDictionary<MLNTileSourceOption, id> *options = [[NSMutableDictionary alloc] initWithDictionary:[super getOptions]];
+    
+    if (self.tileSize != nil) {
+        options[MLNTileSourceOptionTileSize] = _tileSize;
+    }
+    
+    return options;
+}
+
+@end

package/ios/MLRN/MLRNRasterSourceManager.h

@@ -0,0 +1,5 @@
+#import "ViewManager.h"
+
+@interface MLRNRasterSourceManager : ViewManager
+
+@end

package/ios/MLRN/MLRNRasterSourceManager.m

@@ -0,0 +1,24 @@
+#import "MLRNRasterSourceManager.h"
+#import "MLRNRasterSource.h"
+
+@implementation MLRNRasterSourceManager
+
+RCT_EXPORT_MODULE()
+
+RCT_EXPORT_VIEW_PROPERTY(id, NSString)
+RCT_EXPORT_VIEW_PROPERTY(url, NSString)
+RCT_EXPORT_VIEW_PROPERTY(tileUrlTemplates, NSArray)
+RCT_EXPORT_VIEW_PROPERTY(attribution, NSString)
+
+RCT_EXPORT_VIEW_PROPERTY(tileSize, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
+
+RCT_EXPORT_VIEW_PROPERTY(tms, BOOL)
+
+- (UIView*)view
+{
+    return [MLRNRasterSource new];
+}
+
+@end

package/ios/MLRN/MLRNShapeSource.h

@@ -0,0 +1,45 @@
+#import <React/RCTBridge.h>
+#import "MLRNSource.h"
+
+@import MapLibre;
+
+@interface MLRNShapeSource : MLRNSource
+
+@property (nonatomic, weak) RCTBridge *bridge;
+
+@property (nonatomic, copy) NSString *url;
+@property (nonatomic, copy) NSString *shape;
+
+@property (nonatomic, strong) NSNumber *cluster;
+@property (nonatomic, strong) NSNumber *clusterRadius;
+@property (nonatomic, strong) NSNumber *clusterMaxZoomLevel;
+@property (nonatomic, strong) NSDictionary<NSString *, NSArray<NSExpression *> *> *clusterProperties;
+
+@property (nonatomic, strong) NSNumber *maxZoomLevel;
+@property (nonatomic, strong) NSNumber *buffer;
+@property (nonatomic, strong) NSNumber *tolerance;
+@property (nonatomic, strong) NSNumber *lineMetrics;
+
+@property (nonatomic, copy) RCTBubblingEventBlock onPress;
+@property (nonatomic, assign) BOOL hasPressListener;
+
+- (nonnull NSArray<id <MLNFeature>> *)featuresMatchingPredicate:(nullable NSPredicate *)predicate;
+- (nonnull NSArray<id <MLNFeature>> *)getClusterLeaves:(nonnull NSString *)featureJSON
+                                                number:(NSUInteger)number
+                                                offset:(NSUInteger)offset;
+- (nonnull NSArray<id <MLNFeature>> *)getClusterChildren:(nonnull NSString *)featureJSON;                                               
+
+- (double)getClusterExpansionZoom:(nonnull NSString *)featureJSON;
+
+// Deprecated. Will be removed in 9+ ver.
+- (nonnull NSArray<id <MLNFeature>> *)getClusterLeavesById:(nonnull NSNumber *)clusterId
+                                                number:(NSUInteger)number    
+                                                offset:(NSUInteger)offset;
+
+// Deprecated. Will be removed in 9+ ver.                                                
+- (nonnull NSArray<id <MLNFeature>> *)getClusterChildrenById:(nonnull NSNumber *)clusterId;     
+                                          
+// Deprecated. Will be removed in 9+ ver.
+- (double)getClusterExpansionZoomById:(nonnull NSNumber *)clusterId;
+
+@end

package/ios/MLRN/MLRNShapeSource.m

@@ -0,0 +1,186 @@
+#import "MLRNShapeSource.h"
+#import "MLRNUtils.h"
+#import "MLRNMapView.h"
+
+@implementation MLRNShapeSource
+
+static UIImage * _placeHolderImage;
+
+- (void)setUrl: (NSString*) url
+{
+    _url = url;
+    if (self.source != nil) {
+        MLNShapeSource *source = (MLNShapeSource *)self.source;
+        [source setURL: url == nil ? nil : [NSURL URLWithString:url]];
+    }
+}
+
+- (void)setShape:(NSString *)shape
+{
+    _shape = shape;
+
+    if (self.source != nil) {
+        MLNShapeSource *source = (MLNShapeSource *)self.source;
+        [source setShape: shape == nil ? nil : [MLRNUtils shapeFromGeoJSON:_shape]];
+    }
+}
+
+- (void)addToMap
+{
+    if (self.map.style == nil) {
+        return;
+    }
+    [super addToMap];
+}
+
+- (void)removeFromMap
+{
+    if (self.map.style == nil) {
+        return;
+    }
+
+    [super removeFromMap];
+}
+
+- (nullable MLNSource*)makeSource
+{
+    NSDictionary<MLNShapeSourceOption, id> *options = [self _getOptions];
+
+    if (_shape != nil) {
+        MLNShape *shape = [MLRNUtils shapeFromGeoJSON:_shape];
+        return [[MLNShapeSource alloc] initWithIdentifier:self.id shape:shape options:options];
+    }
+
+    if (_url != nil) {
+        NSURL *url = [[NSURL alloc] initWithString:_url];
+        return [[MLNShapeSource alloc] initWithIdentifier:self.id URL:url options:options];
+    }
+    return nil;
+}
+
+- (NSDictionary<MLNShapeSourceOption, id>*)_getOptions
+{
+    NSMutableDictionary<MLNShapeSourceOption, id> *options = [[NSMutableDictionary alloc] init];
+
+    if (_cluster != nil) {
+        options[MLNShapeSourceOptionClustered] = [NSNumber numberWithBool:[_cluster intValue] == 1];
+    }
+
+    if (_clusterRadius != nil) {
+        options[MLNShapeSourceOptionClusterRadius] = _clusterRadius;
+    }
+
+    if (_clusterMaxZoomLevel != nil) {
+        options[MLNShapeSourceOptionMaximumZoomLevelForClustering] = _clusterMaxZoomLevel;
+    }
+
+    if (_clusterProperties != nil) {
+       NSMutableDictionary<NSString *, NSArray *> *properties = [NSMutableDictionary new];
+
+        for (NSString *propertyName in _clusterProperties.allKeys) {
+            NSArray<NSExpression *> *expressions = [_clusterProperties objectForKey: propertyName];
+            NSExpression *firstExpression = [NSExpression expressionWithMLNJSONObject:[expressions objectAtIndex: 0]];
+            NSExpression *secondExpression = [NSExpression expressionWithMLNJSONObject:[expressions objectAtIndex: 1]];
+
+            [properties setObject:@[firstExpression, secondExpression] forKey:propertyName];
+        }
+
+        options[MLNShapeSourceOptionClusterProperties] = properties;
+    }
+    
+    if (_maxZoomLevel != nil) {
+        options[MLNShapeSourceOptionMaximumZoomLevel] = _maxZoomLevel;
+    }
+
+    if (_buffer != nil) {
+        options[MLNShapeSourceOptionBuffer] = _buffer;
+    }
+
+    if (_tolerance != nil) {
+        options[MLNShapeSourceOptionSimplificationTolerance] = _tolerance;
+    }
+
+    if (_lineMetrics != nil) {
+        options[MLNShapeSourceOptionLineDistanceMetrics] = _lineMetrics;
+    }
+
+    return options;
+}
+
+- (nonnull NSArray<id <MLNFeature>> *)featuresMatchingPredicate:(nullable NSPredicate *)predicate
+{
+    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
+
+    return [shapeSource featuresMatchingPredicate:predicate];
+}
+
+- (double)getClusterExpansionZoom:(nonnull NSString *)featureJSON
+{
+    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
+
+    MLNPointFeature *feature = (MLNPointFeature*)[MLRNUtils shapeFromGeoJSON:featureJSON];
+ 
+    return [shapeSource zoomLevelForExpandingCluster:(MLNPointFeatureCluster *)feature];
+}
+
+- (nonnull NSArray<id <MLNFeature>> *)getClusterLeaves:(nonnull NSString *)featureJSON
+    number:(NSUInteger)number
+    offset:(NSUInteger)offset
+{
+    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
+
+    MLNPointFeature *feature = (MLNPointFeature*)[MLRNUtils shapeFromGeoJSON:featureJSON];
+
+    MLNPointFeatureCluster * cluster = (MLNPointFeatureCluster *)feature;
+    return [shapeSource leavesOfCluster:cluster offset:offset limit:number];
+}
+
+- (nonnull NSArray<id <MLNFeature>> *)getClusterChildren:(nonnull NSString *)featureJSON
+{
+    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
+    
+    MLNPointFeature *feature = (MLNPointFeature*)[MLRNUtils shapeFromGeoJSON:featureJSON];
+    
+    MLNPointFeatureCluster * cluster = (MLNPointFeatureCluster *)feature;
+    return [shapeSource childrenOfCluster:cluster];
+}
+
+
+// Deprecated. Will be removed in 9+ ver.
+- (double)getClusterExpansionZoomById:(nonnull NSNumber *)clusterId
+{
+    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
+    NSArray<id<MLNFeature>> *features = [shapeSource featuresMatchingPredicate: [NSPredicate predicateWithFormat:@"%K = %i", @"cluster_id", clusterId.intValue]];
+    if (features.count == 0) {
+        return -1;
+    }
+    return [shapeSource zoomLevelForExpandingCluster:(MLNPointFeatureCluster *)features[0]];
+}
+
+// Deprecated. Will be removed in 9+ ver.
+- (nonnull NSArray<id <MLNFeature>> *)getClusterLeavesById:(nonnull NSNumber *)clusterId
+    number:(NSUInteger)number
+    offset:(NSUInteger)offset
+{
+    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
+    
+    NSPredicate* predicate = [NSPredicate predicateWithFormat:@"cluster_id == %@", clusterId];
+    NSArray<id<MLNFeature>> *features = [shapeSource featuresMatchingPredicate:predicate];
+    
+    MLNPointFeatureCluster * cluster = (MLNPointFeatureCluster *)features[0];
+    return [shapeSource leavesOfCluster:cluster offset:offset limit:number];
+}
+
+// Deprecated. Will be removed in 9+ ver.
+- (nonnull NSArray<id <MLNFeature>> *)getClusterChildrenById:(nonnull NSNumber *)clusterId
+{
+    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
+    
+    NSPredicate* predicate = [NSPredicate predicateWithFormat:@"cluster_id == %@", clusterId];
+    NSArray<id<MLNFeature>> *features = [shapeSource featuresMatchingPredicate:predicate];
+    
+    MLNPointFeatureCluster * cluster = (MLNPointFeatureCluster *)features[0];
+    return [shapeSource childrenOfCluster:cluster];
+}
+
+@end

package/ios/MLRN/MLRNShapeSourceManager.h

@@ -0,0 +1,6 @@
+#import "ViewManager.h"
+#import <React/RCTBridgeModule.h>
+
+@interface MLRNShapeSourceManager : ViewManager<RCTBridgeModule>
+
+@end