ua1zbe/meshcore-sar_android
1
0
Fork 0
mirror of https://github.com/dz0ny/meshcore-sar.git synced 2026-08-12 08:50:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

feat: Refine measurement mode behavior and add ruler button in simple mode

Browse Source
This commit is contained in:
Janez T
2025-10-27 22:38:42 +01:00
parent f707e2233b
commit 8c05c331e2
1 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lib/screens/map_tab.dart
View File

@@ -1206,7 +1206,7 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
} }
}, },
onLongPress: (tapPosition, point) { onLongPress: (tapPosition, point) {
// Handle measurement mode - set measurement points // Handle measurement mode - set measurement points only, no SAR marker
if (drawingProvider.drawingMode == DrawingMode.measure) { if (drawingProvider.drawingMode == DrawingMode.measure) {
if (drawingProvider.measurementPoint1 == null) { if (drawingProvider.measurementPoint1 == null) {
// Set first measurement point // Set first measurement point
@@ -1219,16 +1219,15 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
drawingProvider.clearMeasurement(); drawingProvider.clearMeasurement();
drawingProvider.setMeasurementPoint1(point); drawingProvider.setMeasurementPoint1(point);
} }
// Continue to also drop SAR marker pin // Don't drop SAR marker pin in measurement mode
return;
} }
// Skip if in other drawing modes (but not measure mode) // Skip if in other drawing modes
if (drawingProvider.isDrawing && drawingProvider.drawingMode != DrawingMode.measure) return; if (drawingProvider.isDrawing) return;
// Drop a pin at long press location // Drop a pin at long press location for SAR marker creation
// In measurement mode, this allows creating SAR markers at measurement points if (_droppedPinLocation == null) {
// The pin moves to the latest long press location
if (_droppedPinLocation == null || drawingProvider.drawingMode == DrawingMode.measure) {
setState(() { setState(() {
_droppedPinLocation = point; _droppedPinLocation = point;
}); });
@@ -1870,9 +1869,44 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
return const DrawingToolbar(); return const DrawingToolbar();
}, },
), ),
// In simple mode: show ruler FAB directly
Consumer<AppProvider>(
builder: (context, appProvider, _) {
if (!appProvider.isSimpleMode) {
return const SizedBox.shrink();
}
// Show ruler button
return Column(
children: [
FloatingActionButton.small(
heroTag: 'ruler_tool',
backgroundColor: drawingProvider.drawingMode == DrawingMode.measure
? Theme.of(context).colorScheme.primary
: null,
onPressed: () {
if (drawingProvider.drawingMode == DrawingMode.measure) {
// Exit measurement mode
drawingProvider.exitDrawingMode();
} else {
// Enter measurement mode
drawingProvider.setDrawingMode(DrawingMode.measure);
}
},
child: Icon(
Icons.straighten,
color: drawingProvider.drawingMode == DrawingMode.measure
? Colors.white
: null,
),
),
if (!drawingProvider.isDrawing)
const SizedBox(height: 8),
],
);
},
),
// Hide other buttons when in drawing mode // Hide other buttons when in drawing mode
if (!drawingProvider.isDrawing) ...[ if (!drawingProvider.isDrawing) ...[
const SizedBox(height: 8),
FloatingActionButton.small( FloatingActionButton.small(
heroTag: 'center_map', heroTag: 'center_map',
onPressed: !_isMapReady ? null : () async { onPressed: !_isMapReady ? null : () async {
@@ -1883,6 +1917,9 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
return; return;
} }
// Get current zoom to retain it
final currentZoom = _mapController.camera.zoom;
// Force update GPS location and jump to it // Force update GPS location and jump to it
final position = await _locationService.getCurrentPosition(); final position = await _locationService.getCurrentPosition();
if (position != null && mounted) { if (position != null && mounted) {
@@ -1891,7 +1928,7 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
}); });
_mapController.move( _mapController.move(
LatLng(position.latitude, position.longitude), LatLng(position.latitude, position.longitude),
16, currentZoom,
); );
} else { } else {
// Fallback to cached position or default center // Fallback to cached position or default center
@@ -1902,10 +1939,10 @@ class _MapTabState extends State<MapTab> with AutomaticKeepAliveClientMixin {
currentPosition.latitude, currentPosition.latitude,
currentPosition.longitude, currentPosition.longitude,
), ),
16, currentZoom,
); );
} else { } else {
_mapController.move(center, _defaultZoom); _mapController.move(center, currentZoom);
} }
} }
}, },