Merge pull request #84 from tappeddev/add-rotation-and-fix-smaller-issues

add-rotation-and-fix-smaller-issues

Author: passsy

arcgis_map_sdk/lib/src/arcgis_location_display.dart

@@ -47,9 +47,9 @@ class ArcgisLocationDisplay {
     return ArcgisMapPlatform.instance.stopLocationDisplayDataSource(_mapId!);
   }
 
-  void setAutoPanMode(AutoPanMode autoPanMode) {
+  Future<void> setAutoPanMode(AutoPanMode autoPanMode) {
     _assertAttached();
-    ArcgisMapPlatform.instance.setAutoPanMode(autoPanMode.name, _mapId!);
+    return ArcgisMapPlatform.instance.setAutoPanMode(autoPanMode.name, _mapId!);
   }
 
   Future<AutoPanMode> getAutoPanMode() {

arcgis_map_sdk/lib/src/arcgis_map_controller.dart

@@ -242,6 +242,10 @@ class ArcgisMapController {
     );
   }
 
+  Future<void> setRotation(double angleDegrees) {
+    return ArcgisMapPlatform.instance.setRotation(angleDegrees, mapId);
+  }
+
   Future<void> addGraphic({required String layerId, required Graphic graphic}) {
     return ArcgisMapPlatform.instance.addGraphic(mapId, layerId, graphic);
   }

arcgis_map_sdk_android/android/src/main/kotlin/dev/fluttercommunity/arcgis_map_sdk_android/ArcgisMapView.kt

@@ -26,7 +26,7 @@ import com.esri.arcgisruntime.mapping.Viewpoint
 import com.esri.arcgisruntime.mapping.view.AnimationCurve
 import com.esri.arcgisruntime.mapping.view.Graphic
 import com.esri.arcgisruntime.mapping.view.GraphicsOverlay
-import com.esri.arcgisruntime.mapping.view.LocationDisplay.AutoPanMode
+import com.esri.arcgisruntime.mapping.view.LocationDisplay.AutoPanMode.*
 import com.esri.arcgisruntime.mapping.view.MapView
 import com.esri.arcgisruntime.symbology.Symbol
 import com.google.gson.reflect.TypeToken
@@ -101,7 +101,7 @@ internal class ArcgisMapView(
         mapView.graphicsOverlays.add(defaultGraphicsOverlay)
 
         mapView.addMapScaleChangedListener {
-            if(mapView.mapScale.isNaN()) return@addMapScaleChangedListener
+            if (mapView.mapScale.isNaN()) return@addMapScaleChangedListener
 
             val zoomLevel = getZoomLevel(mapView)
             zoomStreamHandler.addZoom(zoomLevel)
@@ -114,9 +114,11 @@ internal class ArcgisMapView(
             val center = mapView.visibleArea?.extent?.center ?: return@addViewpointChangedListener
             val wgs84Center = GeometryEngine.project(center, SpatialReferences.getWgs84()) as? Point
 
-            val latLng = wgs84Center?.let {
-                LatLng(longitude = it.x,latitude = it.y)
-            } ?: return@addViewpointChangedListener
+            if (wgs84Center == null || wgs84Center.x.isNaN() || wgs84Center.y.isNaN()) {
+                return@addViewpointChangedListener
+            }
+
+            val latLng = LatLng(longitude = wgs84Center.x, latitude = wgs84Center.y)
 
             centerPositionStreamHandler.add(latLng)
         }
@@ -150,6 +152,7 @@ internal class ArcgisMapView(
             when (call.method) {
                 "zoom_in" -> onZoomIn(call = call, result = result)
                 "zoom_out" -> onZoomOut(call = call, result = result)
+                "rotate" -> onRotate(call = call, result = result)
                 "add_view_padding" -> onAddViewPadding(call = call, result = result)
                 "set_interaction" -> onSetInteraction(call = call, result = result)
                 "move_camera" -> onMoveCamera(call = call, result = result)
@@ -311,7 +314,14 @@ internal class ArcgisMapView(
         result: MethodChannel.Result
     ) {
         try {
-            return result.success(mapView.locationDisplay.autoPanMode.name)
+            return result.success(
+                when (mapView.locationDisplay.autoPanMode) {
+                    OFF -> "off"
+                    RECENTER -> "recenter"
+                    NAVIGATION -> "navigation"
+                    COMPASS_NAVIGATION -> "compassNavigation"
+                }
+            )
         } catch (e: Throwable) {
             result.finishWithError(e, "Getting AutoPanMode failed.")
         }
@@ -446,6 +456,11 @@ internal class ArcgisMapView(
         }
     }
 
+    private fun onRotate(call: MethodCall, result: MethodChannel.Result) {
+        val angleDegrees = call.arguments as Double
+        result.finishWithFuture { mapView.setViewpointRotationAsync(angleDegrees) }
+    }
+
     private fun onAddViewPadding(call: MethodCall, result: MethodChannel.Result) {
         try {
             val optionParams = call.arguments as Map<String, Any>
@@ -723,9 +738,9 @@ private fun LoadStatusChangedEvent.jsonValue() = when (newLoadStatus) {
 }
 
 private fun String.autoPanModeFromString() = when (this) {
-    "compassNavigation" -> AutoPanMode.COMPASS_NAVIGATION
-    "navigation" -> AutoPanMode.NAVIGATION
-    "recenter" -> AutoPanMode.RECENTER
-    "off" -> AutoPanMode.OFF
+    "compassNavigation" -> COMPASS_NAVIGATION
+    "navigation" -> NAVIGATION
+    "recenter" -> RECENTER
+    "off" -> OFF
     else -> null
 }

arcgis_map_sdk_ios/ios/Classes/ArcgisMapView.swift

@@ -141,6 +141,7 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             switch (call.method) {
             case "zoom_in": onZoomIn(call, result)
             case "zoom_out": onZoomOut(call, result)
+            case "rotate" : onRotate(call, result)
             case "add_view_padding": onAddViewPadding(call, result)
             case "set_interaction": onSetInteraction(call, result)
             case "move_camera": onMoveCamera(call, result)
@@ -160,7 +161,7 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             case "update_is_attribution_text_visible": onUpdateIsAttributionTextVisible(call, result)
             case "export_image" : onExportImage(result)
             case "set_auto_pan_mode": onSetAutoPanMode(call, result)
-            case  "get_auto_pan_mode": onGetAutoPanMode(call,  result)
+            case "get_auto_pan_mode": onGetAutoPanMode(call,  result)
             case "set_wander_extent_factor": onSetWanderExtentFactor( call,  result)
             case "get_wander_extent_factor": onGetWanderExtentFactor( call,  result)
             default:
@@ -222,6 +223,17 @@ class ArcgisMapView: NSObject, FlutterPlatformView {
             result(success)
         }
     }
+    
+    private func onRotate(_ call: FlutterMethodCall, _ result:@escaping FlutterResult) {
+        guard let angleDouble = call.arguments as? Double else {
+            result(FlutterError(code: "missing_data", message: "Invalid arguments", details: nil))
+            return
+        }
+        
+        mapView.setViewpointRotation(angleDouble) { success in
+            result(success)
+        }
+    }
 
     private func onAddViewPadding(_ call: FlutterMethodCall, _ result: @escaping FlutterResult) {
         guard let args = call.arguments as? [String: Any] else {

arcgis_map_sdk_method_channel/lib/src/method_channel_arcgis_map_plugin.dart

@@ -42,8 +42,13 @@ class MethodChannelArcgisMapPlugin extends ArcgisMapPlatform {
   }
 
   @override
-  void setAutoPanMode(String autoPanMode, int mapId) {
-    _methodChannelBuilder(mapId).invokeMethod("set_auto_pan_mode", autoPanMode);
+  Future<void> setAutoPanMode(String autoPanMode, int mapId) {
+    return _methodChannelBuilder(mapId).invokeMethod("set_auto_pan_mode", autoPanMode);
+  }
+
+  @override
+  Future<void> setRotation(double angleDegrees, int mapId) {
+    return _methodChannelBuilder(mapId).invokeMethod("rotate", angleDegrees);
   }
 
   @override

arcgis_map_sdk_platform_interface/lib/src/arcgis_map_sdk_platform_interface.dart

@@ -68,10 +68,14 @@ class ArcgisMapPlatform extends PlatformInterface {
     throw UnimplementedError('setMouseCursor() has not been implemented');
   }
 
-  void setAutoPanMode(String autoPanMode, int mapId) {
+  Future<void> setAutoPanMode(String autoPanMode, int mapId)  {
     throw UnimplementedError('setAutoPanMode() has not been implemented');
   }
 
+  Future<void> setRotation(double angleDegrees, int mapId) {
+    throw UnimplementedError('setRotation() has not been implemented');
+  }
+
   Future<AutoPanMode> getAutoPanMode(int mapId) {
     throw UnimplementedError('getAutoPanMode() has not been implemented');
   }

example/ios/Podfile.lock

@@ -30,10 +30,10 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   ArcGIS-Runtime-SDK-iOS: 6ab51d28f8831ac73c00d34998cff3a555fe304f
   ArcGIS-Runtime-Toolkit-iOS: e30bb45bd0bd0152bcb1ec73f9b99022a5c7d02d
-  arcgis_map_sdk_ios: ee1d8dee42e0c11c95cd26afa2a8cb0e7a69cb23
+  arcgis_map_sdk_ios: deb0d9d2dfedca86984c0aa81e6245eed03c8344
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
+  geolocator_apple: d981750b9f47dbdb02427e1476d9a04397beb8d9
 
 PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

example/ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

example/lib/location_indicator_example_page.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:math';
 
 import 'package:arcgis_example/main.dart';
@@ -9,12 +10,10 @@ class LocationIndicatorExamplePage extends StatefulWidget {
   const LocationIndicatorExamplePage({super.key});
 
   @override
-  State<LocationIndicatorExamplePage> createState() =>
-      _LocationIndicatorExamplePageState();
+  State<LocationIndicatorExamplePage> createState() => _LocationIndicatorExamplePageState();
 }
 
-class _LocationIndicatorExamplePageState
-    extends State<LocationIndicatorExamplePage> {
+class _LocationIndicatorExamplePageState extends State<LocationIndicatorExamplePage> {
   final _mockLocations = [
     LatLng(48.1234963, 11.5910182),
     LatLng(48.1239241, 11.45897063),
@@ -34,6 +33,8 @@ class _LocationIndicatorExamplePageState
   var _activeAutoPanMode = AutoPanMode.off;
   var _wanderExtentFactor = 0.5;
 
+  StreamSubscription? _panUpdateSubscription;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -48,8 +49,7 @@ class _LocationIndicatorExamplePageState
                 : await _controller!.locationDisplay.startSource();
           } catch (e, stack) {
             if (!mounted) return;
-            ScaffoldMessenger.of(_snackBarKey.currentContext!)
-                .showSnackBar(SnackBar(content: Text("$e")));
+            ScaffoldMessenger.of(_snackBarKey.currentContext!).showSnackBar(SnackBar(content: Text("$e")));
             debugPrint("$e");
             debugPrintStack(stackTrace: stack);
           }
@@ -71,16 +71,18 @@ class _LocationIndicatorExamplePageState
                 _controller = controller;
                 _requestLocationPermission();
                 _configureLocationDisplay(Colors.blue);
+
+                _panUpdateSubscription?.cancel();
+                _panUpdateSubscription = controller.centerPosition().listen((_) => _refreshAutoPanMode());
               },
             ),
           ),
           const SizedBox(height: 16),
+          Text("Current auto pan mode: ${_activeAutoPanMode.name}"),
           ElevatedButton(
             onPressed: _switchLocationSource,
             child: Text(
-              _isManualLocationSource
-                  ? "Use auto location source"
-                  : "Use manual location source",
+              _isManualLocationSource ? "Use auto location source" : "Use manual location source",
             ),
           ),
           if (_isManualLocationSource) ...[
@@ -101,15 +103,12 @@ class _LocationIndicatorExamplePageState
           ElevatedButton(
             onPressed: () {
               setState(
-                () =>
-                    _useCourseSymbolForMovement = !_useCourseSymbolForMovement,
+                () => _useCourseSymbolForMovement = !_useCourseSymbolForMovement,
               );
               _configureLocationDisplay(Colors.red);
             },
             child: Text(
-              _useCourseSymbolForMovement
-                  ? "Disable course indicator"
-                  : "Enable course indicator",
+              _useCourseSymbolForMovement ? "Disable course indicator" : "Enable course indicator",
             ),
           ),
           ElevatedButton(
@@ -158,9 +157,7 @@ class _LocationIndicatorExamplePageState
   Future<void> _switchLocationSource() async {
     await _controller!.locationDisplay.stopSource();
     await _controller!.setLocationDisplay(
-      _isManualLocationSource
-          ? ArcgisLocationDisplay()
-          : ArcgisManualLocationDisplay(),
+      _isManualLocationSource ? ArcgisLocationDisplay() : ArcgisManualLocationDisplay(),
     );
     setState(() => _isManualLocationSource = !_isManualLocationSource);
 
@@ -237,13 +234,30 @@ class _LocationIndicatorExamplePageState
     );
 
     if (newSetAutoPanMode != null) {
-      // No need to use setState
-      _activeAutoPanMode = newSetAutoPanMode;
+      setState(() => _activeAutoPanMode = newSetAutoPanMode);
       _controller?.locationDisplay.setAutoPanMode(newSetAutoPanMode);
     }
     if (_activeAutoPanMode == AutoPanMode.recenter) {
       _wanderExtentFactor = newSetWanderExtentFactor;
       _controller?.locationDisplay.setWanderExtentFactor(_wanderExtentFactor);
     }
   }
+
+  @override
+  void dispose() {
+    _panUpdateSubscription?.cancel();
+    _refreshAutoPanModeTimer?.cancel();
+    super.dispose();
+  }
+
+  Timer? _refreshAutoPanModeTimer;
+
+  Future<void> _refreshAutoPanMode() async {
+    _refreshAutoPanModeTimer?.cancel();
+    _refreshAutoPanModeTimer = Timer(const Duration(milliseconds: 50), () async {
+      final panMode = await _controller!.locationDisplay.getAutoPanMode();
+      if (!mounted) return;
+      setState(() => _activeAutoPanMode = panMode);
+    });
+  }
 }

example/pubspec.yaml

@@ -11,7 +11,6 @@ environment:
 
 dependencies:
   arcgis_map_sdk: ^0.8.0
-
   cupertino_icons: ^1.0.0
   geolocator: ^10.1.0
   flutter:
@@ -42,4 +41,4 @@ dependency_overrides:
   arcgis_map_sdk_platform_interface:
     path: ../arcgis_map_sdk_platform_interface
   arcgis_map_sdk_web:
-    path: ../arcgis_map_sdk_web
+    path: ../arcgis_map_sdk_web