Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-02-08 18:28:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rotate OSM marker to compensate map orientation

Browse source
This commit is contained in:
Ming Ming 2024-09-17 23:56:41 +08:00
parent 450fa97b48
commit 752360daf0
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
np_gps_map/lib/src/interactive_map/osm.dart
View file

@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:math'; import 'dart:math';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -7,6 +8,7 @@ import 'package:latlong2/latlong.dart';
import 'package:np_common/object_util.dart'; import 'package:np_common/object_util.dart';
import 'package:np_gps_map/src/interactive_map.dart'; import 'package:np_gps_map/src/interactive_map.dart';
import 'package:np_gps_map/src/map_coord.dart'; import 'package:np_gps_map/src/map_coord.dart';
import 'package:rxdart/rxdart.dart';
typedef OsmClusterBuilder = Widget Function( typedef OsmClusterBuilder = Widget Function(
BuildContext context, List<DataPoint> dataPoints); BuildContext context, List<DataPoint> dataPoints);
@ -43,10 +45,23 @@ class _OsmInteractiveMapState extends State<OsmInteractiveMap> {
if (_parentController == null) { if (_parentController == null) {
_parentController = _ParentController(_controller); _parentController = _ParentController(_controller);
widget.onMapCreated?.call(_parentController!); widget.onMapCreated?.call(_parentController!);
_subscriptions.add(_controller.mapEventStream.listen((ev) {
_mapRotationRadSubject.add(ev.camera.rotationRad);
}));
} }
}); });
} }
@override
void dispose() {
for (final s in _subscriptions) {
s.cancel();
}
_mapRotationRadSubject.close();
_controller.dispose();
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return FlutterMap( return FlutterMap(
@ -98,13 +113,22 @@ class _OsmInteractiveMapState extends State<OsmInteractiveMap> {
} else { } else {
return GestureDetector( return GestureDetector(
onTap: widget.onClusterTap?.let((l) => () => l(dataPoints)), onTap: widget.onClusterTap?.let((l) => () => l(dataPoints)),
child: widget.clusterBuilder!(context, dataPoints), child: StreamBuilder(
stream: _mapRotationRadSubject.stream,
initialData: _mapRotationRadSubject.value,
builder: (context, snapshot) => Transform.rotate(
angle: -snapshot.requireData,
child: widget.clusterBuilder!(context, dataPoints),
),
),
); );
} }
} }
_ParentController? _parentController; _ParentController? _parentController;
late final _controller = MapController(); late final _controller = MapController();
final _mapRotationRadSubject = BehaviorSubject.seeded(0.0);
final _subscriptions = <StreamSubscription>[];
} }
class _OsmDataPoint extends Marker { class _OsmDataPoint extends Marker {

1
np_gps_map/pubspec.yaml
View file

@ -24,6 +24,7 @@ dependencies:
path: ../np_common path: ../np_common
np_platform_util: np_platform_util:
path: ../np_platform_util path: ../np_platform_util
rxdart: ^0.27.7
url_launcher: ^6.1.11 url_launcher: ^6.1.11
dependency_overrides: dependency_overrides: