xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TileRenderer: load tile with proxy immediately (#510)

Browse Source
This commit is contained in:
Gustl22 2018-03-05 13:47:08 +01:00 committed by Emux
parent 88d94ede01
commit 5f57f97844
No known key found for this signature in database
GPG Key ID: 89C6921D7AF2BDD0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vtm/src/org/oscim/layers/tile/TileRenderer.java
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2018 Gustl22
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * 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 */ /* load tile that is referenced by this holder */
MapTile proxy = tile.holder; MapTile proxy = tile.holder;
if (proxy != null && proxy.state(NEW_DATA)) { if (proxy != null && (proxy.state(NEW_DATA) || proxy.state(READY))) {
uploadCnt += uploadTileData(proxy); tile.state = NEW_DATA; // Change independently of proxy state, as long as it isn't READY
tile.state = proxy.state; //uploadCnt += uploadTileData(proxy); // Should already been done in separate call
uploadCnt += uploadTileData(tile); // Actual tile must be loaded immediately
continue; continue;
} }
@ -168,7 +170,7 @@ public abstract class TileRenderer extends LayerRenderer {
proxy = tile.getProxy(PROXY_PARENT, NEW_DATA); proxy = tile.getProxy(PROXY_PARENT, NEW_DATA);
if (proxy != null) { if (proxy != null) {
uploadCnt += uploadTileData(proxy); uploadCnt += uploadTileData(proxy);
/* dont load child proxies */ /* don't load child proxies */
continue; continue;
} }