TileRenderer: load tile with proxy immediately (#510)
This commit is contained in:
parent
88d94ede01
commit
5f57f97844
@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright 2013 Hannes Janetzek
|
||||
* Copyright 2018 Gustl22
|
||||
*
|
||||
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
|
||||
*
|
||||
@ -158,9 +159,10 @@ public abstract class TileRenderer extends LayerRenderer {
|
||||
|
||||
/* load tile that is referenced by this holder */
|
||||
MapTile proxy = tile.holder;
|
||||
if (proxy != null && proxy.state(NEW_DATA)) {
|
||||
uploadCnt += uploadTileData(proxy);
|
||||
tile.state = proxy.state;
|
||||
if (proxy != null && (proxy.state(NEW_DATA) || proxy.state(READY))) {
|
||||
tile.state = NEW_DATA; // Change independently of proxy state, as long as it isn't READY
|
||||
//uploadCnt += uploadTileData(proxy); // Should already been done in separate call
|
||||
uploadCnt += uploadTileData(tile); // Actual tile must be loaded immediately
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -168,7 +170,7 @@ public abstract class TileRenderer extends LayerRenderer {
|
||||
proxy = tile.getProxy(PROXY_PARENT, NEW_DATA);
|
||||
if (proxy != null) {
|
||||
uploadCnt += uploadTileData(proxy);
|
||||
/* dont load child proxies */
|
||||
/* don't load child proxies */
|
||||
continue;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user