Support update image

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

@@ -80,6 +80,7 @@
 import io.flutter.plugin.platform.PlatformView;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -1205,6 +1206,32 @@ public void onFailure(@NonNull Exception exception) {
           result.success(null);
           break;
         }
+      case "style#updateImage":
+        {
+          if (style == null) {
+            result.error(
+                "STYLE IS NULL",
+                "The style is null. Has onStyleLoaded() already been invoked?",
+                null);
+          }
+          ImageSource imageSource = style.getSourceAs(call.argument("imageSourceId"));
+          List<LatLng> coordinates = Convert.toLatLngList(call.argument("coordinates"), false);
+          if (coordinates != null) {
+            // https://github.com/mapbox/mapbox-maps-android/issues/302
+            imageSource.setCoordinates(
+                new LatLngQuad(
+                    coordinates.get(0),
+                    coordinates.get(1),
+                    coordinates.get(2),
+                    coordinates.get(3)));
+          }
+          String url = call.argument("url");
+          if (url != null) {
+            imageSource.setUri(URI.create(url));
+          }
+          result.success(null);
+          break;
+        }
       case "style#addSource":
         {
           final String id = Convert.toString(call.argument("sourceId"));

example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '9.0'
+platform :ios, '11.0'
 use_frameworks!
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.

example/ios/Runner.xcodeproj/project.pbxproj

@@ -360,7 +360,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -439,7 +439,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -488,7 +488,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";

example/lib/main.dart

@@ -25,7 +25,8 @@ import 'page.dart';
 import 'place_batch.dart';
 import 'place_circle.dart';
 import 'place_fill.dart';
-import 'place_source.dart';
+import 'place_asset_source.dart';
+import 'place_remote_source.dart';
 import 'place_symbol.dart';
 import 'scrolling_map.dart';
 import 'sources.dart';
@@ -37,7 +38,8 @@ final List<ExamplePage> _allPages = <ExamplePage>[
   AnimateCameraPage(),
   MoveCameraPage(),
   PlaceSymbolPage(),
-  PlaceSourcePage(),
+  PlaceAssetSourcePage(),
+  PlaceRemoteSourcePage(),
   LinePage(),
   LocalStylePage(),
   LayerPage(),

example/lib/place_source.dart → example/lib/place_asset_source.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'dart:async';
+// ignore: unnecessary_import
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
@@ -12,8 +13,8 @@ import 'package:mapbox_gl/mapbox_gl.dart';
 import 'main.dart';
 import 'page.dart';
 
-class PlaceSourcePage extends ExamplePage {
-  PlaceSourcePage() : super(const Icon(Icons.place), 'Place source');
+class PlaceAssetSourcePage extends ExamplePage {
+  PlaceAssetSourcePage() : super(const Icon(Icons.place), 'Place asset source');
 
   @override
   Widget build(BuildContext context) {

example/lib/place_remote_source.dart

@@ -0,0 +1,192 @@
+// Copyright 2018 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+// ignore: unnecessary_import
+
+import 'package:flutter/material.dart';
+import 'package:mapbox_gl/mapbox_gl.dart';
+
+import 'main.dart';
+import 'page.dart';
+
+class PlaceRemoteSourcePage extends ExamplePage {
+  PlaceRemoteSourcePage()
+      : super(const Icon(Icons.place), 'Place remote source');
+
+  @override
+  Widget build(BuildContext context) {
+    return const PlaceSymbolBody();
+  }
+}
+
+class PlaceSymbolBody extends StatefulWidget {
+  const PlaceSymbolBody();
+
+  @override
+  State<StatefulWidget> createState() => PlaceSymbolBodyState();
+}
+
+class PlaceSymbolBodyState extends State<PlaceSymbolBody> {
+  PlaceSymbolBodyState();
+
+  static const SOURCE_ID = 'sydney_source';
+  static const LAYER_ID = 'sydney_layer';
+
+  bool sourceAdded = false;
+  bool layerAdded = false;
+  late MapboxMapController controller;
+
+  void _onMapCreated(MapboxMapController controller) {
+    this.controller = controller;
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  /// Adds an remote image as a source to the currently displayed style
+  Future<void> addImageSourceFromRemote(
+      String imageSourceId, String url) async {
+    controller.addSource(
+        SOURCE_ID,
+        ImageSourceProperties(url: url, coordinates: [
+          [151.2288236618042, -33.84322353475214],
+          [151.19916915893555, -33.84322353475214],
+          [151.19916915893555, -33.86264728692581],
+          [151.2288236618042, -33.86264728692581]
+        ]));
+  }
+
+  /// Update an remote image as a source to the currently displayed style
+  Future<void> updateImageSourceFromRemote(
+      String imageSourceId, String url) async {
+    controller.updateImage(
+      imageSourceId,
+      url: url,
+      coordinates: const LatLngQuad(
+        topLeft: LatLng(-33.89884564291081, 151.25229835510254),
+        topRight: LatLng(-33.89884564291081, 151.20131492614746),
+        bottomRight: LatLng(-33.934601369931634, 151.20131492614746),
+        bottomLeft: LatLng(-33.934601369931634, 151.25229835510254),
+      ),
+    );
+  }
+
+  Future<void> removeImageSource(String imageSourceId) {
+    return controller.removeSource(imageSourceId);
+  }
+
+  Future<void> addLayer(String imageLayerId, String imageSourceId) {
+    if (layerAdded) {
+      removeLayer(imageLayerId);
+    }
+    setState(() => layerAdded = true);
+    return controller.addLayer(imageSourceId, imageLayerId,
+        RasterLayerProperties(rasterFadeDuration: 0));
+  }
+
+  Future<void> addLayerBelow(
+      String imageLayerId, String imageSourceId, String belowLayerId) {
+    if (layerAdded) {
+      removeLayer(imageLayerId);
+    }
+    setState(() => layerAdded = true);
+    return controller.addLayer(imageSourceId, imageLayerId,
+        RasterLayerProperties(rasterFadeDuration: 0),
+        belowLayerId: belowLayerId);
+  }
+
+  Future<void> removeLayer(String imageLayerId) {
+    setState(() => layerAdded = false);
+    return controller.removeLayer(imageLayerId);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: <Widget>[
+        SizedBox(
+          height: 300.0,
+          child: MapboxMap(
+            accessToken: MapsDemo.ACCESS_TOKEN,
+            onMapCreated: _onMapCreated,
+            initialCameraPosition: const CameraPosition(
+              target: LatLng(-33.852, 151.211),
+              zoom: 10.0,
+            ),
+          ),
+        ),
+        Expanded(
+          child: SingleChildScrollView(
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: <Widget>[
+                Column(
+                  children: <Widget>[
+                    TextButton(
+                      child: const Text('Add source (remote image)'),
+                      onPressed: sourceAdded
+                          ? null
+                          : () {
+                              addImageSourceFromRemote(SOURCE_ID,
+                                      'https://media-cdn.tripadvisor.com/media/photo-s/03/9b/2e/15/sydney.jpg')
+                                  .then((value) {
+                                setState(() => sourceAdded = true);
+                              });
+                            },
+                    ),
+                    TextButton(
+                      child: const Text('Update source (remote image)'),
+                      onPressed: !sourceAdded
+                          ? null
+                          : () {
+                              updateImageSourceFromRemote(SOURCE_ID,
+                                      'https://media.istockphoto.com/photos/view-of-sydney-harbour-australia-picture-id535455441?k=20&m=535455441&s=612x612&w=0&h=9eDvK_3h-KKHJEOLlOL2kFxtg0y95MXacEyFpHzu-9s=')
+                                  .then((value) {
+                                setState(() => sourceAdded = true);
+                              });
+                            },
+                    ),
+                    TextButton(
+                      child: const Text('Remove source (remote image)'),
+                      onPressed: sourceAdded
+                          ? () async {
+                              await removeLayer(LAYER_ID);
+                              removeImageSource(SOURCE_ID).then((value) {
+                                setState(() => sourceAdded = false);
+                              });
+                            }
+                          : null,
+                    ),
+                    TextButton(
+                      child: const Text('Show layer'),
+                      onPressed: sourceAdded
+                          ? () => addLayer(LAYER_ID, SOURCE_ID)
+                          : null,
+                    ),
+                    TextButton(
+                      child: const Text('Show layer below water'),
+                      onPressed: sourceAdded
+                          ? () => addLayerBelow(LAYER_ID, SOURCE_ID, 'water')
+                          : null,
+                    ),
+                    TextButton(
+                      child: const Text('Hide layer'),
+                      onPressed:
+                          sourceAdded ? () => removeLayer(LAYER_ID) : null,
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

example/macos/Runner.xcodeproj/project.pbxproj

@@ -26,10 +26,6 @@
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
-		33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; };
-		33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; };
-		D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -49,8 +45,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */,
-				33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */,
 			);
 			name = "Bundle Framework";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -69,22 +63,18 @@
 		33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = "<group>"; };
 		33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = "<group>"; };
 		33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = "<group>"; };
-		33D1A10322148B71006C7A3E /* FlutterMacOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FlutterMacOS.framework; path = Flutter/ephemeral/FlutterMacOS.framework; sourceTree = SOURCE_ROOT; };
 		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
 		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-		D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		33CC10EA2044A3C60003C045 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D73912F022F37F9E000D13A0 /* App.framework in Frameworks */,
-				33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -138,8 +128,6 @@
 				33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */,
 				33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */,
 				33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */,
-				D73912EF22F37F9E000D13A0 /* App.framework */,
-				33D1A10322148B71006C7A3E /* FlutterMacOS.framework */,
 			);
 			path = Flutter;
 			sourceTree = "<group>";
@@ -260,7 +248,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename\n";
+			shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n";
 		};
 		33CC111E2044C6BF0003C045 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;