Merge pull request flutter-mapbox-gl#12 from tobrun/master

sync
jrolinskifdt · Jun 28, 2020 · b6c788c · b6c788c
2 parents 8db0b6c + 4ce2623
commit b6c788c
Show file tree

Hide file tree

Showing 108 changed files with 4,979 additions and 571 deletions.
diff --git a/.github/workflows/flutter_ci.yml b/.github/workflows/flutter_ci.yml
@@ -7,7 +7,6 @@ jobs:
     name: "Static code analysis"
     runs-on: ubuntu-latest
 
-
     steps:
     - uses: actions/checkout@v1
     - uses: actions/setup-java@v1
@@ -16,7 +15,7 @@ jobs:
     - uses: subosito/flutter-action@v1
     - run: flutter pub get
     - name: Lint analysis
-      run: flutter analyze
+      run: cd example && flutter analyze
 
   build-android:
     name: "Build Android apk"
@@ -29,25 +28,39 @@ jobs:
         java-version: '12.x'
     - uses: subosito/flutter-action@v1
     - run: flutter pub get
-
     - name: Build example APK
       run: cd example && flutter build apk
       # We might want to add a flutter test step in the future, when there actually are tests for this plugin
 
   build-iOS:
     name: Build iOS package
     runs-on: macos-latest
+
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-java@v1
         with:
           java-version: '12.x'
       - uses: subosito/flutter-action@v1
-      - name: Upgrade flutter
-        run: |
-          flutter channel master
-          flutter upgrade
+      - run: flutter pub get
       - name: build iOS package
         run: |
           cd ./example
           flutter build ios --release --no-codesign
+          
+  build-web:
+    name: "Build web"
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-java@v1
+      with:
+        java-version: '12.x'
+    - uses: subosito/flutter-action@v1
+      with:
+        channel: beta
+    - run: flutter config --enable-web
+    - run: flutter pub get
+    - name: Build web
+      run: cd example && flutter build web
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,114 @@
-android/.classpath
-android/.project
-.packages
-.vscode/
+# Miscellaneous
+*.class
+*.lock
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
 .idea/
 
-android/.settings/org.eclipse.buildship.core.prefs
+# Visual Studio Code related
+.classpath
+.project
+.settings/
+.vscode/
+
+# Flutter repo-specific
+/bin/cache/
+/bin/mingit/
+/dev/benchmarks/mega_gallery/
+/dev/bots/.recipe_deps
+/dev/bots/android_tools/
+/dev/docs/doc/
+/dev/docs/flutter.docs.zip
+/dev/docs/lib/
+/dev/docs/pubspec.yaml
+/dev/integration_tests/**/xcuserdata
+/dev/integration_tests/**/Pods
+/packages/flutter/coverage/
+version
+
+# packages file containing multi-root paths
+.packages.generated
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+build/
+flutter_*.png
+linked_*.ds
+unlinked.ds
+unlinked_spec.ds
+
+# Android related
+**/android/**/gradle-wrapper.jar
+**/android/.gradle
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java
+**/android/key.properties
+*.jks
+
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/Flutter/flutter_export_environment.sh
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# macOS
+**/macos/Flutter/GeneratedPluginRegistrant.swift
+**/macos/Flutter/Flutter-Debug.xcconfig
+**/macos/Flutter/Flutter-Release.xcconfig
+**/macos/Flutter/Flutter-Profile.xcconfig
+
+# Coverage
+coverage/
+
+# Symbols
+app.*.symbols
+
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/dev/ci/**/Gemfile.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 0.7.0, June 6, 2020
+* Introduction of mapbox_gl_platform_interface library
+* Introduction of mapbox_gl_web library
+* Integrate web support through mapbox-gl-js
+* Add icon-allow-overlap configurations
+
+## 0.0.6, May 31, 2020
+* Update mapbox depdendency to 9.2.0 (android) and 5.6.0 (iOS)
+* Long press handlers for both iOS as Android
+* Change default location tracking to none
+* OnCameraIdle listener support 
+* Add image to style 
+* Add animation duration to animateCamera
+* Content insets
+* Visible region support on iOS
+* Numerous bug fixes 
+
 ## 0.0.5, December 21, 2019
 * iOS support for annotation extensions (circle, symbol, line)
 * Update SDK to 8.5.0 (Android) and 5.5.0 (iOS)

