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

feat: Enhance map functionality with download area selection and user location pointer

Browse Source 
- Added download area selection feature in MapProvider with methods to enter, exit, and update bounds.
- Implemented DownloadAreaOverlay widget for user interface during download area selection.
- Integrated download area preview in MapManagementScreen with visual feedback.
- Introduced LocationPointer widget to indicate user location and heading on the map.
- Updated localization strings in app_sl.arb for improved clarity and accuracy.
- Refactored map marker generation to utilize the new LocationPointer for user location representation.
- Improved error handling in LocationTrackingService for initial position setting.
This commit is contained in:
Janez T
2025-10-28 19:09:11 +01:00
parent fed4aa19f1
commit da3302b030
14 changed files with 769 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
lib/screens/map_management_screen.dart
View File

@@ -887,7 +887,44 @@ class _MapManagementScreenState extends State<MapManagementScreen> {
);
}
/// Convert zoom level to user-friendly description
String _getZoomDescription(int zoom) {
if (zoom <= 5) {
return 'Continental view (very low detail)';
} else if (zoom <= 8) {
return 'Country view (low detail)';
} else if (zoom <= 10) {
return 'Regional view (basic detail)';
} else if (zoom <= 12) {
return 'City view (moderate detail)';
} else if (zoom <= 15) {
return 'Neighborhood view (good detail)';
} else if (zoom <= 17) {
return 'Street view (high detail)';
} else {
return 'Building view (very high detail)';
}
}
Widget _buildDownloadCard() {
// Calculate current bounds for preview
LatLngBounds? previewBounds;
try {
final north = double.tryParse(_northController.text);
final south = double.tryParse(_southController.text);
final east = double.tryParse(_eastController.text);
final west = double.tryParse(_westController.text);
if (north != null && south != null && east != null && west != null) {
previewBounds = LatLngBounds(
LatLng(south, west),
LatLng(north, east),
);
}
} catch (e) {
// Invalid bounds, preview will be null
}
return Card(
child: Padding(
padding: const EdgeInsets.all(16),
@@ -900,6 +937,80 @@ class _MapManagementScreenState extends State<MapManagementScreen> {
),
const SizedBox(height: 16),
// Preview map (if bounds are valid)
if (previewBounds != null) ...[
Container(
height: 200,
decoration: BoxDecoration(
border: Border.all(color: Colors.grey[300]!),
borderRadius: BorderRadius.circular(8),
),
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
child: Stack(
children: [
FlutterMap(
options: MapOptions(
initialCenter: previewBounds.center,
initialZoom: 12.0,
minZoom: 1,
maxZoom: 19,
interactionOptions: const InteractionOptions(
flags: InteractiveFlag.none, // Static preview
),
onMapReady: () {
// Fit bounds after map is ready would require MapController
// For now, center on bounds center
},
),
children: [
TileLayer(
urlTemplate: _selectedLayer.urlTemplate,
userAgentPackageName: 'com.meshcore.sar',
),
// Blue rectangle showing download area
PolygonLayer(
polygons: [
Polygon(
points: [
LatLng(previewBounds.north, previewBounds.west),
LatLng(previewBounds.north, previewBounds.east),
LatLng(previewBounds.south, previewBounds.east),
LatLng(previewBounds.south, previewBounds.west),
],
color: Colors.blue.withValues(alpha: 0.2),
borderColor: Colors.blue,
borderStrokeWidth: 3.0,
),
],
),
],
),
// Label overlay
Positioned(
top: 8,
left: 8,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: Colors.black.withValues(alpha: 0.6),
borderRadius: BorderRadius.circular(4),
),
child: Text(
'Download Area Preview',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Colors.white,
),
),
),
),
],
),
),
),
const SizedBox(height: 16),
],
// Map Layer Selection
DropdownButtonFormField<MapLayer>(
initialValue: _selectedLayer,
@@ -1010,13 +1121,22 @@ class _MapManagementScreenState extends State<MapManagementScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(AppLocalizations.of(context)!.minZoom(_minZoom)),
Text(
AppLocalizations.of(context)!.minZoom(_minZoom),
style: const TextStyle(fontWeight: FontWeight.w500),
),
Text(
_getZoomDescription(_minZoom),
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Colors.grey[600],
),
),
Slider(
value: _minZoom.toDouble(),
min: 1,
max: 19,
divisions: 18,
label: '$_minZoom',
label: '$_minZoom - ${_getZoomDescription(_minZoom)}',
onChanged: _isDownloading
? null
: (value) {
@@ -1036,13 +1156,22 @@ class _MapManagementScreenState extends State<MapManagementScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(AppLocalizations.of(context)!.maxZoom(_maxZoom)),
Text(
AppLocalizations.of(context)!.maxZoom(_maxZoom),
style: const TextStyle(fontWeight: FontWeight.w500),
),
Text(
_getZoomDescription(_maxZoom),
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Colors.grey[600],
),
),
Slider(
value: _maxZoom.toDouble(),
min: 1,
max: 19,
divisions: 18,
label: '$_maxZoom',
label: '$_maxZoom - ${_getZoomDescription(_maxZoom)}',
onChanged: _isDownloading
? null
: (value) {