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

use double for pre-projected points

Browse Source
This commit is contained in:
Hannes Janetzek 2013-05-30 10:07:49 +02:00
parent 5ab4ce50af
commit 09fd019734
1 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/org/oscim/layers/overlay/PathOverlay.java
View File

@ -22,7 +22,6 @@ import java.util.List;
import org.oscim.core.GeoPoint; import org.oscim.core.GeoPoint;
import org.oscim.core.MapPosition; import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection; import org.oscim.core.MercatorProjection;
import org.oscim.core.PointD;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.graphics.Paint.Cap; import org.oscim.graphics.Paint.Cap;
import org.oscim.layers.Layer; import org.oscim.layers.Layer;
@ -46,13 +45,10 @@ public class PathOverlay extends Layer {
class RenderPath extends BasicRenderLayer { class RenderPath extends BasicRenderLayer {
private static final byte MAX_ZOOM = 20; private static final int MIN_DIST = 4;
private final double MAX_SCALE;
private static final int MIN_DIST = 2;
// pre-projected points to zoomlovel 20 // pre-projected points
private int[] mPreprojected; private double[] mPreprojected;
private final PointD mMapPoint;
// projected points // projected points
private float[] mPPoints; private float[] mPPoints;
@ -66,12 +62,12 @@ public class PathOverlay extends Layer {
super(mapView); super(mapView);
mClipper = new LineClipper(-max, -max, max, max, true); mClipper = new LineClipper(-max, -max, max, max, true);
mPPoints = new float[1]; mPPoints = new float[1];
mMapPoint = new PointD(); layers.addLineLayer(0, mLineStyle);
MAX_SCALE = (1 << MAX_ZOOM) * Tile.SIZE;
} }
private final int mCurX = -1;
private final int mCurY = -1; private int mCurX = -1;
private final int mCurZ = -1; private int mCurY = -1;
private int mCurZ = -1;
// note: this is called from GL-Thread. so check your syncs! // note: this is called from GL-Thread. so check your syncs!
// TODO use an Overlay-Thread to build up layers (like for Labeling) // TODO use an Overlay-Thread to build up layers (like for Labeling)
@ -82,37 +78,36 @@ public class PathOverlay extends Layer {
int ty = (int) (pos.y * tz); int ty = (int) (pos.y * tz);
// update layers when map moved by at least one tile // update layers when map moved by at least one tile
boolean tilesChanged = (tx != mCurX || ty != mCurY || tz != mCurZ); boolean tilesChanged = (tx != mCurX || ty != mCurY || tz != mCurZ);
if (!tilesChanged && !mUpdatePoints) if (!tilesChanged && !mUpdatePoints)
return; return;
float[] projected = mPPoints; mCurX = tx;
mCurY = ty;
mCurZ = tz;
if (mUpdatePoints) { if (mUpdatePoints) {
// pre-project point on zoomlelvel 20
synchronized (mPoints) { synchronized (mPoints) {
mUpdatePoints = false; mUpdatePoints = false;
ArrayList<GeoPoint> geopoints = mPoints; ArrayList<GeoPoint> geopoints = mPoints;
int size = geopoints.size(); int size = geopoints.size();
int[] points = mPreprojected; double[] points = mPreprojected;
mSize = size * 2; mSize = size * 2;
if (mSize > projected.length) { if (mSize > points.length) {
points = mPreprojected = new int[mSize]; points = mPreprojected = new double[mSize];
projected = mPPoints = new float[mSize]; mPPoints = new float[mSize];
} }
for (int i = 0, j = 0; i < size; i++, j += 2) { for (int i = 0; i < size; i++)
GeoPoint p = geopoints.get(i); MercatorProjection.project(geopoints.get(i), points, i);
MercatorProjection.project(p, mMapPoint);
points[j + 0] = (int) (mMapPoint.x * MAX_SCALE);
points[j + 1] = (int) (mMapPoint.y * MAX_SCALE);
}
} }
} }
int size = mSize; int size = mSize;
if (size == 0) { if (size == 0) {
if (layers.baseLayers != null) { if (layers.baseLayers != null) {
@ -123,26 +118,24 @@ public class PathOverlay extends Layer {
} }
LineLayer ll = layers.getLineLayer(0); LineLayer ll = layers.getLineLayer(0);
ll.clear();
ll.line = mLineStyle; ll.line = mLineStyle;
ll.width = ll.line.width; ll.width = ll.line.width;
// Hack: reset verticesCnt to reuse layer
ll.verticesCnt = 0;
int z = pos.zoomLevel; int z = pos.zoomLevel;
float div = FastMath.pow(z - MAX_ZOOM);
int mx = (int) (pos.x * (Tile.SIZE << z)); double mx = pos.x;
int my = (int) (pos.y * (Tile.SIZE << z)); double my = pos.y;
double scale = Tile.SIZE * (1 << z);
int j = 0;
// flip around dateline. complicated stuff.. // flip around dateline. complicated stuff..
int flip = 0; int flip = 0;
int flipMax = Tile.SIZE << (z - 1); int flipMax = Tile.SIZE << (z - 1);
int x = (int)(mPreprojected[j++] * div) - mx; int x = (int) ((mPreprojected[0] - mx) * scale);
int y = (int)(mPreprojected[j++] * div) - my; int y = (int) ((mPreprojected[1] - my) * scale);
if (x > flipMax) { if (x > flipMax) {
x -= (flipMax * 2); x -= (flipMax * 2);
@ -154,14 +147,15 @@ public class PathOverlay extends Layer {
mClipper.clipStart(x, y); mClipper.clipStart(x, y);
float[] projected = mPPoints;
int i = addPoint(projected, 0, x, y); int i = addPoint(projected, 0, x, y);
int prevX = x; int prevX = x;
int prevY = y; int prevY = y;
for (; j < size; j += 2) { for (int j = 2; j < size; j += 2) {
x = (int)(mPreprojected[j + 0] * div) - mx; x = (int) ((mPreprojected[j + 0] - mx) * scale);
y = (int)(mPreprojected[j + 1] * div) - my; y = (int) ((mPreprojected[j + 1] - my) * scale);
int curFlip = 0; int curFlip = 0;
if (x > flipMax) { if (x > flipMax) {