Skip to content
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

Jump to bottom

refactor: migrate tile rendering from widgets to CustomPainter #1928

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

refactor: migrate tile rendering from widgets to CustomPainter #1928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0167388
Initial implementation (based off #1853)
JaffaKetchup Jun 6, 2024
6170df9
Updated tests
JaffaKetchup Jun 6, 2024
3f60768
Merge branch 'master' into tile-layer-canvas
JaffaKetchup Jun 6, 2024
ab251d0
Merge branch 'master' into tile-layer-canvas
JaffaKetchup Jul 4, 2024
8023bfd
Merge branch 'master' into tile-layer-canvas
JaffaKetchup Aug 31, 2024
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
17 changes: 11 additions & 6 deletions example/lib/pages/retina.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,17 @@ class _RetinaPageState extends State<RetinaPage> {
null => RetinaMode.isHighDensity(context),
_ => retinaMode!,
},
tileBuilder: (context, tileWidget, _) => DecoratedBox(
decoration: BoxDecoration(
border: Border.all(width: 2, color: Colors.white),
),
position: DecorationPosition.foreground,
child: tileWidget,
tileOverlayPainter: ({
required canvas,
required origin,
required size,
required tile,
}) =>
canvas.drawRect(
origin & size,
Paint()
..color = Colors.white
..style = PaintingStyle.stroke,
),
);

Expand Down
134 changes: 82 additions & 52 deletions example/lib/pages/tile_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,51 +10,37 @@ class TileBuilderPage extends StatefulWidget {
const TileBuilderPage({super.key});

@override
TileBuilderPageState createState() => TileBuilderPageState();
State<TileBuilderPage> createState() => _TileBuilderPageState();
}

class TileBuilderPageState extends State<TileBuilderPage> {
class _TileBuilderPageState extends State<TileBuilderPage> {
bool enableGrid = true;
bool showCoordinates = true;
bool showLoadingTime = true;
bool darkMode = true;
bool enableDarkMode = true;

// mix of [coordinateDebugTileBuilder] and [loadingTimeDebugTileBuilder] from tile_builder.dart
Widget tileBuilder(BuildContext context, Widget tileWidget, TileImage tile) {
final coords = tile.coordinates;

return DecoratedBox(
decoration: BoxDecoration(
border: enableGrid ? Border.all(width: 2, color: Colors.white) : null,
),
position: DecorationPosition.foreground,
child: Stack(
fit: StackFit.passthrough,
children: [
tileWidget,
if (showLoadingTime || showCoordinates)
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
if (showCoordinates)
Text(
'${coords.x} : ${coords.y} : ${coords.z}',
style: Theme.of(context).textTheme.headlineSmall,
),
if (showLoadingTime)
Text(
tile.loadFinishedAt == null
? 'Loading'
// sometimes result is negative which shouldn't happen, abs() corrects it
: '${(tile.loadFinishedAt!.millisecond - tile.loadStarted!.millisecond).abs()} ms',
style: Theme.of(context).textTheme.headlineSmall,
),
],
),
],
),
);
}
final _darkModeColorFilter = const ColorFilter.matrix([
-1,
0,
0,
0,
255,
0,
-1,
0,
0,
255,
0,
0,
-1,
0,
255,
0,
0,
0,
1,
0,
]);

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -101,8 +87,8 @@ class TileBuilderPageState extends State<TileBuilderPage> {
child: Icon(Icons.dark_mode),
),
Switch.adaptive(
value: darkMode,
onChanged: (v) => setState(() => darkMode = v),
value: enableDarkMode,
onChanged: (v) => setState(() => enableDarkMode = v),
),
],
),
Expand All @@ -115,14 +101,14 @@ class TileBuilderPageState extends State<TileBuilderPage> {
initialZoom: 5,
),
children: [
_darkModeContainerIfEnabled(
TileLayer(
urlTemplate:
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
tileProvider: CancellableNetworkTileProvider(),
tileBuilder: tileBuilder,
),
TileLayer(
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
tileProvider: CancellableNetworkTileProvider(),
tilePaint: enableDarkMode
? (Paint()..colorFilter = _darkModeColorFilter)
: null,
tileOverlayPainter: tileOverlayPainter,
),
const MarkerLayer(
markers: [
Expand All @@ -144,9 +130,53 @@ class TileBuilderPageState extends State<TileBuilderPage> {
);
}

Widget _darkModeContainerIfEnabled(Widget child) {
if (!darkMode) return child;
void tileOverlayPainter({
required Canvas canvas,
required Offset origin,
required Size size,
required TileImage tile,
}) {
final rect = origin & size;

if (enableGrid) {
canvas.drawRect(
rect,
Paint()
..color = enableDarkMode ? Colors.white : Colors.black
..style = PaintingStyle.stroke,
);
}

if (showCoordinates || showLoadingTime) {
final textStyle = TextStyle(
color: enableDarkMode ? Colors.white : Colors.black,
fontSize: 18,
);

final textSpan = TextSpan(
text: (showCoordinates ? tile.coordinates.toString() : '') +
(showCoordinates && showLoadingTime ? '\n' : '') +
(showLoadingTime
? tile.loadFinishedAt == null
? 'Loading'
// sometimes result is negative which shouldn't happen, abs() corrects it
: '${(tile.loadFinishedAt!.millisecond - tile.loadStarted!.millisecond).abs()} ms'
: ''),
style: textStyle,
);
final textPainter = TextPainter(
text: textSpan,
textDirection: TextDirection.ltr,
textAlign: TextAlign.center,
);
textPainter.layout(
minWidth: 0,
maxWidth: size.width,
);
final xCenter = (size.width - textPainter.width) / 2;
final yCenter = (size.height - textPainter.height) / 2;

return darkModeTilesContainerBuilder(context, child);
textPainter.paint(canvas, origin + Offset(xCenter, yCenter));
}
}
}
2 changes: 1 addition & 1 deletion lib/flutter_map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ export 'package:flutter_map/src/layer/shared/layer_interactivity/layer_hit_resul
export 'package:flutter_map/src/layer/shared/line_patterns/stroke_pattern.dart';
export 'package:flutter_map/src/layer/shared/mobile_layer_transformer.dart';
export 'package:flutter_map/src/layer/shared/translucent_pointer.dart';
export 'package:flutter_map/src/layer/tile_layer/tile_builder.dart';
export 'package:flutter_map/src/layer/tile_layer/tile_coordinates.dart';
export 'package:flutter_map/src/layer/tile_layer/tile_display.dart';
export 'package:flutter_map/src/layer/tile_layer/tile_image.dart';
export 'package:flutter_map/src/layer/tile_layer/tile_layer.dart';
export 'package:flutter_map/src/layer/tile_layer/tile_overlay_painter.dart';
export 'package:flutter_map/src/layer/tile_layer/tile_provider/asset_tile_provider.dart';
export 'package:flutter_map/src/layer/tile_layer/tile_provider/base_tile_provider.dart';
export 'package:flutter_map/src/layer/tile_layer/tile_provider/file_providers/tile_provider_stub.dart'
Expand Down
95 changes: 0 additions & 95 deletions lib/src/layer/tile_layer/tile.dart
View file
Open in desktop

This file was deleted.

Loading
Loading