From 54127a9ed432e57e1fd93514584e01848ea511ac Mon Sep 17 00:00:00 2001 From: mootw Date: Mon, 2 Dec 2024 20:21:18 -0600 Subject: [PATCH] remove stuff --- lib/src/layer/tile_layer/tile_layer.dart | 1 + lib/src/layer/tile_layer/tile_range.dart | 12 +++++++++--- lib/src/misc/extensions.dart | 17 +---------------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/lib/src/layer/tile_layer/tile_layer.dart b/lib/src/layer/tile_layer/tile_layer.dart index 3ff6cdbda..c516673c6 100644 --- a/lib/src/layer/tile_layer/tile_layer.dart +++ b/lib/src/layer/tile_layer/tile_layer.dart @@ -758,6 +758,7 @@ class _TileLayerState extends State with TickerProviderStateMixin { } } +// TODO replace with simple implementation of (Offset - Offset).distanceSq double _distanceSq(TileCoordinates coord, Point center) { final dx = center.x - coord.x; final dy = center.y - coord.y; diff --git a/lib/src/layer/tile_layer/tile_range.dart b/lib/src/layer/tile_layer/tile_range.dart index 41eff6ee0..088f3450b 100644 --- a/lib/src/layer/tile_layer/tile_range.dart +++ b/lib/src/layer/tile_layer/tile_range.dart @@ -29,6 +29,12 @@ class EmptyTileRange extends TileRange { const Iterable.empty(); } +Point _floor(Point point) => + Point(point.x.floor(), point.y.floor()); + +Point _ceil(Point point) => + Point(point.x.ceil(), point.y.ceil()); + /// Every [TileRange] is a [DiscreteTileRange] if it's not an [EmptyTileRange]. @immutable class DiscreteTileRange extends TileRange { @@ -46,12 +52,12 @@ class DiscreteTileRange extends TileRange { }) { final Bounds bounds; if (pixelBounds.min == pixelBounds.max) { - final minAndMax = (pixelBounds.min / tileDimension).floor(); + final minAndMax = _floor(pixelBounds.min / tileDimension); bounds = Bounds(minAndMax, minAndMax); } else { bounds = Bounds( - (pixelBounds.min / tileDimension).floor(), - (pixelBounds.max / tileDimension).ceil() - const Point(1, 1), + _floor(pixelBounds.min / tileDimension), + _ceil(pixelBounds.max / tileDimension) - const Point(1, 1), ); } diff --git a/lib/src/misc/extensions.dart b/lib/src/misc/extensions.dart index d9f145a54..beb132bf1 100644 --- a/lib/src/misc/extensions.dart +++ b/lib/src/misc/extensions.dart @@ -4,25 +4,11 @@ import 'dart:ui'; /// Extension methods for the math.[Point] class extension PointExtension on Point { /// Create a new [Point] where the [x] and [y] values are divided by [factor]. - @Deprecated('Replace with Offset') + /// REPLACE IN FAVOR OF OFFSET Point operator /(num factor) { return Point(x / factor, y / factor); } - /// Create a new [Point] where the [x] and [y] values are rounded up to the - /// nearest integer. - @Deprecated('Replace with Offset') - Point ceil() { - return Point(x.ceil(), y.ceil()); - } - - /// Create a new [Point] where the [x] and [y] values are rounded down to the - /// nearest integer. - @Deprecated('Replace with Offset') - Point floor() { - return Point(x.floor(), y.floor()); - } - /// Converts to offset Offset toOffset() => Offset(x.toDouble(), y.toDouble()); } @@ -30,7 +16,6 @@ extension PointExtension on Point { /// Extension methods for [Offset] extension OffsetToPointExtension on Offset { /// Creates a [Point] representation of this offset. This is ONLY used for backwards compatibility - @Deprecated('Only used for backwards compatibility') Point toPoint() => Point(dx, dy); /// Create a new [Offset] whose [dx] and [dy] values are rotated clockwise by