@rnmapbox/maps 10.0.0-beta.28

package/ios/RCTMGL-v10/RCTMGLUtils.swift

@@ -0,0 +1,53 @@
+import MapboxMaps
+
+class RCTMGLUtils {
+  static func fetchImage(_ bridge: RCTBridge, url: String?, scale:Double, callback: @escaping (_ error: Error?, _ image: UIImage?) -> Void) {
+    guard let url = url else {
+      fatalError("FetchImage called with nil as url")
+    }
+    RCTMGLImageQueue.sharedInstance.addImage(url, scale: scale, bridge: bridge, handler: callback)
+  }
+  
+  static func fetchImages(_ bridge: RCTBridge, style: Style, objects: [String:Any], forceUpdate: Bool, callback: @escaping ()->Void) {
+    guard !objects.isEmpty else {
+      callback()
+      return
+    }
+    
+    let imageNames = objects.keys
+    var imagesToLoad: Int = imageNames.count
+    
+    let imageLoadedBlock = { () in
+      imagesToLoad = imagesToLoad - 1;
+      if imagesToLoad == 0 {
+        callback()
+      }
+    }
+    
+    for imageName in imageNames {
+      let foundImage: UIImage? = forceUpdate ? nil : style.image(withId: imageName)
+      
+      if (forceUpdate || foundImage == nil) {
+        let image = objects[imageName]
+        if let image = image as? [String:Any] {
+          let hasScale = image["scale"] != nil
+          let scale = hasScale ? (image["scale"] as! NSNumber).doubleValue : 1.0
+          RCTMGLImageQueue.sharedInstance.addImage(objects[imageName], scale: scale, bridge:bridge) {
+            (error,image) in
+            if image == nil {
+              RCTLogWarn("Failed to fetch image: \(imageName) error:\(error)")
+            }
+            else {
+              DispatchQueue.main.async {
+                if let image = image {
+                  try! style.addImage(image, id: imageName, stretchX: [], stretchY: [])
+                  imageLoadedBlock()
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/ios/RCTMGL-v10/RCTMGLVectorLayer.m

@@ -0,0 +1,58 @@
+//
+//  RCTMGLCircleLayer.m
+//  RCTMGL
+//
+//  Created by Nick Italiano on 9/18/17.
+//  Copyright © 2017 Mapbox Inc. All rights reserved.
+//
+
+//#import "RCTMGLStyle.h"
+// #import "FilterParser.h"
+#import <React/RCTLog.h>
+
+//@implementation RCTMGLVectorLayer
+
+/*
+- (NSPredicate*)buildFilters
+{
+    return self.filter ? [FilterParser parse:self.filter] : nil;
+}
+
+- (void)updateFilter:(NSPredicate *)predicate
+{
+    @try {
+        ((MGLVectorStyleLayer *) self.styleLayer).predicate = predicate;
+    }
+    @catch (NSException* exception) {
+        RCTLogError(@"Invalid predicate: %@ on layer %@ - %@ reason: %@", predicate, self, exception.name, exception.reason);
+    }
+}
+
+- (void)setSourceLayerID:(NSString *)sourceLayerID
+{
+    _sourceLayerID = sourceLayerID;
+    
+    if (self.styleLayer != nil) {
+        ((MGLVectorStyleLayer*) self.styleLayer).sourceLayerIdentifier = _sourceLayerID;
+    }
+}
+
+- (void)addedToMap
+{
+    NSPredicate *filter = [self buildFilters];
+    if (filter != nil) {
+        [self updateFilter:filter];
+    }
+}
+
+- (void)setFilter:(NSArray*)filter
+{
+    [super setFilter: filter];
+
+    if (self.styleLayer != nil) {
+        NSPredicate *predicate = [self buildFilters];
+        [self updateFilter:predicate];
+    }
+}*/
+
+//@end

package/ios/RCTMGL-v10/RCTMGLVectorLayer.swift

@@ -0,0 +1,49 @@
+import MapboxMaps
+
+@objc(RCTMGLVectorLayer)
+class RCTMGLVectorLayer: RCTMGLLayer {
+  //@property (nonatomic, copy) NSString *sourceLayerID;
+/*
+- (NSPredicate*)buildFilters
+{
+    return self.filter ? [FilterParser parse:self.filter] : nil;
+}
+
+- (void)updateFilter:(NSPredicate *)predicate
+{
+    @try {
+        ((MGLVectorStyleLayer *) self.styleLayer).predicate = predicate;
+    }
+    @catch (NSException* exception) {
+        RCTLogError(@"Invalid predicate: %@ on layer %@ - %@ reason: %@", predicate, self, exception.name, exception.reason);
+    }
+}
+
+- (void)setSourceLayerID:(NSString *)sourceLayerID
+{
+    _sourceLayerID = sourceLayerID;
+    
+    if (self.styleLayer != nil) {
+        ((MGLVectorStyleLayer*) self.styleLayer).sourceLayerIdentifier = _sourceLayerID;
+    }
+}
+
+- (void)addedToMap
+{
+    NSPredicate *filter = [self buildFilters];
+    if (filter != nil) {
+        [self updateFilter:filter];
+    }
+}
+
+- (void)setFilter:(NSArray*)filter
+{
+    [super setFilter: filter];
+
+    if (self.styleLayer != nil) {
+        NSPredicate *predicate = [self buildFilters];
+        [self updateFilter:predicate];
+    }
+}
+*/
+}

package/ios/RCTMGL-v10/RCTMGLVectorSource.swift

@@ -0,0 +1,57 @@
+import MapboxMaps
+
+@objc
+class RCTMGLVectorSource : RCTMGLTileSource {
+  
+  @objc var attribution: String?
+  @objc var maxZoomLevel: NSNumber?
+  @objc var minZoomLevel: NSNumber?
+  @objc var tileUrlTemplates: [String] = []
+  @objc var tms: Bool = false
+  
+  override func sourceType() -> Source.Type {
+    return VectorSource.self
+  }
+
+  override func makeSource() -> Source
+  {
+    var result = VectorSource()
+    if let url = url {
+      result.url = url
+    } else {
+      result.tiles = tileUrlTemplates
+    }
+    if let attribution = attribution {
+      result.attribution = attribution
+    }
+    if let maxZoomLevel = maxZoomLevel {
+      result.maxzoom = maxZoomLevel.doubleValue
+    }
+    if let minZoomLevel = minZoomLevel {
+      result.minzoom = minZoomLevel.doubleValue
+    }
+    if tms {
+      result.scheme = .tms
+    }
+    return result
+  }
+  
+  
+  
+  /*
+  - (nullable MGLSource*)makeSource
+{
+    if (self.url != nil) {
+        return [[MGLVectorTileSource alloc] initWithIdentifier:self.id configurationURL:[NSURL URLWithString:self.url]];
+    }
+    return [[MGLVectorTileSource alloc] initWithIdentifier:self.id tileURLTemplates:self.tileUrlTemplates options:[self getOptions]];
+}
+
+- (nonnull NSArray<id <MGLFeature>> *)featuresInSourceLayersWithIdentifiers:(nonnull NSSet<NSString *> *)sourceLayerIdentifiers predicate:(nullable NSPredicate *)predicate
+{
+    MGLVectorTileSource* vectorSource = (MGLVectorTileSource*)self.source;
+    
+    return [vectorSource featuresInSourceLayersWithIdentifiers:sourceLayerIdentifiers predicate: predicate];
+}*/
+
+}

package/ios/RCTMGL-v10/RCTMGLVectorSourceManager.m

@@ -0,0 +1,21 @@
+#import <React/RCTBridgeModule.h>
+#import <React/RCTViewManager.h>
+
+@interface RCT_EXTERN_MODULE(RCTMGLVectorSourceManager, RCTViewManager)
+
+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(minZoomLevel, NSNumber)
+RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
+
+RCT_EXPORT_VIEW_PROPERTY(tms, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(hasPressListener, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(hitbox, NSDictionary)
+RCT_REMAP_VIEW_PROPERTY(onMapboxVectorSourcePress, onPress, RCTBubblingEventBlock)
+
+@end

package/ios/RCTMGL-v10/RCTMGLVectorSourceManager.swift

@@ -0,0 +1,11 @@
+@objc(RCTMGLVectorSourceManager)
+class RCTMGLVectorSourceManager: RCTViewManager {
+  @objc
+  override static func requiresMainQueueSetup() -> Bool {
+    return true
+  }
+ 
+  @objc override func view() -> UIView {
+    return RCTMGLVectorSource()
+  }
+}

package/ios/RCTMGL-v10/RCTSwiftLog.h

@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+@interface RCTMGLSwiftLog : NSObject
+
++ (void)error:(NSString * _Nonnull)message file:(NSString * _Nonnull)file line:(NSUInteger)line;
++ (void)warn:(NSString * _Nonnull)message file:(NSString * _Nonnull)file line:(NSUInteger)line;
++ (void)info:(NSString * _Nonnull)message file:(NSString * _Nonnull)file line:(NSUInteger)line;
++ (void)log:(NSString * _Nonnull)message file:(NSString * _Nonnull)file line:(NSUInteger)line;
++ (void)trace:(NSString * _Nonnull)message file:(NSString * _Nonnull)file line:(NSUInteger)line;
+
+@end

package/ios/RCTMGL-v10/RCTSwiftLog.m

@@ -0,0 +1,32 @@
+#import <React/RCTLog.h>
+
+#import "RCTSwiftLog.h"
+
+@implementation RCTMGLSwiftLog
+
++ (void)info:(NSString *)message file:(NSString *)file line:(NSUInteger)line
+{
+  _RCTLogNativeInternal(RCTLogLevelInfo, file.UTF8String, (int)line, @"%@", message);
+}
+
++ (void)warn:(NSString *)message file:(NSString *)file line:(NSUInteger)line
+{
+  _RCTLogNativeInternal(RCTLogLevelWarning, file.UTF8String, (int)line, @"%@", message);
+}
+
++ (void)error:(NSString *)message file:(NSString *)file line:(NSUInteger)line
+{
+  _RCTLogNativeInternal(RCTLogLevelError, file.UTF8String, (int)line, @"%@", message);
+}
+
++ (void)log:(NSString *)message file:(NSString *)file line:(NSUInteger)line
+{
+  _RCTLogNativeInternal(RCTLogLevelInfo, file.UTF8String, (int)line, @"%@", message);
+}
+
++ (void)trace:(NSString *)message file:(NSString *)file line:(NSUInteger)line
+{
+  _RCTLogNativeInternal(RCTLogLevelTrace, file.UTF8String, (int)line, @"%@", message);
+}
+
+@end

package/ios/RCTMGL-v10/README.md

@@ -0,0 +1 @@
+iOS v10 code

package/ios/RCTMGL-v10/RNMBImageUtils.swift

@@ -0,0 +1,20 @@
+class RNMBImageUtils {
+  static func createTempFile(_ image: UIImage) -> URL {
+    let fileID = UUID().uuidString
+    let pathComponent = "Documents/rctmgl-snapshot-\(fileID).png"
+    
+    let filePath = URL(fileURLWithPath: NSHomeDirectory()).appendingPathComponent(pathComponent)
+    
+    let data = image.pngData()
+    try! data?.write(to: filePath, options: [.atomic])
+    return filePath
+  }
+  
+  static func createBase64(_ image: UIImage) -> URL {
+    let data = image.pngData()
+    let b64string : String = data!.base64EncodedString(options: [.endLineWithCarriageReturn])
+    let result = "data:image/png;base64,\(b64string)"
+    return URL(string: result)!
+  }
+}
+

package/ios/install.md

@@ -0,0 +1,102 @@
+# iOS Installation
+
+## React-Native > `0.60.0`
+
+The following assumes, that you're using autolinking and installed
+
+`@rnmapbox/maps` via `npm` or `yarn`.
+
+<br>
+
+The following is required for every following setup
+
+Add the following to your `ios/Podfile`:
+
+```ruby
+  pre_install do |installer|
+    $RNMapboxMaps.pre_install(installer)
+    ... other pre install hooks
+  end
+```
+
+```ruby
+  post_install do |installer|
+    $RNMapboxMaps.post_install(installer)
+    ... other post install hooks
+  end
+```
+
+Running `pod install` will add MapLibre SDK via SwiftPackageManager
+
+```sh
+# Go to the ios folder
+cd ios
+
+# Run Pod Install
+pod install
+```
+
+You are good to go!
+
+Read on if you want to edit your Mapbox version or flavor.
+
+<br>
+
+## Maplibre
+
+[MapLibre](https://github.com/maplibre/maplibre-gl-native) is an OSS fork of MapboxGL
+
+Current default MapLibre version is `5.12.0`
+
+This is the default and requires no further setup`ios/Podfile`
+
+If you want to change the version used:
+
+```ruby
+$RNMapboxMapsImpl = 'maplibre' # optional as this is the default
+$RNMapboxMapsVersion = 'exactVersion 5.12.1'
+```
+
+MapLibre is consumed via Swift Package Manager, use `RNMapboxMapsSwiftPackageManager` to change other details than version
+
+```ruby
+$RNMapboxMapsSwiftPackageManager = {
+    url: "https://github.com/maplibre/maplibre-gl-native-distribution",
+    requirement: {
+      kind: "upToNextMajorVersion",
+      minimumVersion: "5.12.1"
+    },
+    product_name: "Mapbox"
+  }
+```
+
+<br/>
+
+## Mapbox Maps SDK (v10)
+
+Check the current version of the SDK [here](https://docs.mapbox.com/ios/maps/overview/).
+
+```ruby
+$RNMapboxMapsImpl = 'mapbox'
+$RNMapboxMapsVersion = '~> 10.6.0'
+```
+
+You will need to authorize your download of the Maps SDK with a secret access token with the `DOWNLOADS:READ` scope. This [guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) explains how to configure the secret token under section `Configure your secret token`.
+
+<br/>
+
+## Mapbox Maps GL SDK (9.0 or earlier)
+
+This is the old version of mapbox gl (deprecated)
+
+```ruby
+$RNMapboxMapsImpl = 'mapbox-gl'
+$RNMapboxMapsVersion = '~> 5.9.0'
+```
+
+### Mapbox Maps GL SDK > `v6.0.0`
+
+If you are using version `v6.0.0` of the SDK or later, you will need to authorize your download of the Maps SDK with a secret access token with the `DOWNLOADS:READ` scope. This [guide](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) explains how to configure the secret token under section `Configure your secret token`.
+
+<br>
+

package/javascript/components/AbstractLayer.js

@@ -0,0 +1,49 @@
+/* eslint react/prop-types:0  */
+import React from 'react';
+import { processColor } from 'react-native';
+import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
+
+import { getFilter } from '../utils/filterUtils';
+import { getStyleType } from '../utils/styleMap';
+import BridgeValue from '../utils/BridgeValue';
+import { transformStyle } from '../utils/StyleValue';
+
+class AbstractLayer extends React.PureComponent {
+  get baseProps() {
+    return {
+      ...this.props,
+      id: this.props.id,
+      sourceID: this.props.sourceID,
+      reactStyle: this.getStyle(),
+      minZoomLevel: this.props.minZoomLevel,
+      maxZoomLevel: this.props.maxZoomLevel,
+      aboveLayerID: this.props.aboveLayerID,
+      belowLayerID: this.props.belowLayerID,
+      layerIndex: this.props.layerIndex,
+      filter: getFilter(this.props.filter),
+      style: undefined,
+    };
+  }
+
+  getStyleTypeFormatter(styleType) {
+    if (styleType === 'color') {
+      return processColor;
+    }
+  }
+
+  getStyle() {
+    return transformStyle(this.props.style);
+  }
+
+  setNativeProps(props) {
+    if (this.refs.nativeLayer) {
+      let propsToPass = props;
+      if (props.style) {
+        propsToPass = { ...props, reactStyle: this.getStyle(props.style) };
+      }
+      this.refs.nativeLayer.setNativeProps(propsToPass);
+    }
+  }
+}
+
+export default AbstractLayer;

package/javascript/components/AbstractSource.js

@@ -0,0 +1,15 @@
+import React from 'react';
+
+class AbstractSource extends React.PureComponent {
+  setNativeProps(props) {
+    if (this._nativeRef) {
+      this._nativeRef.setNativeProps(props);
+    } else {
+      if (this.refs.nativeSource) {
+        this.refs.nativeSource.setNativeProps(props);
+      }
+    }
+  }
+}
+
+export default AbstractSource;

package/javascript/components/Atmosphere.tsx

@@ -0,0 +1,28 @@
+import React, { memo, useMemo } from 'react';
+import { HostComponent, requireNativeComponent } from 'react-native';
+
+import type { AtmosphereLayerStyleProps } from '../utils/MapboxStyles';
+import { StyleValue, transformStyle } from '../utils/StyleValue';
+
+export const NATIVE_MODULE_NAME = 'RCTMGLAtmosphere';
+
+type Props = {
+  style: AtmosphereLayerStyleProps;
+};
+
+export const Atmosphere = memo((props: Props) => {
+  const baseProps = useMemo(() => {
+    return {
+      ...props,
+      reactStyle: transformStyle(props.style),
+      style: undefined,
+    };
+  }, [props]);
+
+  return <RCTMGLAtmosphere {...baseProps} />;
+});
+
+const RCTMGLAtmosphere: HostComponent<{
+  reactStyle?: { [key: string]: StyleValue };
+  style?: undefined;
+}> = requireNativeComponent(NATIVE_MODULE_NAME);

package/javascript/components/BackgroundLayer.js

@@ -0,0 +1,97 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { NativeModules, requireNativeComponent } from 'react-native';
+
+import { viewPropTypes } from '../utils';
+import { BackgroundLayerStyleProp } from '../utils/styleMap';
+
+import AbstractLayer from './AbstractLayer';
+
+const MapboxGL = NativeModules.MGLModule;
+
+export const NATIVE_MODULE_NAME = 'RCTMGLBackgroundLayer';
+
+class BackgroundLayer extends AbstractLayer {
+  static propTypes = {
+    ...viewPropTypes,
+
+    /**
+     * A string that uniquely identifies the source in the style to which it is added.
+     */
+    id: PropTypes.string.isRequired,
+
+    /**
+     * The source from which to obtain the data to style.
+     * If the source has not yet been added to the current style, the behavior is undefined.
+     * Inferred from parent source only if the layer is a direct child to it.
+     */
+    sourceID: PropTypes.string,
+
+    /**
+     * Identifier of the layer within the source identified by the sourceID property from which the receiver obtains the data to style.
+     */
+    sourceLayerID: PropTypes.string,
+
+    /**
+     * Inserts a layer above aboveLayerID.
+     */
+    aboveLayerID: PropTypes.string,
+
+    /**
+     * Inserts a layer below belowLayerID
+     */
+    belowLayerID: PropTypes.string,
+
+    /**
+     * Inserts a layer at a specified index
+     */
+    layerIndex: PropTypes.number,
+
+    /**
+     *  Filter only the features in the source layer that satisfy a condition that you define
+     */
+    filter: PropTypes.array,
+
+    /**
+     * The minimum zoom level at which the layer gets parsed and appears.
+     */
+    minZoomLevel: PropTypes.number,
+
+    /**
+     * The maximum zoom level at which the layer gets parsed and appears.
+     */
+    maxZoomLevel: PropTypes.number,
+
+    /**
+     * Customizable style attributes
+     */
+    style: PropTypes.oneOfType([
+      BackgroundLayerStyleProp,
+      PropTypes.arrayOf(BackgroundLayerStyleProp),
+    ]),
+  };
+
+  static defaultProps = {
+    sourceID: MapboxGL.StyleSource.DefaultSourceID,
+  };
+
+  render() {
+    return (
+      <RCTMGLBackgroundLayer
+        testID="rctmglBackgroundLayer"
+        ref="nativeLayer"
+        {...this.baseProps}
+      />
+    );
+  }
+}
+
+const RCTMGLBackgroundLayer = requireNativeComponent(
+  NATIVE_MODULE_NAME,
+  BackgroundLayer,
+  {
+    nativeOnly: { reactStyle: true },
+  },
+);
+
+export default BackgroundLayer;