From 61e9deb101568af71a7f6653beaf17dba066772c Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Thu, 19 Sep 2013 23:48:54 +0200 Subject: [PATCH] use new GeometryBuffer functions --- .../oscim/layers/tile/vector/VectorTileLoader.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java index 3b314c16..3f90aec5 100644 --- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java +++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java @@ -18,6 +18,7 @@ import org.oscim.backend.Log; import org.oscim.core.GeometryBuffer.GeometryType; import org.oscim.core.MapElement; import org.oscim.core.MercatorProjection; +import org.oscim.core.PointF; import org.oscim.core.Tag; import org.oscim.core.TagSet; import org.oscim.core.Tile; @@ -405,10 +406,8 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac if (value == null) return; - float x = mElement.points[0]; - float y = mElement.points[1]; - - mTile.addLabel(TextItem.pool.get().set(x, y, value, text)); + PointF p = mElement.getPoint(0); + mTile.addLabel(TextItem.pool.get().set(p.x, p.y, value, text)); } @Override @@ -417,10 +416,9 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac if (value == null) return; - for (int i = 0, n = mElement.index[0]; i < n; i += 2) { - float x = mElement.points[i]; - float y = mElement.points[i + 1]; - mTile.addLabel(TextItem.pool.get().set(x, y, value, text)); + for (int i = 0, n = mElement.getNumPoints(); i < n; i++) { + PointF p = mElement.getPoint(i); + mTile.addLabel(TextItem.pool.get().set(p.x, p.y, value, text)); } }