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

added MapLensOverlay

Browse Source
This commit is contained in:
Hannes Janetzek
2013-04-06 17:44:57 +02:00
parent eac8047527
commit a6a729244f
5 changed files with 74 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/oscim/view/MapView.java
View File

@@ -38,14 +38,13 @@ import org.oscim.generator.JobTile;
import org.oscim.generator.MapWorker;
import org.oscim.generator.TileGenerator;
import org.oscim.overlay.BuildingOverlay;
import org.oscim.overlay.GenericOverlay;
import org.oscim.overlay.LabelingOverlay;
import org.oscim.overlay.MapLensOverlay;
import org.oscim.overlay.Overlay;
import org.oscim.overlay.OverlayManager;
import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.GLView;
import org.oscim.renderer.TileManager;
import org.oscim.renderer.overlays.TileOverlay;
import org.oscim.theme.ExternalRenderTheme;
import org.oscim.theme.InternalRenderTheme;
import org.oscim.theme.RenderTheme;
@@ -197,8 +196,8 @@ public class MapView extends RelativeLayout {
mOverlayManager.add(new LabelingOverlay(this));
mOverlayManager.add(new GenericOverlay(this, new TileOverlay(this)));
//mOverlayManager.add(new GenericOverlay(this, new TileOverlay(this)));
mOverlayManager.add(new MapLensOverlay(this));
//mOverlayManager.add(new GenericOverlay(this, new CustomOverlay(this)));

79
src/org/oscim/view/MapViewPosition.java
View File

@@ -157,6 +157,10 @@ public class MapViewPosition {
pos.angle = mRotation;
pos.tilt = mTilt;
pos.absX = mAbsX;
pos.absY = mAbsY;
pos.absScale = mAbsScale;
// for tiling
pos.scale = scale;
pos.zoomLevel = (byte) z;
@@ -312,28 +316,33 @@ public class MapViewPosition {
return bbox;
}
// /**
// * For x, y in screen coordinates set Point to map-tile
// * coordinates at returned scale.
// *
// * @param x screen coordinate
// * @param y screen coordinate
// * @param out Point coords will be set
// * @return current map scale
// */
// public synchronized float getScreenPointOnMap(float x, float y, PointD out) {
//
// // scale to -1..1
// float mx = 1 - (x / mWidth * 2);
// float my = 1 - (y / mHeight * 2);
//
// unproject(-mx, my, getZ(-my), mu, 0);
//
// out.x = mCurX + mu[0];
// out.y = mCurY + mu[1];
//
// return (float) mAbsScale;
// }
/**
* For x, y in screen coordinates set Point to map-tile
* coordinates at returned scale.
*
* @param x screen coordinate
* @param y screen coordinate
* @param out Point coords will be set
*/
public synchronized void getScreenPointOnMap(float x, float y, double scale, PointD out) {
// scale to -1..1
float mx = 1 - (x / mWidth * 2);
float my = 1 - (y / mHeight * 2);
unproject(-mx, my, getZ(-my), mu, 0);
//out.x = mCurX + mu[0];
//out.y = mCurY + mu[1];
out.x = mu[0];
out.y = mu[1];
if (scale != 0) {
out.x *= scale / mAbsScale;
out.y *= scale / mAbsScale;
}
}
/**
* Get the GeoPoint for x,y in screen coordinates.
@@ -729,23 +738,23 @@ public class MapViewPosition {
mHandler.start(mDuration);
}
synchronized boolean fling(float adv) {
synchronized boolean fling(float adv){
//float delta = (mDuration - millisLeft) / mDuration;
adv = (float) Math.sqrt(adv);
float dx = mVelocityX * adv;
float dy = mVelocityY * adv;
//float delta = (mDuration - millisLeft) / mDuration;
adv = (float)Math.sqrt(adv);
float dx = mVelocityX * adv;
float dy = mVelocityY * adv;
if (dx != 0 || dy != 0) {
moveMap((float) (dx - mScrollX), (float) (dy - mScrollY));
if (dx != 0 || dy != 0){
moveMap((float)(dx - mScrollX), (float)(dy - mScrollY));
mMapView.redrawMap(true);
mScrollX = dx;
mScrollY = dy;
mMapView.redrawMap(true);
mScrollX = dx;
mScrollY = dy;
}
return true;
}
return true;
}
private float mVelocityX;
private float mVelocityY;