Squashed commit of the following:

commit e52fb73 Author: sbergmair <[email protected]> Date: Mon Dec 11 07:57:10 2023 +0100 Move and zoom camera to make points visible (#56) * implement feature * implement feature * add example on button click * reformat * review * update README.md and add button for example only on mobile commit 8bcefcd Author: Julian Bissekkou <[email protected]> Date: Mon Nov 27 08:29:45 2023 +0100 add missing return commit ec61e1b Author: Julian Bissekkou <[email protected]> Date: Sun Nov 26 13:20:30 2023 +0100 catch exceptions while parsing and fix poliline on mobile
fluttercommunity · Feb 5, 2024 · 431711d · 431711d
1 parent c691ffe
commit 431711d
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 2 deletions.
diff --git a/arcgis_map_sdk/README.md b/arcgis_map_sdk/README.md
@@ -108,6 +108,7 @@ Checkout the example app `example/lib/main.dart` for more details.
 | addViewPadding       |  ✅  |  ✅  |    ✅    |
 | toggleBaseMap        |  ✅  |  ✅  |    ✅    |
 | moveCamera           |  ✅  |  ✅  |    ✅    |
+| moveCameraToPoints   |      |  ✅  |    ✅    |
 | zoomIn               |  ✅  |  ✅  |    ✅    |
 | zoomOut              |  ✅  |  ✅  |    ✅    |
 | getZoom              |  ✅  |  ✅  |    ✅    |

diff --git a/arcgis_map_sdk/lib/src/arcgis_map_controller.dart b/arcgis_map_sdk/lib/src/arcgis_map_controller.dart
@@ -149,6 +149,17 @@ class ArcgisMapController {
     );
   }
 
+  Future<void> moveCameraToPoints({
+    required List<LatLng> points,
+    double? padding,
+  }) {
+    return ArcgisMapPlatform.instance.moveCameraToPoints(
+      mapId: mapId,
+      points: points,
+      padding: padding,
+    );
+  }
+
   Future<void> setInteraction({required bool isEnabled}) {
     return ArcgisMapPlatform.instance
         .setInteraction(mapId, isEnabled: isEnabled);

diff --git a/...roid/android/src/main/kotlin/dev/fluttercommunity/arcgis_map_sdk_android/ArcgisMapView.kt b/...roid/android/src/main/kotlin/dev/fluttercommunity/arcgis_map_sdk_android/ArcgisMapView.kt
@@ -4,8 +4,12 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import com.esri.arcgisruntime.ArcGISRuntimeEnvironment
+import com.esri.arcgisruntime.geometry.Geometry
 import com.esri.arcgisruntime.geometry.GeometryEngine
+import com.esri.arcgisruntime.geometry.Multipoint
 import com.esri.arcgisruntime.geometry.Point
+import com.esri.arcgisruntime.geometry.PointCollection
+import com.esri.arcgisruntime.geometry.Polyline
 import com.esri.arcgisruntime.geometry.SpatialReferences
 import com.esri.arcgisruntime.layers.ArcGISVectorTiledLayer
 import com.esri.arcgisruntime.mapping.ArcGISMap
@@ -115,6 +119,7 @@ internal class ArcgisMapView(
                 "add_view_padding" -> onAddViewPadding(call = call, result = result)
                 "set_interaction" -> onSetInteraction(call = call, result = result)
                 "move_camera" -> onMoveCamera(call = call, result = result)
+                "move_camera_to_points" -> onMoveCameraToPoints(call = call, result = result)
                 "add_graphic" -> onAddGraphic(call = call, result = result)
                 "remove_graphic" -> onRemoveGraphic(call = call, result = result)
                 "toggle_base_map" -> onToggleBaseMap(call = call, result = result)
@@ -280,6 +285,30 @@ internal class ArcgisMapView(
         }
     }
 
+    private fun onMoveCameraToPoints(call: MethodCall, result: MethodChannel.Result) {
+        val arguments = call.arguments as Map<String, Any>
+        val latLongs = (arguments["points"] as ArrayList<Map<String, Any>>)
+                .map { p -> parseToClass<LatLng>(p) }
+
+        val padding = arguments["padding"] as Double?
+
+        val polyline = Polyline(
+                PointCollection(latLongs.map { latLng -> Point(latLng.longitude, latLng.latitude) }),
+                SpatialReferences.getWgs84()
+        )
+
+        val future = if (padding != null) mapView.setViewpointGeometryAsync(polyline.extent, padding)
+        else mapView.setViewpointGeometryAsync(polyline.extent)
+
+        future.addDoneListener {
+            try {
+                result.success(future.get())
+            } catch (e: Exception) {
+                result.error("Error", e.message, e)
+            }
+        }
+    }
+
     private fun onToggleBaseMap(call: MethodCall, result: MethodChannel.Result) {
         val newStyle = gson.fromJson<BasemapStyle>(
                 call.arguments as String,

diff --git a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapView.swift b/arcgis_map_sdk_ios/ios/Classes/ArcgisMapView.swift
@@ -125,11 +125,12 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             case "add_view_padding": onAddViewPadding(call, result)
             case "set_interaction": onSetInteraction(call, result)
             case "move_camera": onMoveCamera(call, result)
+            case "move_camera_to_points": onMoveCameraToPoints(call, result)
             case "add_graphic": onAddGraphic(call, result)
             case "remove_graphic": onRemoveGraphic(call, result)
             case "toggle_base_map" : onToggleBaseMap(call, result)
             default:
-                result(FlutterError(code: "Unimplemented", message: "No method matching the name\(call.method)", details: nil))
+                result(FlutterError(code: "Unimplemented", message: "No method matching the name \(call.method)", details: nil))
             }
         })
     }
