From 3471c44bae89b6cb17938a3bc97dca2491dbbea5 Mon Sep 17 00:00:00 2001
From: Rory Stephenson <rorystephenson@gmail.com>
Date: Tue, 18 Jul 2023 11:03:53 +0200
Subject: [PATCH] Use point extension's toOffset()

---
 lib/src/layer/label.dart       | 5 +----
 lib/src/map/camera/camera.dart | 8 +++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/src/layer/label.dart b/lib/src/layer/label.dart
index 16387e7c5..af8fcfbd9 100644
--- a/lib/src/layer/label.dart
+++ b/lib/src/layer/label.dart
@@ -69,9 +69,6 @@ class Label {
     final labelPosition = polylabel([
       points.map((p) => math.Point(p.dx, p.dy)).toList(),
     ]);
-    return Offset(
-      labelPosition.point.x.toDouble(),
-      labelPosition.point.y.toDouble(),
-    );
+    return labelPosition.point.toOffset();
   }
 }
diff --git a/lib/src/map/camera/camera.dart b/lib/src/map/camera/camera.dart
index 384450b71..f38603f25 100644
--- a/lib/src/map/camera/camera.dart
+++ b/lib/src/map/camera/camera.dart
@@ -249,10 +249,8 @@ class MapCamera {
       crs.getProjectedBounds(zoom ?? this.zoom);
 
   /// Calculates the [Offset] from the [pos] to this camera's [pixelOrigin].
-  Offset getOffsetFromOrigin(LatLng pos) {
-    final delta = project(pos).subtract(pixelOrigin);
-    return Offset(delta.x, delta.y);
-  }
+  Offset getOffsetFromOrigin(LatLng pos) =>
+      project(pos).subtract(pixelOrigin).toOffset();
 
   /// Calculates the pixel origin of this [MapCamera] at the given
   /// [center]/[zoom].
@@ -325,7 +323,7 @@ class MapCamera {
       ..rotateZ(rotationRad * counterRotationFactor)
       ..translate(-mapCenter.x, -mapCenter.y);
 
-    final tp = MatrixUtils.transformPoint(m, Offset(point.x, point.y));
+    final tp = MatrixUtils.transformPoint(m, point.toOffset());
 
     return Point(tp.dx, tp.dy);
   }