diff --git a/README.md b/README.md
@@ -1,62 +1,54 @@
-# Flutter Mapbox GL Native
+# Flutter Mapbox GL
 
 > **Please note that this project is community driven and is not an official Mapbox product.** We welcome [feedback](https://github.com/tobrun/flutter-mapbox-gl/issues) and contributions.
 
-This Flutter plugin for [mapbox-gl-native](https://github.com/mapbox/mapbox-gl-native) enables
-embedded interactive and customizable vector maps inside a Flutter widget by embedding Android and iOS views.
+This Flutter plugin allows to show embedded interactive and customizable vector maps inside a Flutter widget. For the Android and iOS integration, we use [mapbox-gl-native](https://github.com/mapbox/mapbox-gl-native). For web, we rely on [mapbox-gl-js](https://github.com/mapbox/mapbox-gl-js). This project only supports a subset of the API exposed by these libraries. 
 
 ![screenshot.png](screenshot.png)
 
-## Install
-This project is available on [pub.dev](https://pub.dev/packages/mapbox_gl), follow the [instructions](https://flutter.dev/docs/development/packages-and-plugins/using-packages#adding-a-package-dependency-to-an-app) to integrate a package into your flutter application.
-
-## :new: :new: Who's using this SDK :new: :new:
-
-We're compiling a list of apps using this SDK. If you want to be listed here, please open a PR and add yourself below (or open a ticket and we'll add you).
-
-- You?
-
-### Running example app
+## Running the example app
 
 - Install [Flutter](https://flutter.io/get-started/) and validate its installation with `flutter doctor`
-- Clone this repository with `git clone git@github.com:mapbox/flutter-mapbox-gl.git`
-- Run the app with `cd flutter_mapbox/example && flutter run`
+- Clone the repository with `git clone git@github.com:tobrun/flutter-mapbox-gl.git`
+- Add a Mapbox access token to the example app (see next section)
+- Connect a mobile device or start an emulator, simulator or chrome
+- Locate the id of a the device with `flutter devices`
+- Run the app with `cd flutter_mapbox/example && flutter packages get && flutter run -d {device_id}`
 
-#### Mapbox Access Token
+## Adding a Mapbox Access Token
 
 This project uses Mapbox vector tiles, which requires a Mapbox account and a Mapbox access token. Obtain a free access token on [your Mapbox account page](https://www.mapbox.com/account/access-tokens/).
 > **Even if you do not use Mapbox vector tiles but vector tiles from a different source (like self-hosted tiles) with this plugin, you will need to specify any non-empty string as Access Token as explained below!**
 
-##### Android
-Add Mapbox read token value in the application manifest ```android/app/src/main/AndroidManifest.xml:```
 
-```<manifest ...
-  <application ...
-    <meta-data android:name="com.mapbox.token" android:value="YOUR_TOKEN_HERE" />
-```
+The **recommended** way to provide your access token is through the `MapboxMap` constructor's `accessToken` parameter, which is available starting from the v0.8 release. Note that you should always use the same token throughout your entire app.
 
-#### iOS
-Add these lines to your Info.plist
+An alternative method to provide access tokens that was required until the v0.7 release is described in [this wiki article](https://github.com/tobrun/flutter-mapbox-gl/wiki/Mapbox-access-tokens).
 
-```plist
-<key>io.flutter.embedded_views_preview</key>
-<true/>
-<key>MGLMapboxAccessToken</key>
-<string>YOUR_TOKEN_HERE</string>
-```
+## Using the SDK in your project
+
+This project is available on [pub.dev](https://pub.dev/packages/mapbox_gl), follow the [instructions](https://flutter.dev/docs/development/packages-and-plugins/using-packages#adding-a-package-dependency-to-an-app) to integrate a package into your flutter application. For platform specific integration, use the flutter application under the example folder as reference. 
 
 ## Supported API
 
-| Feature | Android | iOS |
-| ------ | ------ | ----- |
-| Style | :white_check_mark:   | :white_check_mark: |
-| Camera | :white_check_mark:   | :white_check_mark: |
-| Gesture | :white_check_mark:   | :white_check_mark: |
-| User Location | :white_check_mark: | :white_check_mark: |
-| Symbol | :white_check_mark:   | :white_check_mark: |
-| Circle | :white_check_mark:   | :white_check_mark: |
-| Line | :white_check_mark:   | :white_check_mark: |
-| Fill |   |  |
+| Feature | Android | iOS | Web |
+| ------ | ------ | ----- | ----- |
+| Style | :white_check_mark:   | :white_check_mark: | :white_check_mark: |
+| Camera | :white_check_mark:   | :white_check_mark: | :white_check_mark: |
+| Gesture | :white_check_mark:   | :white_check_mark: | :white_check_mark: |
+| User Location | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Symbol | :white_check_mark:   | :white_check_mark: | :white_check_mark: |
+| Circle | :white_check_mark:   | :white_check_mark: | :white_check_mark: |
+| Line | :white_check_mark:   | :white_check_mark: | :white_check_mark: |
+| Fill |   |  |  |
+
+## Map Styles
+
+Map styles can be supplied by setting the `styleString` in the `MapOptions`. The following formats are supported:
+
+1. Passing the URL of the map style. This can be one of the built-in map styles, also see `MapboxStyles` or a custom map style served remotely using a URL that start with 'http(s)://' or 'mapbox://'
+2. Passing the style as a local asset. Create a JSON file in the `assets` and add a reference in `pubspec.yml`. Set the style string to the relative path for this asset in order to load it into the map.
+3. Passing the raw JSON of the map style. This is only supported on Android.  
 
 ## Offline Sideloading
 
@@ -81,6 +73,19 @@ Support for offline maps is available by *"side loading"* the required map tiles
     }
 ```
 
+## Location features
+
+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:
+
+```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".
+
 ## Documentation
 
 This README file currently houses all of the documentation for this Flutter project. Please visit [mapbox.com/android-docs](https://www.mapbox.com/android-docs/) if you'd like more information about the Mapbox Maps SDK for Android and [mapbox.com/ios-sdk](https://www.mapbox.com/ios-sdk/) for more information about the Mapbox Maps SDK for iOS.
@@ -91,12 +96,7 @@ This README file currently houses all of the documentation for this Flutter proj
 - **Have a bug to report?** [Open an issue](https://github.com/tobrun/flutter-mapbox-gl/issues/new). If possible, include a full log and information which shows the issue.
 - **Have a feature request?** [Open an issue](https://github.com/tobrun/flutter-mapbox-gl/issues/new). Tell us what the feature should do and why you want the feature.
 
-## Sample code
-
-[This repository's example library](https://github.com/tobrun/flutter-mapbox-gl/tree/master/example/lib) is currently the best place for you to find reference code for this project.
 
 ## Contributing
 
-We welcome contributions to this repository!
-
-If you're interested in helping build this Mapbox/Flutter integration, please read [the contribution guide](https://github.com/tobrun/flutter-mapbox-gl/blob/master/CONTRIBUTING.md) to learn how to get started.
+We welcome contributions to this repository! If you're interested in helping build this Mapbox/Flutter integration, please read [the contribution guide](https://github.com/tobrun/flutter-mapbox-gl/blob/master/CONTRIBUTING.md) to learn how to get started.
diff --git a/android/build.gradle b/android/build.gradle
@@ -37,9 +37,9 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     dependencies {
-        implementation "com.mapbox.mapboxsdk:mapbox-android-sdk:8.5.0"
-        implementation "com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v8:0.7.0"
-        implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v8:0.11.0'		
+        implementation "com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.0"
+        implementation "com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.8.0"
+        implementation "com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0"
     }
     compileOptions {
         sourceCompatibility 1.8

diff --git a/android/src/main/java/com/mapbox/mapboxgl/Convert.java b/android/src/main/java/com/mapbox/mapboxgl/Convert.java
@@ -374,7 +374,7 @@ static void interpretSymbolOptions(Object o, SymbolOptionsSink sink) {
     if (geometry != null) {
       sink.setGeometry(toLatLng(geometry));
     }
-    final Object symbolSortKey = data.get("symbolSortKey");
+    final Object symbolSortKey = data.get("zIndex");
     if (symbolSortKey != null) {
       sink.setSymbolSortKey(toFloat(symbolSortKey));
     }

diff --git a/android/src/main/java/com/mapbox/mapboxgl/LineController.java b/android/src/main/java/com/mapbox/mapboxgl/LineController.java
@@ -6,6 +6,7 @@
 
 package com.mapbox.mapboxgl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import android.graphics.PointF;
@@ -87,6 +88,15 @@ public void setGeometry(List<LatLng> geometry) {
     line.setLatLngs(geometry);
   }
 
+  public List<LatLng> getGeometry() {
+    List<Point> points =  line.getGeometry().coordinates();
+    List<LatLng> latLngs = new ArrayList<>();
+    for (Point point : points) {
+      latLngs.add(new LatLng(point.latitude(), point.longitude()));
+    }
+    return latLngs;
+  }
+
   @Override
   public void setDraggable(boolean draggable) {
     line.setDraggable(draggable);

diff --git a/android/src/main/java/com/mapbox/mapboxgl/MapboxMapBuilder.java b/android/src/main/java/com/mapbox/mapboxgl/MapboxMapBuilder.java
@@ -31,9 +31,9 @@ class MapboxMapBuilder implements MapboxMapOptionsSink {
   private String styleString = Style.MAPBOX_STREETS;
 
   MapboxMapController build(
-    int id, Context context, AtomicInteger state, PluginRegistry.Registrar registrar) {
+    int id, Context context, AtomicInteger state, PluginRegistry.Registrar registrar, String accessToken) {
     final MapboxMapController controller =
-      new MapboxMapController(id, context, state, registrar, options, styleString);
+      new MapboxMapController(id, context, state, registrar, options, accessToken, styleString);
     controller.init();
     controller.setMyLocationEnabled(myLocationEnabled);
     controller.setMyLocationTrackingMode(myLocationTrackingMode);