Merge tobrun 0.12

.github/workflows/flutter_ci.yml

@@ -59,7 +59,7 @@ jobs:
       - name: build iOS package
         run: |
           cd ./example
-          flutter build ios --release --no-codesign
+          flutter build ios --release --no-codesign --verbose
 
   build-web:
     name: "Build web"

CHANGELOG.md

@@ -1,5 +1,28 @@
 ## Below is the original changelog of the tobrun/flutter-mapbox-gl project, before the fork.
 
+## 0.12.0, April 12, 2020
+* Update to Mapbox-Android-SDK 9.6.0 [#489](https://github.com/tobrun/flutter-mapbox-gl/pull/489)
+* Update to Mapbox-iOS-SDK 6.3.0 [#513](https://github.com/tobrun/flutter-mapbox-gl/pull/513)
+* Batch creation/removal for circles, fills and lines [#576](https://github.com/tobrun/flutter-mapbox-gl/pull/576)
+* Dependencies: updated image package [#598](https://github.com/tobrun/flutter-mapbox-gl/pull/598)
+* Improve description to enable location features [#596](https://github.com/tobrun/flutter-mapbox-gl/pull/596)
+* Fix feature manager on release build [#593](https://github.com/tobrun/flutter-mapbox-gl/pull/593)
+* Emit onTap only for the feature above the others [#589](https://github.com/tobrun/flutter-mapbox-gl/pull/589)
+* Add annotationOrder to web [#588](https://github.com/tobrun/flutter-mapbox-gl/pull/588)
+
+## 0.11.0, March 30, 2020
+* Fixed issues caused by new android API [#544](https://github.com/tobrun/flutter-mapbox-gl/pull/544)
+* Add option to set maximum offline tile count [#549](https://github.com/tobrun/flutter-mapbox-gl/pull/549)
+* Fixed web build failure due to http package upgrade [#550](https://github.com/tobrun/flutter-mapbox-gl/pull/550)
+* Update OfflineRegion/OfflineRegionDefinition interfaces, synchronize with iOS and Android [#545](https://github.com/tobrun/flutter-mapbox-gl/pull/545)
+* Fix Mapbox GL JS CSS embedding on web [#551](https://github.com/tobrun/flutter-mapbox-gl/pull/551)
+* Update Podfile to fix iOS CI [#565](https://github.com/tobrun/flutter-mapbox-gl/pull/565)
+* Update deprecated patterns to fix CI static analysis [#568](https://github.com/tobrun/flutter-mapbox-gl/pull/568)
+* Add setOffline method on Android [#537](https://github.com/tobrun/flutter-mapbox-gl/pull/537)
+* Add batch mode of screen locations [#554](https://github.com/tobrun/flutter-mapbox-gl/pull/554)
+* Define which annotations consume the tap events [#575](https://github.com/tobrun/flutter-mapbox-gl/pull/575)
+* Remove failed offline region downloads [#583](https://github.com/tobrun/flutter-mapbox-gl/pull/583)
+
 ## 0.10.0, February 12, 2020
 * Merge offline regions [#532](https://github.com/tobrun/flutter-mapbox-gl/pull/532)
 * Update offline region metadata [#530](https://github.com/tobrun/flutter-mapbox-gl/pull/530)

README.md

@@ -81,17 +81,25 @@ Map styles can be supplied by setting the `styleString` in the `MapOptions`. The
 
 
 ## Location features
-To enable location features in an **Android** application:
+### Android
+Add the `ACCESS_COARSE_LOCATION` or `ACCESS_FINE_LOCATION` permission in the application manifest `android/app/src/main/AndroidManifest.xml` to enable location features in an **Android** application:
+```
+<manifest ...
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+```
 
-You need to declare the `ACCESS_COARSE_LOCATION` or `ACCESS_FINE_LOCATION` permission in the AndroidManifest.xml and starting from Android API level 23 also request it at runtime. The plugin does not handle this for you. The example app uses the flutter ['location' plugin](https://pub.dev/packages/location) for this. 
+Starting from Android API level 23 you also need to request it at runtime. This plugin does not handle this for you. The example app uses the flutter ['location' plugin](https://pub.dev/packages/location) for this.
 
+### iOS
 To enable location features in an **iOS** application:
 
-If you access your users' location, you should also add the following key to your Info.plist to explain why you need access to their location data:
+If you access your users' location, you should also add the following key to `ios/Runner/Info.plist` to explain why you need access to their location data:
 
-```xml
-<key>NSLocationWhenInUseUsageDescription</key>
-<string>[Your explanation here]</string>
+```
+xml ...
+    <key>NSLocationWhenInUseUsageDescription</key>
+    <string>[Your explanation here]</string>
 ```
 
 Mapbox [recommends](https://docs.mapbox.com/help/tutorials/first-steps-ios-sdk/#display-the-users-location) the explanation "Shows your location on the map and helps improve the map".

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 
@@ -17,9 +17,6 @@ rootProject.allprojects {
         google()
         jcenter()
         mavenCentral()
-        maven {
-            url = "https://dl.bintray.com/maplibre/maplibre-gl-native"
-        }
     }
 }
 
@@ -40,17 +37,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     dependencies {
-        implementation 'org.maplibre.gl:android-sdk:9.2.1'
-        //implementation "com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.0"
-        implementation ("com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0")        {
-            exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-sdk'
-        }
-        implementation ("com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0")    {
-            exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-sdk'
-        }
-        implementation ("com.mapbox.mapboxsdk:mapbox-android-plugin-offline-v9:0.7.0")    {
-            exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-sdk'
-        }
+        implementation 'org.maplibre.gl:android-sdk:9.4.2'
+        implementation 'org.maplibre.gl:android-plugin-annotation-v9:1.0.0'
+        implementation 'org.maplibre.gl:android-plugin-localization-v9:1.0.0'
+        implementation 'org.maplibre.gl:android-plugin-offline-v9:1.0.0'
     }
     compileOptions {
         sourceCompatibility 1.8

android/src/main/java/com/mapbox/mapboxgl/CircleBuilder.java

@@ -21,6 +21,10 @@ class CircleBuilder implements CircleOptionsSink {
     this.circleOptions = new CircleOptions();
   }
 
+  public CircleOptions getCircleOptions(){
+    return this.circleOptions;
+  }
+
   Circle build() {
     return circleManager.create(circleOptions);
   }

android/src/main/java/com/mapbox/mapboxgl/CircleController.java

@@ -24,6 +24,10 @@ class CircleController implements CircleOptionsSink {
     this.onTappedListener = onTappedListener;
   }
 
+  public Circle getCircle(){
+    return this.circle;
+  }
+
   boolean onTap() {
     if (onTappedListener != null) {
       onTappedListener.onCircleTapped(circle);

android/src/main/java/com/mapbox/mapboxgl/Convert.java

@@ -72,6 +72,10 @@ static List<String> toAnnotationOrder(Object o) {
     return annotations;
   }
 
+  static List<String> toAnnotationConsumeTapEvents(Object o) {
+    return toAnnotationOrder(o);
+  }
+
   static boolean isScrollByCameraUpdate(Object o) {
     return toString(toList(o).get(0)).equals("scrollBy");
   }

android/src/main/java/com/mapbox/mapboxgl/FillBuilder.java

@@ -22,6 +22,10 @@ class FillBuilder implements FillOptionsSink {
     this.fillOptions = new FillOptions();
   }
 
+  public FillOptions getFillOptions(){
+    return this.fillOptions;
+  }
+
   Fill build() {
     return fillManager.create(fillOptions);
   }

android/src/main/java/com/mapbox/mapboxgl/FillController.java

@@ -27,6 +27,10 @@ class FillController implements FillOptionsSink {
     this.onTappedListener = onTappedListener;
   }
 
+  public Fill getFill(){
+    return this.fill;
+  }
+
   boolean onTap() {
     if (onTappedListener != null) {
       onTappedListener.onFillTapped(fill);

android/src/main/java/com/mapbox/mapboxgl/GlobalMethodHandler.java

@@ -5,7 +5,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import android.content.Context;
+import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -64,14 +64,17 @@ public void onMethodCall(MethodCall methodCall, MethodChannel.Result result) {
                 installOfflineMapTiles(tilesDb);
                 result.success(null);
                 break;
+            case "setOffline":
+                boolean offline = methodCall.argument("offline");
+                ConnectivityReceiver.instance(context).setConnected(offline ? false : null);
+                result.success(null);
+                break;
             case "mergeOfflineRegions":
                 OfflineManagerUtils.mergeRegions(result, context, methodCall.argument("path"));
                 break;
-
             case "setOfflineTileCountLimit":
                 OfflineManagerUtils.setOfflineTileCountLimit(result, context, methodCall.<Number>argument("limit").longValue());
                 break;
-
             case "downloadOfflineRegion":
                 // Get args from caller
                 Map<String, Object> definitionMap = (Map<String, Object>) methodCall.argument("definition");

android/src/main/java/com/mapbox/mapboxgl/LineBuilder.java

@@ -22,6 +22,10 @@ class LineBuilder implements LineOptionsSink {
     this.lineOptions = new LineOptions();
   }
 
+  public LineOptions getLineOptions(){
+    return this.lineOptions;
+  }
+
   Line build() {
     return lineManager.create(lineOptions);
   }

android/src/main/java/com/mapbox/mapboxgl/LineController.java

@@ -32,6 +32,10 @@ class LineController implements LineOptionsSink {
     this.onTappedListener = onTappedListener;
   }
 
+  public Line getLine(){
+    return this.line;
+  }
+
   boolean onTap() {
     if (onTappedListener != null) {
       onTappedListener.onLineTapped(line);

android/src/main/java/com/mapbox/mapboxgl/MapboxMapBuilder.java

@@ -32,11 +32,13 @@ class MapboxMapBuilder implements MapboxMapOptionsSink {
   private int myLocationRenderMode = 0;
   private String styleString = Style.MAPBOX_STREETS;
   private List<String> annotationOrder = new ArrayList();
+  private List<String> annotationConsumeTapEvents = new ArrayList();
+
 
   MapboxMapController build(
     int id, Context context, BinaryMessenger messenger, MapboxMapsPlugin.LifecycleProvider lifecycleProvider, String accessToken) {
     final MapboxMapController controller =
-      new MapboxMapController(id, context,  messenger, lifecycleProvider, options, accessToken, styleString, annotationOrder);
+      new MapboxMapController(id, context,  messenger, lifecycleProvider, options, accessToken, styleString, annotationOrder, annotationConsumeTapEvents);
     controller.init();
     controller.setMyLocationEnabled(myLocationEnabled);
     controller.setMyLocationTrackingMode(myLocationTrackingMode);
@@ -178,4 +180,9 @@ public void setAttributionButtonMargins(int x, int y) {
   public void setAnnotationOrder(List<String> annotations) {
     this.annotationOrder = annotations;
   }
+
+  public void setAnnotationConsumeTapEvents(List<String> annotations) {
+    this.annotationConsumeTapEvents = annotations;
+  }
+
 }