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

PathLayer: submit update task directly

Browse Source 
- revert update listener
This commit is contained in:
Hannes Janetzek 2014-04-03 22:42:31 +02:00
parent d26bd52689
commit 2833d0f5c2
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vtm/src/org/oscim/layers/PathLayer.java
View File

@ -27,7 +27,6 @@ import org.oscim.core.GeometryBuffer;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection; import org.oscim.core.MercatorProjection;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.event.Event;
import org.oscim.map.Map; import org.oscim.map.Map;
import org.oscim.renderer.ElementRenderer; import org.oscim.renderer.ElementRenderer;
import org.oscim.renderer.GLViewport; import org.oscim.renderer.GLViewport;
@ -39,7 +38,7 @@ import org.oscim.utils.async.SimpleWorker;
import org.oscim.utils.geom.LineClipper; import org.oscim.utils.geom.LineClipper;
/** This class draws a path line in given color. */ /** This class draws a path line in given color. */
public class PathLayer extends Layer implements Map.UpdateListener { public class PathLayer extends Layer {
/** Stores points, converted to the map projection. */ /** Stores points, converted to the map projection. */
protected final ArrayList<GeoPoint> mPoints; protected final ArrayList<GeoPoint> mPoints;
@ -68,30 +67,35 @@ public class PathLayer extends Layer implements Map.UpdateListener {
synchronized (mPoints) { synchronized (mPoints) {
mPoints.clear(); mPoints.clear();
mUpdatePoints = true;
} }
updatePoints();
} }
public void setPoints(List<GeoPoint> pts) { public void setPoints(List<GeoPoint> pts) {
synchronized (mPoints) { synchronized (mPoints) {
mPoints.clear(); mPoints.clear();
mPoints.addAll(pts); mPoints.addAll(pts);
mUpdatePoints = true;
} }
updatePoints();
} }
public void addPoint(GeoPoint pt) { public void addPoint(GeoPoint pt) {
synchronized (mPoints) { synchronized (mPoints) {
mPoints.add(pt); mPoints.add(pt);
mUpdatePoints = true;
} }
updatePoints();
} }
public void addPoint(int latitudeE6, int longitudeE6) { public void addPoint(int latitudeE6, int longitudeE6) {
synchronized (mPoints) { synchronized (mPoints) {
mPoints.add(new GeoPoint(latitudeE6, longitudeE6)); mPoints.add(new GeoPoint(latitudeE6, longitudeE6));
mUpdatePoints = true;
} }
updatePoints();
}
private void updatePoints() {
mWorker.submit(10);
mUpdatePoints = true;
} }
public List<GeoPoint> getPoints() { public List<GeoPoint> getPoints() {
@ -201,8 +205,8 @@ public class PathLayer extends Layer implements Map.UpdateListener {
int ty = (int) (v.pos.y * tz); int ty = (int) (v.pos.y * tz);
// update layers when map moved by at least one tile // update layers when map moved by at least one tile
if ((tx != mCurX || ty != mCurY || tz != mCurZ) || mUpdatePoints) { if ((tx != mCurX || ty != mCurY || tz != mCurZ)) {
mWorker.submit(mUpdatePoints ? 0 : 100); mWorker.submit(100);
mCurX = tx; mCurX = tx;
mCurY = ty; mCurY = ty;
mCurZ = tz; mCurZ = tz;
@ -254,7 +258,6 @@ public class PathLayer extends Layer implements Map.UpdateListener {
if (mUpdatePoints) { if (mUpdatePoints) {
synchronized (mPoints) { synchronized (mPoints) {
mUpdatePoints = false; mUpdatePoints = false;
mNumPoints = size = mPoints.size(); mNumPoints = size = mPoints.size();
@ -269,6 +272,7 @@ public class PathLayer extends Layer implements Map.UpdateListener {
for (int i = 0; i < size; i++) for (int i = 0; i < size; i++)
MercatorProjection.project(geopoints.get(i), points, i); MercatorProjection.project(geopoints.get(i), points, i);
} }
} else if (mGeom != null) { } else if (mGeom != null) {
GeometryBuffer geom = mGeom; GeometryBuffer geom = mGeom;
mGeom = null; mGeom = null;
@ -399,10 +403,4 @@ public class PathLayer extends Layer implements Map.UpdateListener {
return i; return i;
} }
} }
@Override
public void onMapEvent(Event e, MapPosition mapPosition) {
if (mUpdatePoints)
mWorker.submit(0);
}
} }