Skip to content

fix: invoke map interaction callbacks with coordinates in primary world #2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JaffaKetchup merged 1 commit into from
Jan 30, 2025
Merged

fix: invoke map interaction callbacks with coordinates in primary world #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions example/lib/pages/multi_worlds.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,24 @@ class MultiWorldsPage extends StatefulWidget {
class _MultiWorldsPageState extends State<MultiWorldsPage> {
final LayerHitNotifier<String> _hitNotifier = ValueNotifier(null);

final _customMarkers = <Marker>[];

Marker _buildPin(LatLng point) => Marker(
point: point,
width: 60,
height: 60,
child: GestureDetector(
onTap: () => ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Tapped existing marker'),
duration: Duration(seconds: 1),
showCloseIcon: true,
),
),
child: const Icon(Icons.location_pin, color: Colors.red),
),
);

@override
Widget build(BuildContext context) {
return Scaffold(
Expand All @@ -25,10 +43,11 @@ class _MultiWorldsPageState extends State<MultiWorldsPage> {
body: Stack(
children: [
FlutterMap(
options: const MapOptions(
initialCenter: LatLng(51.5, -0.09),
options: MapOptions(
initialCenter: const LatLng(51.5, -0.09),
initialZoom: 0,
initialRotation: 0,
onTap: (_, p) => setState(() => _customMarkers.add(_buildPin(p))),
),
children: [
openStreetMapTileLayer,
Expand Down Expand Up @@ -105,6 +124,7 @@ class _MultiWorldsPageState extends State<MultiWorldsPage> {
child: const Icon(Icons.backpack_outlined),
),
),
..._customMarkers,
],
),
],
Expand Down
18 changes: 14 additions & 4 deletions lib/src/map/camera/camera.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,12 @@ class MapCamera {
crs.offsetToLatLng(point, zoom ?? this.zoom);

/// Returns the width of the world at the current zoom, or 0 if irrelevant.
double getWorldWidthAtZoom() {
double getWorldWidthAtZoom([double? zoom]) {
if (!crs.replicatesWorldLongitude) {
return 0;
}
final offset0 = projectAtZoom(const LatLng(0, 0));
final offset180 = projectAtZoom(const LatLng(0, 180));
final offset0 = projectAtZoom(const LatLng(0, 0), zoom ?? this.zoom);
final offset180 = projectAtZoom(const LatLng(0, 180), zoom ?? this.zoom);
return 2 * (offset180.dx - offset0.dx).abs();
}

Expand Down Expand Up @@ -357,7 +357,17 @@ class MapCamera {
(offset - nonRotatedSize.center(Offset.zero)).rotate(rotationRad);

final newCenterPt = focalStartPt + point;
return unprojectAtZoom(newCenterPt, zoom ?? this.zoom);
final worldWidth = getWorldWidthAtZoom(zoom ?? this.zoom);
double bestX = newCenterPt.dx;
if (worldWidth != 0) {
while (bestX > worldWidth) {
bestX -= worldWidth;
}
while (bestX < 0) {
bestX += worldWidth;
}
}
return unprojectAtZoom(Offset(bestX, newCenterPt.dy), zoom ?? this.zoom);
}

/// Calculate the center point which would keep the same point of the map
Expand Down