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

fix wrap around date-line in label overlay

Browse Source
This commit is contained in:
Hannes Janetzek 2012-12-29 23:40:10 +01:00
parent 45cf6620a9
commit 9b0b2db57b
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/org/oscim/renderer/overlays/OverlayText.java
View File

@ -30,7 +30,6 @@ import org.oscim.view.MapView;
import android.opengl.Matrix; import android.opengl.Matrix;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.FloatMath;
public class OverlayText extends RenderOverlay { public class OverlayText extends RenderOverlay {
@ -100,12 +99,14 @@ public class OverlayText extends RenderOverlay {
} }
float scale = mWorkPos.scale; float scale = mWorkPos.scale;
float angle = (float) Math.toRadians(mWorkPos.angle); double angle = Math.toRadians(mWorkPos.angle);
float cos = FloatMath.cos(angle); float cos = (float) Math.cos(angle);
float sin = FloatMath.sin(angle); float sin = (float) Math.sin(angle);
TextItem ti2 = null; TextItem ti2 = null;
int maxx = Tile.TILE_SIZE << (mWorkPos.zoomLevel - 1);
// TODO more sophisticated placement :) // TODO more sophisticated placement :)
for (int i = 0, n = tiles.cnt; i < n; i++) { for (int i = 0, n = tiles.cnt; i < n; i++) {
MapTile t = tiles.tiles[i]; MapTile t = tiles.tiles[i];
@ -115,6 +116,13 @@ public class OverlayText extends RenderOverlay {
float dx = (float) ((t.pixelX - mWorkPos.x) * scale); float dx = (float) ((t.pixelX - mWorkPos.x) * scale);
float dy = (float) ((t.pixelY - mWorkPos.y) * scale); float dy = (float) ((t.pixelY - mWorkPos.y) * scale);
// flip around date-line
if (dx > maxx) {
dx = dx - maxx * 2;
} else if (dx < -maxx) {
dx = dx + maxx * 2;
}
for (TextItem ti = t.labels; ti != null; ti = ti.next) { for (TextItem ti = t.labels; ti != null; ti = ti.next) {
if (ti2 == null) if (ti2 == null)
@ -278,13 +286,6 @@ public class OverlayText extends RenderOverlay {
float x = (float) (oPos.x - curPos.x * div); float x = (float) (oPos.x - curPos.x * div);
float y = (float) (oPos.y - curPos.y * div); float y = (float) (oPos.y - curPos.y * div);
// flip around date-line
float max = (Tile.TILE_SIZE << z);
if (x < -max / 2)
x = max + x;
else if (x > max / 2)
x = x - max;
float scale = curPos.scale / div; float scale = curPos.scale / div;
Matrix.setIdentityM(matrix, 0); Matrix.setIdentityM(matrix, 0);