Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix small shifts (use double)

Browse source
This commit is contained in:
vshcherb 2013-11-26 17:11:29 +01:00
parent cc152f16c8
commit 9798a3b55c
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/net/osmand/RenderingContext.java
View file

@ -28,13 +28,13 @@ public class RenderingContext {
}
public float leftX;
public float topY;
public double leftX;
public double topY;
public int width;
public int height;
public int zoom;
public float tileDivisor;
public double tileDivisor;
public float rotate;
// debug purpose

6
OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
View file

@ -586,11 +586,11 @@ public class MapRenderRepositories {
final QuadPointDouble lt = requestedBox.getLeftTopTile(requestedBox.getZoom());
// LatLon ltn = requestedBox.getLeftTopLatLon();
final float mapDensity = (float) Math.pow(2, requestedBox.getZoomScale());
final float tileDivisor = (float) MapUtils.getPowZoom(31 - requestedBox.getZoom() -
final double tileDivisor = MapUtils.getPowZoom(31 - requestedBox.getZoom() -
requestedBox.getZoomScale());
currentRenderingContext.leftX = (float) (lt.x * MapUtils.getPowZoom(requestedBox.getZoomScale()));
currentRenderingContext.leftX = lt.x * MapUtils.getPowZoom(requestedBox.getZoomScale());
// MapUtils.get31TileNumberX(ltn.getLongitude()) / tileDivisor;
currentRenderingContext.topY = (float) (lt.y * MapUtils.getPowZoom(requestedBox.getZoomScale()));
currentRenderingContext.topY = lt.y * MapUtils.getPowZoom(requestedBox.getZoomScale());
//MapUtils.get31TileNumberY(ltn.getLatitude()) / tileDivisor;
currentRenderingContext.zoom = requestedBox.getZoom();
currentRenderingContext.rotate = requestedBox.getRotate();

8
OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java
View file

@ -415,10 +415,10 @@ public class OsmandRenderer {
private PointF calcPoint(int xt, int yt, RenderingContext rc){
rc.pointCount ++;
float tx = xt / rc.tileDivisor;
float ty = yt / rc.tileDivisor;
float dTileX = tx - rc.leftX;
float dTileY = ty - rc.topY;
double tx = xt / rc.tileDivisor;
double ty = yt / rc.tileDivisor;
float dTileX = (float) (tx - rc.leftX);
float dTileY = (float) (ty - rc.topY);
float x = rc.cosRotateTileSize * dTileX - rc.sinRotateTileSize * dTileY;
float y = rc.sinRotateTileSize * dTileX + rc.cosRotateTileSize * dTileY;
rc.tempPoint.set(x, y);