Skip to content

refactor: remove TileRangeCalculator, which the tile cover replaced #2289

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

Open
greensopinion wants to merge 1 commit into from
Open

refactor: remove TileRangeCalculator, which the tile cover replaced #2289

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
73 changes: 0 additions & 73 deletions lib/src/layer/tile_layer/tile_range_calculator.dart
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion test/full_coverage_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import 'package:flutter_map/src/layer/tile_layer/tile_bounds/tile_bounds.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_bounds/tile_bounds_at_zoom.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_builder.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_coordinates.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_cover.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_cover_calculator.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_display.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_image.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_image_manager.dart';
Expand All @@ -37,7 +39,6 @@ import 'package:flutter_map/src/layer/tile_layer/tile_provider/file/stub_tile_pr
import 'package:flutter_map/src/layer/tile_layer/tile_provider/network/image_provider/image_provider.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_provider/network/tile_provider.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_range.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_range_calculator.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_scale_calculator.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_update_event.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_update_transformer.dart';
Expand Down
48 changes: 33 additions & 15 deletions test/layer/tile_layer/tile_cover_calculator_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'dart:ui';
import 'package:flutter_map/flutter_map.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_cover.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_cover_calculator.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_range_calculator.dart';
import 'package:flutter_map/src/layer/tile_layer/tile_range.dart';
import 'package:flutter_map/src/misc/extensions.dart';
import 'package:latlong2/latlong.dart';
import 'package:test/test.dart';
Expand Down Expand Up @@ -46,6 +46,32 @@ void main() {
viewingZoom: viewingZoom,
);

/// The tiles at [tileZoom] that the tile layer of the release the fork
/// starts from loads for an unpitched [camera], viewed from [center] at
/// [viewingZoom].
DiscreteTileRange unpitchedRange(
MapCamera camera,
int tileZoom, {
int tileDimension = 256,
LatLng? center,
double? viewingZoom,
}) {
final scale =
camera.getZoomScale(viewingZoom ?? camera.zoom, tileZoom.toDouble());
final pixelCenter = camera
.projectAtZoom(center ?? camera.center, tileZoom.toDouble())
.floor();
final halfSize = camera.size / (scale * 2);
return DiscreteTileRange.fromPixelBounds(
zoom: tileZoom,
tileDimension: tileDimension,
pixelBounds: Rect.fromPoints(
pixelCenter - halfSize.bottomRight(Offset.zero),
pixelCenter + halfSize.bottomRight(Offset.zero),
),
);
}

/// For each screen position on a grid, the tile of [tiles] that contains the
/// ground there, and the scale there.
List<(Offset, TileCoordinates?, double)> sample(
Expand Down Expand Up @@ -101,8 +127,8 @@ void main() {
]) {
final c = camera(center: center, zoom: zoom);
final tileZoom = zoom.round();
final range = TileRangeCalculator(tileDimension: tileDimension)
.calculate(camera: c, tileZoom: tileZoom);
final range =
unpitchedRange(c, tileZoom, tileDimension: tileDimension);
expect(
cover(c, tileDimension: tileDimension).coordinates.toSet(),
range.coordinates.toSet(),
Expand All @@ -115,12 +141,7 @@ void main() {
test('equals the range at an overridden center and zoom', () {
final c = camera();
const center = LatLng(45.6, -122.5);
final range = const TileRangeCalculator(tileDimension: 256).calculate(
camera: c,
tileZoom: 15,
center: center,
viewingZoom: 15.3,
);
final range = unpitchedRange(c, 15, center: center, viewingZoom: 15.3);
expect(
cover(c, center: center, viewingZoom: 15.3).coordinates.toSet(),
range.coordinates.toSet(),
Expand All @@ -129,8 +150,7 @@ void main() {

test('equals the range above the maximum native zoom', () {
final c = camera(zoom: 16.3);
final range = const TileRangeCalculator(tileDimension: 256)
.calculate(camera: c, tileZoom: 14);
final range = unpitchedRange(c, 14);
expect(
cover(c, maxNativeZoom: 14).coordinates.toSet(),
range.coordinates.toSet(),
Expand All @@ -139,16 +159,14 @@ void main() {

test('of an empty viewport equals the range', () {
final c = camera(nonRotatedSize: Size.zero);
final range = const TileRangeCalculator(tileDimension: 256)
.calculate(camera: c, tileZoom: 14);
final range = unpitchedRange(c, 14);
expect(cover(c).coordinates.toSet(), range.coordinates.toSet());
});
});

test('rotated, contains only tiles that the viewport touches', () {
final c = camera(rotation: 45);
final range = const TileRangeCalculator(tileDimension: 256)
.calculate(camera: c, tileZoom: 14);
final range = unpitchedRange(c, 14);
final tiles = cover(c);
final touched = {
for (final (screen, tile, _) in sample(c, tiles, step: 1))
Expand Down
Loading