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

reduce label flickering

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-28 06:18:58 +01:00
parent beef0bfae9
commit 9b771595f8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java
View File

@ -78,7 +78,7 @@ public class LabelPlacement {
for (Label o = mLabels; o != null;) { for (Label o = mLabels; o != null;) {
//check bounding box //check bounding box
if (!Label.bboxOverlaps(l, o, 150)) { if (!Label.bboxOverlaps(l, o, 100)) {
o = (Label) o.next; o = (Label) o.next;
continue; continue;
} }
@ -164,10 +164,10 @@ public class LabelPlacement {
float w = (ti.x2 - ti.x1) / 2f; float w = (ti.x2 - ti.x1) / 2f;
float h = (ti.y2 - ti.y1) / 2f; float h = (ti.y2 - ti.y1) / 2f;
l.x1 = (int) (l.x - w); l.x1 = l.x - w;
l.y1 = (int) (l.y - h); l.y1 = l.y - h;
l.x2 = (int) (l.x + w); l.x2 = l.x + w;
l.y2 = (int) (l.y + h); l.y2 = l.y + h;
} }
private Label addWayLabels(MapTile t, Label l, float dx, float dy, private Label addWayLabels(MapTile t, Label l, float dx, float dy,
@ -337,7 +337,8 @@ public class LabelPlacement {
float div = FastMath.pow(diff); float div = FastMath.pow(diff);
float sscale = (float) (pos.scale / (1 << l.tileZ)); float sscale = (float) (pos.scale / (1 << l.tileZ));
if (l.width > l.length * sscale) { // plus 10 to rather keep label and avoid flickering
if (l.width > (l.length + 10) * sscale) {
l = mPool.releaseAndGetNext(l); l = mPool.releaseAndGetNext(l);
continue; continue;
} }