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

use Inlist.List for MapTile.labels/symbols

Browse Source
This commit is contained in:
Hannes Janetzek 2014-02-07 17:16:01 +01:00
parent 6dddf614dd
commit bf2e0e44a8
5 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
View File

@ -343,7 +343,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
return; return;
PointF p = mElement.getPoint(0); PointF p = mElement.getPoint(0);
mTile.addLabel(TextItem.pool.get().set(p.x, p.y, value, text)); mTile.labels.push(TextItem.pool.get().set(p.x, p.y, value, text));
} }
@Override @Override
@ -354,7 +354,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
for (int i = 0, n = mElement.getNumPoints(); i < n; i++) { for (int i = 0, n = mElement.getNumPoints(); i < n; i++) {
PointF p = mElement.getPoint(i); PointF p = mElement.getPoint(i);
mTile.addLabel(TextItem.pool.get().set(p.x, p.y, value, text)); mTile.labels.push(TextItem.pool.get().set(p.x, p.y, value, text));
} }
} }
@ -391,7 +391,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
SymbolItem it = SymbolItem.pool.get(); SymbolItem it = SymbolItem.pool.get();
it.set(p.x, p.y, symbol.texture, true); it.set(p.x, p.y, symbol.texture, true);
mTile.addSymbol(it); mTile.symbols.push(it);
} }
} }

6
vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
View File

@ -360,7 +360,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
x /= (n / 2); x /= (n / 2);
y /= (n / 2); y /= (n / 2);
mTile.addLabel(TextItem.pool.get().set(x, y, value, text)); mTile.labels.push(TextItem.pool.get().set(x, y, value, text));
} }
@Override @Override
@ -371,7 +371,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
for (int i = 0, n = mElement.getNumPoints(); i < n; i++) { for (int i = 0, n = mElement.getNumPoints(); i < n; i++) {
PointF p = mElement.getPoint(i); PointF p = mElement.getPoint(i);
mTile.addLabel(TextItem.pool.get().set(p.x, p.y, value, text)); mTile.labels.push(TextItem.pool.get().set(p.x, p.y, value, text));
} }
} }
@ -407,7 +407,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
SymbolItem it = SymbolItem.pool.get(); SymbolItem it = SymbolItem.pool.get();
it.set(p.x, p.y, symbol.texture, true); it.set(p.x, p.y, symbol.texture, true);
mTile.addSymbol(it); mTile.symbols.push(it);
} }
} }

3
vtm/src/org/oscim/layers/tile/vector/WayDecorator.java
View File

@ -214,8 +214,9 @@ public final class WayDecorator {
t.x2 = x2; t.x2 = x2;
t.y2 = y2; t.y2 = y2;
t.length = (short) segmentLength; t.length = (short) segmentLength;
t.edges = edge; t.edges = edge;
tile.addLabel(t); tile.labels.push(t);
i = last; i = last;
} }

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

@ -173,7 +173,7 @@ public class LabelPlacement {
private Label addWayLabels(MapTile t, Label l, float dx, float dy, private Label addWayLabels(MapTile t, Label l, float dx, float dy,
double scale) { double scale) {
for (TextItem ti = t.labels; ti != null; ti = ti.next) { for (TextItem ti : t.labels) {
if (ti.text.caption) if (ti.text.caption)
continue; continue;
@ -225,7 +225,8 @@ public class LabelPlacement {
private Label addNodeLabels(MapTile t, Label l, float dx, float dy, private Label addNodeLabels(MapTile t, Label l, float dx, float dy,
double scale, float cos, float sin) { double scale, float cos, float sin) {
O: for (TextItem ti = t.labels; ti != null; ti = ti.next) {
O: for (TextItem ti : t.labels) {
if (!ti.text.caption) if (!ti.text.caption)
continue; continue;
@ -443,7 +444,7 @@ public class LabelPlacement {
float dy = (float) (t.tileY * Tile.SIZE - tileY); float dy = (float) (t.tileY * Tile.SIZE - tileY);
dx = flipLongitude(dx, maxx); dx = flipLongitude(dx, maxx);
for (SymbolItem ti = t.symbols; ti != null; ti = ti.next) { for (SymbolItem ti : t.symbols) {
if (ti.texRegion == null) if (ti.texRegion == null)
continue; continue;

20
vtm/src/org/oscim/tiling/MapTile.java
View File

@ -20,7 +20,7 @@ import org.oscim.core.Tile;
import org.oscim.renderer.elements.ElementLayers; import org.oscim.renderer.elements.ElementLayers;
import org.oscim.renderer.elements.SymbolItem; import org.oscim.renderer.elements.SymbolItem;
import org.oscim.renderer.elements.TextItem; import org.oscim.renderer.elements.TextItem;
import org.oscim.utils.pool.Inlist; import org.oscim.utils.pool.Inlist.List;
import org.oscim.utils.quadtree.Node; import org.oscim.utils.quadtree.Node;
/** /**
@ -81,18 +81,12 @@ public class MapTile extends Tile {
* FIXME move to VectorMapTile * FIXME move to VectorMapTile
* Tile data set by TileLoader. * Tile data set by TileLoader.
*/ */
public TextItem labels;
public SymbolItem symbols; public final List<SymbolItem> symbols = new List<SymbolItem>();
public final List<TextItem> labels = new List<TextItem>();
public ElementLayers layers; public ElementLayers layers;
public void addLabel(TextItem it) {
labels = Inlist.push(labels, it);
}
public void addSymbol(SymbolItem it) {
symbols = Inlist.push(symbols, it);
}
/** /**
* Tile is in view region. Set by TileRenderer. * Tile is in view region. Set by TileRenderer.
*/ */
@ -234,8 +228,8 @@ public class MapTile extends Tile {
layers = null; layers = null;
} }
labels = TextItem.pool.releaseAll(labels); TextItem.pool.releaseAll(labels.clear());
symbols = SymbolItem.pool.releaseAll(symbols); SymbolItem.pool.releaseAll(symbols.clear());
state = STATE_NONE; state = STATE_NONE;
} }