vjrj
eb0d19621c
- Updated Android build files: gradle plugin 8.2.2, gradle 8.3, SDK 34, minSdk 21 - Ran dart fix --apply for 87 automatic null-safety fixes - Migrated flutter_map v6 API breaking changes: - MapOptions: center → initialCenter, zoom → initialZoom - layers → children structure - TileLayerOptions/MarkerLayerOptions/PolylineLayerOptions → TileLayer/MarkerLayer/PolylineLayer - Removed plugin_api.dart imports - Converted old plugin system (ZoomMapPlugin, AttributionPlugin, etc.) to direct widgets - Updated onTap callback signature: (TapPosition) → (TapPosition, LatLng) - Migrated all marker/polyline creation to v6 API - Fixed FlatButton → TextButton deprecation - Fixed stackTrace access with catch(e, stackTrace) pattern - Removed deprecated flutter_google_places_autocomplete dependency - Removed deprecated dependencies: latlong, connectivity, launch_review - Updated all imports from latlong → latlong2 - Placeholder implementation for places autocomplete (feature temporarily disabled) Remaining tasks (non-blocking for build): - Complete null-safety fixes for _location variables in genericMap.dart - Fix theme.dart MaterialTheme parameter issues - Fix customStepper.dart null-safety issues - Final build and testing
46 lines
1.2 KiB
Dart
46 lines
1.2 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter_map/flutter_map.dart';
|
|
import 'package:latlong2/latlong.dart';
|
|
|
|
import 'fireMarkType.dart';
|
|
import 'fireMarkerIcon.dart';
|
|
|
|
/// Create a Marker with custom positioning for fires and other map objects
|
|
Marker FireMarker(
|
|
LatLng pos,
|
|
FireMarkType type, [
|
|
VoidCallback? onTap,
|
|
]) {
|
|
// Calculate offset based on marker type
|
|
// Anchor point for center of marker: (40, calculated_y)
|
|
final Offset offset = _getAnchorOffset(type);
|
|
|
|
return Marker(
|
|
point: pos,
|
|
width: 80.0,
|
|
height: 80.0,
|
|
alignment: Alignment.center,
|
|
child: GestureDetector(
|
|
onTap: onTap,
|
|
child: FireMarkerIcon(type),
|
|
),
|
|
);
|
|
}
|
|
|
|
/// Get the anchor offset based on marker type
|
|
Offset _getAnchorOffset(FireMarkType type) {
|
|
switch (type) {
|
|
case FireMarkType.position:
|
|
return Offset(40.0, 20.0);
|
|
case FireMarkType.fire:
|
|
return Offset(40.0, 24.0);
|
|
case FireMarkType.pixel:
|
|
// Auto-calculate based on marker size
|
|
return Offset(40.0, 40.0);
|
|
case FireMarkType.falsePos:
|
|
case FireMarkType.industry:
|
|
return Offset(40.0, 35.0);
|
|
default:
|
|
return Offset(40.0, 40.0);
|
|
}
|
|
}
|