Merge tag '7.0.4' into release/7.0.4-robin

.eslintrc.js

@@ -54,7 +54,8 @@ module.exports = {
     "plugin:flowtype/recommended"
   ],
   "rules": {
-    "react/no-deprecated": "error",
+    "react/no-deprecated": "warn",
+    "react/no-string-refs": "warn",
     "import/named": [2],
     "import/no-named-default": [0],
     "import/order": ["error", { "groups": ["builtin", "external", "parent", "sibling", "index"], "newlines-between": "always" }],

.gitignore

@@ -50,6 +50,7 @@ reactnativemapboxgl.iml
 coverage
 .project
 *.core.prefs
+*.iml
 
 # Buck
 .buckd
@@ -58,3 +59,6 @@ buck-out
 /ReactAndroid/src/main/jni/prebuilt/lib/x86/
 /ReactAndroid/src/main/gen
 
+# VSCode
+.vscode/
+.classpath

CHANGELOG.md

@@ -2,9 +2,9 @@
 
 ### Breaking changes:
 
-* iOS mapbox libraries updated to [5.0.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/ios-v5.0.0) android libraries updated to [8.0.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.0.0)
-* `StyleSheet.create` removed.  
-Mapbox styles are now just a map no need for `StyleSheet.create`.  
+* iOS mapbox libraries updated to [5.2.0](https://github.com/mapbox/mapbox-gl-native/releases/tag/ios-v5.2.0) android libraries updated to [8.2.1](https://github.com/mapbox/mapbox-gl-native/releases/tag/android-v8.2.1)
+* `StyleSheet.create` removed.
+Mapbox styles are now just a map no need for `StyleSheet.create`.
 `StylesSheet.identity` also removed, use expressions array instead:
    ```jsx
    mapboxStyle=MapboxGL.Stylesheet.create({..., fillColor: MapboxGL.Stylesheet.identity('color') ...})
@@ -14,7 +14,7 @@ Mapbox styles are now just a map no need for `StyleSheet.create`.
      <FillLayer style={mapboxStyle}... />
    </MapView>
    ```
-   
+
    is now:
    ```jsx
    mapboxStyle={..., fillColor: ['get', 'color'] ...}
@@ -37,9 +37,9 @@ Mapbox styles are now just a map no need for `StyleSheet.create`.
       ...
    </MapView>
    ```
-    
+
    is now:
-   
+
    ```jsx
    <MapView
      ...
@@ -60,9 +60,9 @@ Mapbox styles are now just a map no need for `StyleSheet.create`.
       ...
    </MapView>
    ```
-    
+
    is now:
-   
+
    ```jsx
    <MapView
      ...
@@ -72,10 +72,24 @@ Mapbox styles are now just a map no need for `StyleSheet.create`.
         followUserMode="normal"
      />
    </MapView>
-   ``` 
+   ```
    The following properties were changed:
    * MapView#userTrackingMode is now Camera#followUserMode and Camera#followUserLocation
    * followUserMode is now a string with ('normal','compass','course'), and UserTrackingModes enum is deprecated
-   * MapView#onUserTrackingModeChange is now Camera#onUserTrackingModeChange and payload contains followUserMode and followUserLocation. 
+   * MapView#onUserTrackingModeChange is now Camera#onUserTrackingModeChange and payload contains followUserMode and followUserLocation.
+
+* ShapeSource#images was depreacted, use Images#images instead.
+   ```jsx
+   <MapView
+     ...
+   >
+     ...
+     <Images images={{pin, dot}} />
+     ...
+     <ShapeSource ... >
+        <SymbolLayer ...>
+     </ShapeSource>
+   </MapView>
+   ```
 
 * TODO document all changes

CONTRIBUTING.md

@@ -17,3 +17,10 @@ commit the changes and push them to a fork for creating a pull request.
 
 1. If you add a feature, make sure you add it to the documentation
 1. If you add an objective-c or java method, make sure you update the declaration file: `index.d.ts`.
+
+
+## Documentation
+
+1. Documentation is auto-generated from code blocks and comments. To generate documentation:
+  1. `npm install -g documentation` to install documentation generator
+  1. `npm run generate` to generate updated documentation

README.md

@@ -69,6 +69,10 @@ npm install @react-native-mapbox-gl/maps --save
 * [OfflineManager](/docs/OfflineManager.md)
 * [SnapshotManager](/docs/snapshotManager.md)
 
+### Misc
+* [CustomHttpHeaders](/docs/CustomHttpHeaders.md)
+
+
 ## Expo Support
 We have a feature request open with Expo if you want to see it get in show your support https://expo.canny.io/feature-requests/p/add-mapbox-gl-support
 

__tests__/modules/snapshot/SnapshotOptions.test.js

@@ -25,6 +25,7 @@ describe('SnapshotOptions', () => {
       height: 50.0,
       writeToDisk: false,
       centerCoordinate: JSON.stringify(makePoint(centerCoordinate)),
+      withLogo: true,
     });
   });
 
@@ -37,6 +38,7 @@ describe('SnapshotOptions', () => {
       width: 314,
       height: 600,
       writeToDisk: true,
+      withLogo: true,
       styleURL: NativeModules.MGLModule.StyleURL.Dark,
     };
 
@@ -56,6 +58,7 @@ describe('SnapshotOptions', () => {
       height: 600,
       styleURL: NativeModules.MGLModule.StyleURL.Light,
       writeToDisk: false,
+      withLogo: true,
     };
 
     const geoJSONBounds = JSON.stringify(

android/build.gradle

@@ -0,0 +1,34 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext {
+        buildToolsVersion = "28.0.3"
+        minSdkVersion = 16
+        compileSdkVersion = 28
+        targetSdkVersion = 28
+        supportLibVersion = "28.0.0"
+    }
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.3.1'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        mavenLocal()
+        google()
+        jcenter()
+        maven { url "https://jitpack.io" }
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url "$rootDir/../node_modules/react-native/android"
+        }
+    }
+}

android/install.md

@@ -1,9 +1,12 @@
 # Android Installation
+
+## If you are using autolinking feature introduced in React-Native `0.60.0` you can skip `react-native link react-native-mapbox-gl` command and just follow first paragraph
+
 `react-native link` should get you almost there,  
 however we need to add some additional lines to `build.gradle`.
 
 
-## `android/build.gradle`
+## 1. `android/build.gradle`
 We need to add an additional repository in order to get our dependencies.
 
 * `https://jitpack.io`
@@ -42,7 +45,7 @@ however it never hurts to make sure it actually did what it was supposed to
 ---
 
 
-## `android/app/build.gradle`
+## 2. `android/app/build.gradle`
 
 Add project under `dependencies`
 
@@ -60,7 +63,7 @@ You can set the Support Library version or the okhttp version if you use other m
 * `okhttpVersion "3.12.1"`
 
 
-## `android/app/settings.gradle`
+## 3. `android/app/settings.gradle`
 
 Include project, so gradle knows where to find the project
 
@@ -73,7 +76,7 @@ rootProject.name = <YOUR_PROJECT_NAME>
 include ':app'¬
 ```
 
-## `android/app/src/main/java/com/PROJECT_NAME/MainApplication.java`
+## 4. `android/app/src/main/java/com/PROJECT_NAME/MainApplication.java`
 
 We need to register our package
 

android/rctmgl/build.gradle

@@ -27,12 +27,12 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // React Native
-    compileOnly "com.facebook.react:react-native:+"
+    implementation "com.facebook.react:react-native:+"
 
     // Mapbox SDK
 
     implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:4.8.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.0.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.2.1'
 
     // Dependencies
     implementation "com.android.support:support-vector-drawable:${safeExtGet('supportLibVersion', '28.0.0')}"
@@ -41,7 +41,8 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:${safeExtGet('okhttpVersion', '3.12.1')}"
 
     // Mapbox plugins
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v7:0.9.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v7:0.2.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-gestures:0.5.1'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v8:0.10.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v8:0.3.0'
     implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:4.8.0'
 }

android/rctmgl/src/main/java/com/mapbox/rctmgl/components/AbstractEvent.java

@@ -8,11 +8,13 @@
 
 public class AbstractEvent extends Event<AbstractEvent> {
     private String mEventName;
+    private final boolean mCanCoalesce;
     private WritableMap mEvent;
 
-    public AbstractEvent(int viewId, String eventName, @Nullable WritableMap event) {
+    public AbstractEvent(int viewId, String eventName, boolean canCoalesce, @Nullable WritableMap event) {
         super(viewId);
         mEventName = eventName;
+        mCanCoalesce = canCoalesce;
         mEvent = event;
     }
 
@@ -25,4 +27,9 @@ public String getEventName() {
     public void dispatch(RCTEventEmitter rctEventEmitter) {
         rctEventEmitter.receiveEvent(getViewTag(), getEventName(), mEvent);
     }
+
+    @Override
+    public boolean canCoalesce() {
+        return mCanCoalesce;
+    }
 }

android/rctmgl/src/main/java/com/mapbox/rctmgl/components/AbstractEventEmitter.java

@@ -43,7 +43,7 @@ public void handleEvent(IEvent event) {
         }
 
         mRateLimitedEvents.put(eventCacheKey, System.currentTimeMillis());
-        mEventDispatcher.dispatchEvent(new AbstractEvent(event.getID(), event.getKey(), event.toJSON()));
+        mEventDispatcher.dispatchEvent(new AbstractEvent(event.getID(), event.getKey(), event.canCoalesce(), event.toJSON()));
     }
 
     @Override

android/rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLCalloutManager.java

@@ -8,7 +8,7 @@
  */
 
 public class RCTMGLCalloutManager extends ViewGroupManager<RCTMGLCallout> {
-    public static final String REACT_CLASS = RCTMGLCallout.class.getSimpleName();
+    public static final String REACT_CLASS = "RCTMGLCallout";
 
     @Override
     public String getName() {

android/rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotationManager.java

@@ -16,7 +16,7 @@
  */
 
 public class RCTMGLPointAnnotationManager extends AbstractEventEmitter<RCTMGLPointAnnotation> {
-    public static final String REACT_CLASS = RCTMGLPointAnnotation.class.getSimpleName();
+    public static final String REACT_CLASS = "RCTMGLPointAnnotation";
 
     public RCTMGLPointAnnotationManager(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);

android/rctmgl/src/main/java/com/mapbox/rctmgl/components/camera/CameraStop.java

@@ -30,13 +30,14 @@ public class CameraStop {
     private int mBoundsPaddingLeft = 0;
     private int mBoundsPaddingRight = 0;
     private int mBoundsPaddingBottom = 0;
-    private int mBooundsPaddingTop = 0;
+    private int mBoundsPaddingTop = 0;
 
     private int mMode = CameraMode.EASE;
     private int mDuration = 2000;
     private MapboxMap.CancelableCallback mCallback;
 
-    public CameraStop() {}
+    public CameraStop() {
+    }
 
     public void setBearing(double bearing) {
         mBearing = bearing;
@@ -66,7 +67,7 @@ public void setBounds(LatLngBounds bounds, int paddingLeft, int paddingRight, in
         mBounds = bounds;
         mBoundsPaddingLeft = paddingLeft;
         mBoundsPaddingRight = paddingRight;
-        mBooundsPaddingTop = paddingTop;
+        mBoundsPaddingTop = paddingTop;
         mBoundsPaddingBottom = paddingBottom;
     }
 
@@ -91,14 +92,23 @@ public CameraUpdateItem toCameraUpdate(MapboxMap map) {
         } else if (mBounds != null) {
             double tilt = mTilt != null ? mTilt : currentCamera.tilt;
             double bearing = mBearing != null ? mBearing : currentCamera.bearing;
-            int[] cameraPadding = {mBoundsPaddingLeft, mBooundsPaddingTop, mBoundsPaddingRight, mBoundsPaddingBottom};
+
+            // Adding map padding to the camera padding which is the same behavior as
+            // mapbox native does on iOS
+            int[] mapPadding = map.getPadding();
+            int paddingLeft = mapPadding[0] + mBoundsPaddingLeft;
+            int paddingTop = mapPadding[1] + mBoundsPaddingTop;
+            int paddingRight = mapPadding[2] + mBoundsPaddingRight;
+            int paddingBottom = mapPadding[3] + mBoundsPaddingBottom;
+
+            int[] cameraPadding = {paddingLeft, paddingTop, paddingRight, paddingBottom};
             CameraPosition boundsCamera = map.getCameraForLatLngBounds(mBounds, cameraPadding, bearing, tilt);
             if (boundsCamera != null) {
                 builder.target(boundsCamera.target);
                 builder.zoom(boundsCamera.zoom);
             } else {
-                CameraUpdate update = CameraUpdateFactory.newLatLngBounds(mBounds, mBoundsPaddingLeft,
-                        mBooundsPaddingTop, mBoundsPaddingRight, mBoundsPaddingBottom);
+                CameraUpdate update = CameraUpdateFactory.newLatLngBounds(mBounds, paddingLeft,
+                        paddingTop, paddingRight, paddingBottom);
                 return new CameraUpdateItem(map, update, mDuration, mCallback, mMode);
             }
         }