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

one more try for quad-tile distance

Browse Source
This commit is contained in:
Hannes Janetzek 2013-02-07 13:09:13 +01:00
parent a9dc0d483c
commit f18bc5a077
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/org/oscim/renderer/TileManager.java
View File

@ -406,7 +406,7 @@ public class TileManager {
double x = mapPosition.x; double x = mapPosition.x;
double y = mapPosition.y; double y = mapPosition.y;
byte zoom = mapPosition.zoomLevel; byte zoom = mapPosition.zoomLevel;
int h = (Tile.TILE_SIZE >> 1); int h = Tile.TILE_SIZE >> 1;
long center = h << zoom; long center = h << zoom;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
@ -420,17 +420,17 @@ public class TileManager {
if (diff == 0) { if (diff == 0) {
dx = (t.pixelX + h) - x; dx = (t.pixelX + h) - x;
dy = (t.pixelY + h) - y; dy = (t.pixelY + h) - y;
dz = 1; dz = 0.5f;
} else if (diff > 0) { } else if (diff > 0) {
// tile zoom level is greater than current // tile zoom level is greater than current
dx = (t.pixelX + h) - x * (1 << diff); dx = (t.pixelX + h) - x * (1 << diff);
dy = (t.pixelY + h) - y * (1 << diff); dy = (t.pixelY + h) - y * (1 << diff);
dz = 0.5f * (1 << diff); dz = 0.25f * (1 << (diff - 1));
} else { } else {
// tile zoom level is smaller than current // tile zoom level is smaller than current
dx = (t.pixelX + h) - x / (1 << -diff); dx = (t.pixelX + h) - x / (1 << -diff);
dy = (t.pixelY + h) - y / (1 << -diff); dy = (t.pixelY + h) - y / (1 << -diff);
dz = (1 << (1 - diff)); dz = 0.5f * (1 << -diff);
} }
dx %= center; dx %= center;
dy %= center; dy %= center;
@ -483,7 +483,7 @@ public class TileManager {
Log.d(TAG, "limitCache: tile still locked " + t + " " + t.distance); Log.d(TAG, "limitCache: tile still locked " + t + " " + t.distance);
// try again in next run. // try again in next run.
//locked = true; //locked = true;
//break; break;
} else if (t.state == STATE_LOADING) { } else if (t.state == STATE_LOADING) {
// NOTE: when set loading to false the tile could be // NOTE: when set loading to false the tile could be
// added to load queue again while still processed in // added to load queue again while still processed in
@ -499,16 +499,19 @@ public class TileManager {
tiles[i] = null; tiles[i] = null;
} }
} }
//if (locked) { // if (locked) {
// Log.d(TAG, "------------ " + remove + " / " + r + " ----------"); // Log.d(TAG, "------------ "
// for (int i = 0; i < size; i++) { // + remove + " / " + r + " "
// MapTile t = tiles[i]; // + mMapPosition.zoomLevel
// if (t == null) // + " ----------");
// continue; // for (int i = 0; i < size; i++) {
// Log.d(TAG, "limitCache: " + t + " " + t.distance); // MapTile t = tiles[i];
// if (t == null)
// continue;
// Log.d(TAG, "limitCache: " + t + " " + t.distance);
// //
// } // }
//} // }
remove = (newTileCnt - MAX_TILES_IN_QUEUE) + 10; remove = (newTileCnt - MAX_TILES_IN_QUEUE) + 10;
//int r = remove; //int r = remove;
for (int i = size - 1; i >= 0 && remove > 0; i--) { for (int i = size - 1; i >= 0 && remove > 0; i--) {