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

useless sync

Browse Source
This commit is contained in:
Hannes Janetzek 2014-10-03 07:24:28 +02:00
parent de24860ad4
commit 9b5d31bcf3
1 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,31 +395,27 @@ public class LabelPlacement {
/* add way labels */ /* add way labels */
for (int i = 0, n = mTileSet.cnt; i < n; i++) { for (int i = 0, n = mTileSet.cnt; i < n; i++) {
MapTile t = tiles[i]; MapTile t = tiles[i];
synchronized (t) { if (!t.state(READY | NEW_DATA))
if (!t.state(READY | NEW_DATA)) continue;
continue;
float dx = (float) (t.tileX * Tile.SIZE - tileX); float dx = (float) (t.tileX * Tile.SIZE - tileX);
float dy = (float) (t.tileY * Tile.SIZE - tileY); float dy = (float) (t.tileY * Tile.SIZE - tileY);
dx = flipLongitude(dx, maxx); dx = flipLongitude(dx, maxx);
l = addWayLabels(t, l, dx, dy, scale); l = addWayLabels(t, l, dx, dy, scale);
}
} }
/* add caption */ /* add caption */
for (int i = 0, n = mTileSet.cnt; i < n; i++) { for (int i = 0, n = mTileSet.cnt; i < n; i++) {
MapTile t = tiles[i]; MapTile t = tiles[i];
synchronized (t) { if (!t.state(READY | NEW_DATA))
if (!t.state(READY | NEW_DATA)) continue;
continue;
float dx = (float) (t.tileX * Tile.SIZE - tileX); float dx = (float) (t.tileX * Tile.SIZE - tileX);
float dy = (float) (t.tileY * Tile.SIZE - tileY); float dy = (float) (t.tileY * Tile.SIZE - tileY);
dx = flipLongitude(dx, maxx); dx = flipLongitude(dx, maxx);
l = addNodeLabels(t, l, dx, dy, scale, cos, sin); l = addNodeLabels(t, l, dx, dy, scale, cos, sin);
}
} }
for (Label ti = mLabels; ti != null; ti = (Label) ti.next) { for (Label ti = mLabels; ti != null; ti = (Label) ti.next) {
@ -451,35 +447,33 @@ public class LabelPlacement {
/* add symbol items */ /* add symbol items */
for (int i = 0, n = mTileSet.cnt; i < n; i++) { for (int i = 0, n = mTileSet.cnt; i < n; i++) {
MapTile t = tiles[i]; MapTile t = tiles[i];
synchronized (t) { if (!t.state(READY | NEW_DATA))
if (!t.state(READY | NEW_DATA)) continue;
float dx = (float) (t.tileX * Tile.SIZE - tileX);
float dy = (float) (t.tileY * Tile.SIZE - tileY);
dx = flipLongitude(dx, maxx);
LabelTileData ld = getLabels(t);
if (ld == null)
continue;
for (SymbolItem ti : ld.symbols) {
if (ti.texRegion == null)
continue; continue;
float dx = (float) (t.tileX * Tile.SIZE - tileX); int x = (int) ((dx + ti.x) * scale);
float dy = (float) (t.tileY * Tile.SIZE - tileY); int y = (int) ((dy + ti.y) * scale);
dx = flipLongitude(dx, maxx);
LabelTileData ld = getLabels(t); if (!isVisible(x, y))
if (ld == null)
continue; continue;
for (SymbolItem ti : ld.symbols) { SymbolItem s = SymbolItem.pool.get();
if (ti.texRegion == null) s.texRegion = ti.texRegion;
continue; s.x = x;
s.y = y;
int x = (int) ((dx + ti.x) * scale); s.billboard = true;
int y = (int) ((dy + ti.y) * scale); sl.addSymbol(s);
if (!isVisible(x, y))
continue;
SymbolItem s = SymbolItem.pool.get();
s.texRegion = ti.texRegion;
s.x = x;
s.y = y;
s.billboard = true;
sl.addSymbol(s);
}
} }
} }