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

mapsforge: also need to clip lines to avoid overflow

Browse Source
This commit is contained in:
Hannes Janetzek 2014-11-04 19:32:43 +01:00
parent 68fe1f8b8a
commit 4fdae2a94c
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
View File

@ -163,7 +163,7 @@ public class MapDatabase implements ITileDataSource {
mTileProjection = new TileProjection(); mTileProjection = new TileProjection();
mTileClipper = new TileClipper(-2, -2, Tile.SIZE + 2, Tile.SIZE + 2); mTileClipper = new TileClipper(0, 0, 0, 0);
} }
@Override @Override
@ -719,12 +719,12 @@ public class MapDatabase implements ITileDataSource {
long numCols = queryParameters.toBlockX - queryParameters.fromBlockX; long numCols = queryParameters.toBlockX - queryParameters.fromBlockX;
//log.debug(numCols + "/" + numRows + " " + mCurrentCol + " " + mCurrentRow); //log.debug(numCols + "/" + numRows + " " + mCurrentCol + " " + mCurrentRow);
if (numRows > 0) { int xmin = -16;
int xmin = -2; int ymin = -16;
int ymin = -2; int xmax = Tile.SIZE + 16;
int xmax = Tile.SIZE + 2; int ymax = Tile.SIZE + 16;
int ymax = Tile.SIZE + 2;
if (numRows > 0) {
int w = (int) (Tile.SIZE / (numCols + 1)); int w = (int) (Tile.SIZE / (numCols + 1));
int h = (int) (Tile.SIZE / (numRows + 1)); int h = (int) (Tile.SIZE / (numRows + 1));
@ -739,12 +739,8 @@ public class MapDatabase implements ITileDataSource {
if (mCurrentRow < numRows) if (mCurrentRow < numRows)
ymax = (int) (mCurrentRow * h + h); ymax = (int) (mCurrentRow * h + h);
//log.debug(xmin + " " + ymin + " " + xmax + " " + ymax);
mTileClipper.setRect(xmin, ymin, xmax, ymax);
} else {
mTileClipper.setRect(-2, -2, Tile.SIZE + 2, Tile.SIZE + 2);
} }
mTileClipper.setRect(xmin, ymin, xmax, ymax);
for (int elementCounter = numberOfWays; elementCounter != 0; --elementCounter) { for (int elementCounter = numberOfWays; elementCounter != 0; --elementCounter) {
if (mDebugFile) { if (mDebugFile) {
@ -892,11 +888,11 @@ public class MapDatabase implements ITileDataSource {
mTileProjection.project(e); mTileProjection.project(e);
if (e.isPoly()) { //if (e.isPoly()) {
if (!mTileClipper.clip(e)) { if (!mTileClipper.clip(e)) {
continue; continue;
} }
} //}
e.setLayer(layer); e.setLayer(layer);
mapDataSink.process(e); mapDataSink.process(e);
@ -976,7 +972,7 @@ public class MapDatabase implements ITileDataSource {
divx = (180.0 * COORD_SCALE) / (mapExtents >> 1); divx = (180.0 * COORD_SCALE) / (mapExtents >> 1);
/* scale latidute to map-pixel */ /* scale latidute to map-pixel */
divy = (mapExtents >> 1) / (Math.PI * 2.0); divy = (Math.PI * 2.0) / (mapExtents >> 1);
} }
public void projectPoint(int lat, int lon, MapElement out) { public void projectPoint(int lat, int lon, MapElement out) {
@ -989,7 +985,7 @@ public class MapDatabase implements ITileDataSource {
double s = Math.sin(lat * ((Math.PI / 180) / COORD_SCALE)); double s = Math.sin(lat * ((Math.PI / 180) / COORD_SCALE));
double r = Math.log((1.0 + s) / (1.0 - s)); double r = Math.log((1.0 + s) / (1.0 - s));
return Tile.SIZE - (float) (r * divy + dy); return Tile.SIZE - (float) (r / divy + dy);
} }
public float projectLon(double lon) { public float projectLon(double lon) {