fix some nits

fleaflet · Dec 5, 2024 · 8603d71 · 8603d71
1 parent 72f2fd2
commit 8603d71
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/example/lib/pages/screen_point_to_latlng.dart b/example/lib/pages/screen_point_to_latlng.dart
@@ -94,7 +94,7 @@ class PointToLatlngPage extends State<ScreenPointToLatLngPage> {
   }
 
   void updatePoint(BuildContext context) => setState(() => latLng =
-      mapController.camera.offsetToLatLng(Offset(_getPointX(context), pointY)));
+      mapController.camera.screenOffsetToLatLng(Offset(_getPointX(context), pointY)));
 
   double _getPointX(BuildContext context) =>
       MediaQuery.sizeOf(context).width / 2;

diff --git a/lib/src/layer/shared/layer_interactivity/internal_hit_detectable.dart b/lib/src/layer/shared/layer_interactivity/internal_hit_detectable.dart
@@ -40,7 +40,7 @@ abstract base class HitDetectablePainter<R extends Object,
   /// [HitDetectableElement.hitValue] is `null` on this element.
   ///
   /// [Offset] and [coordinate]
-  /// ([MapCamera.offsetToLatLng]) are provided for simplicity.
+  /// ([MapCamera.screenOffsetToLatLng]) are provided for simplicity.
   ///
   /// Avoid performing calculations that are not dependent on [element]. Instead,
   /// override [hitTest], store the necessary calculation results in
@@ -65,7 +65,7 @@ abstract base class HitDetectablePainter<R extends Object,
     bool hasHit = false;
 
     final point = position;
-    final coordinate = camera.offsetToLatLng(point);
+    final coordinate = camera.screenOffsetToLatLng(point);
 
     for (int i = elements.length - 1; i >= 0; i--) {
       final element = elements.elementAt(i);
@@ -96,7 +96,7 @@ base mixin HitTestRequiresCameraOrigin<R extends Object,
   /// Calculated [MapCamera] origin, using the following formula:
   ///
   /// ```dart
-  /// camera.project(camera.center) - camera.size / 2
+  /// camera.project(camera.center) - camera.size.center(Offset.zero)
   /// ```
   ///
   /// Only initialised after [hitTest] is invoked. Recalculated every time

diff --git a/lib/src/map/camera/camera.dart b/lib/src/map/camera/camera.dart
@@ -296,12 +296,10 @@ class MapCamera {
     return point - nonRotatedPixelOrigin;
   }
 
-  /// Calculate the [LatLng] coordinates for a [localPoint].
-  LatLng offsetToLatLng(Offset localPoint) {
-    final localPointCenterDistance = Offset(
-      (nonRotatedSize.width / 2) - localPoint.dx,
-      (nonRotatedSize.height / 2) - localPoint.dy,
-    );
+  /// Calculate the [LatLng] coordinates for a [offset].
+  LatLng screenOffsetToLatLng(Offset offset) {
+    final localPointCenterDistance =
+        nonRotatedSize.center(Offset.zero) - offset;
     final mapCenter = crs.latLngToOffset(center, zoom);
 
     var point = mapCenter - localPointCenterDistance;