@@ -202,6 +203,23 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(success)
         }
     }
+
+    private func onMoveCameraToPoints(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
+        let dict = call.arguments as! Dictionary<String, Any>
+
+        let payload: MoveToPointsPayload = try! JsonUtil.objectOfJson(dict)
+        let polyline = AGSPolyline(points: payload.points.map { latLng in AGSPoint(x: latLng.longitude, y:latLng.latitude, spatialReference: .wgs84()) })
+
+        if(payload.padding != nil) {
+            mapView.setViewpointGeometry(polyline.extent, padding: payload.padding!) { success in
+                result(success)
+            }
+        } else {
+            mapView.setViewpointGeometry(polyline.extent) { success in
+                result(success)
+            }
+        }
+    }
 
     private func onAddGraphic(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
         let parser = GraphicsParser()
@@ -460,3 +478,8 @@ extension AGSBasemapStyle {
         }
     }
 }
+
+struct MoveToPointsPayload : Codable {
+    let points : [LatLng]
+    let padding : Double?
+}
diff --git a/arcgis_map_sdk_method_channel/lib/src/method_channel_arcgis_map_plugin.dart b/arcgis_map_sdk_method_channel/lib/src/method_channel_arcgis_map_plugin.dart
@@ -137,6 +137,21 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
     ).then((value) => value!);
   }
 
+  @override
+  Future<void> moveCameraToPoints({
+    required List<LatLng> points,
+    required int mapId,
+    double? padding,
+  }) {
+    return _methodChannelBuilder(mapId).invokeMethod<bool>(
+      "move_camera_to_points",
+      {
+        "points": points.map((p) => p.toMap()).toList(),
+        "padding": padding,
+      },
+    );
+  }
+
   @override
   Future<bool> zoomIn({
     required int lodFactor,

diff --git a/arcgis_map_sdk_platform_interface/lib/src/arcgis_map_sdk_platform_interface.dart b/arcgis_map_sdk_platform_interface/lib/src/arcgis_map_sdk_platform_interface.dart
@@ -138,6 +138,14 @@ class ArcgisMapPlatform extends PlatformInterface {
     throw UnimplementedError('moveCamera() has not been implemented.');
   }
 
+  Future<void> moveCameraToPoints({
+    required List<LatLng> points,
+    required int mapId,
+    double? padding,
+  }) {
+    throw UnimplementedError('moveCameraToPoints() has not been implemented.');
+  }
+
   Future<bool> zoomIn({
     required int lodFactor,
     required int mapId,

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -30,4 +30,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.2
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -317,6 +317,13 @@ class _ExampleMapState extends State<ExampleMap> {
     _controller?.removeGraphic(layerId: layerId, objectId: objectId);
   }
 
+  void _makePolylineVisible({required List<LatLng> points}) {
+    _controller?.moveCameraToPoints(
+      points: points,
+      padding: 30,
+    );
+  }
+
   void _addPolygon({
     required String layerId,
     required PolygonGraphic graphic,
@@ -650,6 +657,13 @@ class _ExampleMapState extends State<ExampleMap> {
                     ],
                   ),
                 ),
+                if (!kIsWeb)
+                  ElevatedButton(
+                    onPressed: () => _makePolylineVisible(
+                      points: [_firstPinCoordinates, _secondPinCoordinates],
+                    ),
+                    child: const Text('Zoom to polyline'),
+                  ),
                 Row(
                   children: [
                     const Text(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b

		COCOAPODS: 1.12.1
		COCOAPODS: 1.14.2