North-up compass and rotation lock

lib/widgets/map/gps_controller.dart

@@ -55,7 +55,7 @@ class GpsController {
         _currentLatLng != null) {
       
       try {
-        if (newMode == FollowMeMode.northUp) {
+        if (newMode == FollowMeMode.follow) {
           controller.animateTo(
             dest: _currentLatLng!,
             zoom: controller.mapController.camera.zoom,
@@ -89,6 +89,8 @@ class GpsController {
     int proximityAlertDistance = 200,
     List<OsmNode> nearbyNodes = const [],
     List<NodeProfile> enabledProfiles = const [],
+    // Optional parameter for north lock functionality
+    bool northLockEnabled = false,
   }) {
     final latLng = LatLng(position.latitude, position.longitude);
     _currentLatLng = latLng;
@@ -111,11 +113,13 @@ class GpsController {
       debugPrint('[GpsController] GPS position update: ${latLng.latitude}, ${latLng.longitude}, follow-me: $followMeMode');
       WidgetsBinding.instance.addPostFrameCallback((_) {
         try {
-          if (followMeMode == FollowMeMode.northUp) {
-            // Follow position only, keep current rotation
+          if (followMeMode == FollowMeMode.follow) {
+            // Follow position only, keep current rotation (unless north lock is enabled)
+            final rotation = northLockEnabled ? 0.0 : controller.mapController.camera.rotation;
             controller.animateTo(
               dest: latLng,
               zoom: controller.mapController.camera.zoom,
+              rotation: rotation,
               duration: kFollowMeAnimationDuration,
               curve: Curves.easeOut,
             );
@@ -153,6 +157,7 @@ class GpsController {
     required int Function() getProximityAlertDistance,
     required List<OsmNode> Function() getNearbyNodes,
     required List<NodeProfile> Function() getEnabledProfiles,
+    required bool Function() getNorthLockEnabled,
   }) async {
     final perm = await Geolocator.requestPermission();
     if (perm == LocationPermission.denied ||
@@ -168,6 +173,7 @@ class GpsController {
       final proximityAlertDistance = getProximityAlertDistance();
       final nearbyNodes = getNearbyNodes();
       final enabledProfiles = getEnabledProfiles();
+      final northLockEnabled = getNorthLockEnabled();
       
       processPositionUpdate(
         position: position,
@@ -178,6 +184,7 @@ class GpsController {
         proximityAlertDistance: proximityAlertDistance,
         nearbyNodes: nearbyNodes,
         enabledProfiles: enabledProfiles,
+        northLockEnabled: northLockEnabled,
       );
     });
   }

lib/widgets/map/map_overlays.dart

@@ -1,16 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map_animations/flutter_map_animations.dart';
 import 'package:provider/provider.dart';
 
 import '../../app_state.dart';
 import '../../dev_config.dart';
 import '../../services/localization_service.dart';
 import '../camera_icon.dart';
+import '../compass_indicator.dart';
 import 'layer_selector_button.dart';
 
 /// Widget that renders all map overlay UI elements
 class MapOverlays extends StatelessWidget {
-  final MapController mapController;
+  final AnimatedMapController mapController;
   final UploadMode uploadMode;
   final AddNodeSession? session;
   final EditNodeSession? editSession;
@@ -82,6 +84,11 @@ class MapOverlays extends StatelessWidget {
             ),
           ),
 
+        // Compass indicator (top-right, below mode indicator)
+        CompassIndicator(
+          mapController: mapController,
+        ),
+
         // Zoom indicator, positioned relative to button bar
         Positioned(
           left: 10,
@@ -96,7 +103,7 @@ class MapOverlays extends StatelessWidget {
               builder: (context) {
                 double zoom = 15.0; // fallback
                 try {
-                  zoom = mapController.camera.zoom;
+                  zoom = mapController.mapController.camera.zoom;
                 } catch (_) {
                   // Map controller not ready yet
                 }
@@ -173,8 +180,8 @@ class MapOverlays extends StatelessWidget {
                     heroTag: "zoom_in",
                     onPressed: () {
                       try {
-                        final zoom = mapController.camera.zoom;
-                        mapController.move(mapController.camera.center, zoom + 1);
+                        final zoom = mapController.mapController.camera.zoom;
+                        mapController.mapController.move(mapController.mapController.camera.center, zoom + 1);
                       } catch (_) {
                         // Map controller not ready yet
                       }
@@ -188,8 +195,8 @@ class MapOverlays extends StatelessWidget {
                     heroTag: "zoom_out",
                     onPressed: () {
                       try {
-                        final zoom = mapController.camera.zoom;
-                        mapController.move(mapController.camera.center, zoom - 1);
+                        final zoom = mapController.mapController.camera.zoom;
+                        mapController.mapController.move(mapController.mapController.camera.center, zoom - 1);
                       } catch (_) {
                         // Map controller not ready yet
                       }