Skip to content

fix(*): tile display #637

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

Closed
ruizalexandre wants to merge 1 commit into from
Closed

fix(*): tile display #637

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
46 changes: 21 additions & 25 deletions lib/src/layer/tile_layer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ class _TileLayerState extends State<TileLayer> with TickerProviderStateMixin {
for (var tile in _tiles.values) {
tile.imageProvider = options.tileProvider
.getImage(_wrapCoords(tile.coords), options);
tile.loadTileImage();
tile.fetchImage();
}
} else {
reloadTiles = true;
Expand Down Expand Up @@ -936,7 +936,7 @@ class _TileLayerState extends State<TileLayer> with TickerProviderStateMixin {

void _addTile(Coords<double> coords) {
var tileCoordsToKey = _tileCoordsToKey(coords);
_tiles[tileCoordsToKey] = Tile(
var tile = Tile(
coords: coords,
coordsKey: tileCoordsToKey,
tilePos: _getTilePos(coords),
Expand All @@ -946,6 +946,8 @@ class _TileLayerState extends State<TileLayer> with TickerProviderStateMixin {
options.tileProvider.getImage(_wrapCoords(coords), options),
tileReady: _tileReady,
);
_tiles[tileCoordsToKey] = tile;
tile.fetchImage();
}

void _tileReady(Coords<double> coords, dynamic error, Tile tile) {
Expand Down Expand Up @@ -1078,26 +1080,7 @@ class Tile implements Comparable<Tile> {
this.active = false,
this.retain = false,
this.loadError = false,
}) {
loadTileImage();
}

void loadTileImage() {
try {
final oldImageStream = _imageStream;
_imageStream = imageProvider.resolve(ImageConfiguration());

if (_imageStream.key != oldImageStream?.key) {
oldImageStream?.removeListener(_listener);

_listener = ImageStreamListener(_tileOnLoad, onError: _tileOnError);
_imageStream.addListener(_listener);
}
} catch (e, s) {
// make sure all exception is handled - #444 / #536
_tileOnError(e, s);
}
}
});

// call this before GC!
void dispose([bool evict = false]) {
Expand Down Expand Up @@ -1129,6 +1112,17 @@ class Tile implements Comparable<Tile> {
}
}

void fetchImage() {
try {
_imageStream = imageProvider.resolve(ImageConfiguration());
_listener = ImageStreamListener(_tileOnLoad, onError: _tileOnError);
_imageStream.addListener(_listener);
} catch (e, s) {
// make sure all exception is handled - #444 / #536
_tileOnError(e, s);
}
}

void _tileOnLoad(ImageInfo imageInfo, bool synchronousCall) {
if (null != tileReady) {
this.imageInfo = imageInfo;
Expand Down Expand Up @@ -1168,8 +1162,11 @@ class AnimatedTile extends StatefulWidget {
final Tile tile;
final ImageProvider errorImage;

AnimatedTile({Key key, @required this.tile, this.errorImage})
: assert(null != tile),
AnimatedTile({
Key key,
@required this.tile,
this.errorImage,
}) : assert(null != tile),
super(key: key);

@override
Expand Down Expand Up @@ -1198,7 +1195,6 @@ class _AnimatedTileState extends State<AnimatedTile> {
@override
void initState() {
super.initState();

if (null != widget.tile.animationController) {
widget.tile.animationController.addListener(_handleChange);
listenerAttached = true;
Expand Down