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

better tile distance + comments

Browse Source
This commit is contained in:
Hannes Janetzek 2013-02-10 12:15:18 +01:00
parent bdbdbb5905
commit 429b8a98d7
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,26 +415,43 @@ public class TileManager {
continue; continue;
int diff = (t.zoomLevel - zoom); int diff = (t.zoomLevel - zoom);
double dx, dy, dz; double dx, dy, dz, scale;
dz = 0;
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 = 0.5f; scale = 0.5f;
} else if (diff > 0) { } else if (diff > 0) {
// tile zoom level is greater than current // tile zoom level is greater than current
// NB: distance increase by the factor 2
// with each zoom-level, so that children
// will be kept less likely than parent tiles.
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.25f * (1 << (diff - 1)); // add tilesize/2 with each zoom-level
// so that children near the current
// map position but a few levels above
// will also be removed
dz = diff * h;
scale = 0.25f * (1 << diff);
} else { } else {
diff = -diff;
// 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 = 0.5f * (1 << -diff); dz = diff * h;
scale = 0.5f * (1 << diff);
} }
if (dx < 0)
dx = -dx;
if (dy < 0)
dy = -dy;
dx %= center; dx %= center;
dy %= center; dy %= center;
t.distance = (float) ((dx * dx + dy * dy) * dz); t.distance = (float) ((dx + dy + dz) * scale);
} }
} }
@ -483,7 +500,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,19 +516,19 @@ public class TileManager {
tiles[i] = null; tiles[i] = null;
} }
} }
// if (locked) { // if (locked) {
// Log.d(TAG, "------------ " // Log.d(TAG, "------------ "
// + remove + " / " + r + " " // + remove + " / " + r + " "
// + mMapPosition.zoomLevel // + mMapPosition.zoomLevel
// + " ----------"); // + " ----------");
// for (int i = 0; i < size; i++) { // for (int i = 0; i < size; i++) {
// MapTile t = tiles[i]; // MapTile t = tiles[i];
// if (t == null) // if (t == null)
// continue; // continue;
// Log.d(TAG, "limitCache: " + t + " " + t.distance); // 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--) {