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

cleanups

Browse Source
This commit is contained in:
Hannes Janetzek 2013-03-09 12:23:01 +01:00
parent 654e666c81
commit d322f9ac03
2 changed files with 0 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/org/oscim/generator/TileGenerator.java
View File

@ -548,80 +548,4 @@ public class TileGenerator implements IRenderCallback, IMapDatabaseCallback {
// } // }
//} else { //} else {
// private String mMapProjection;
// private static final double PI180 = (Math.PI / 180) / 1000000.0;
// private static final double PIx4 = Math.PI * 4;
// private boolean mProjected;
// private float mSimplify;
//
// private boolean projectToTile() {
// if (mProjected || mMapProjection == null)
// return true;
//
// boolean useWebMercator = false;
//
// if (mMapProjection == WebMercator.NAME)
// useWebMercator = true;
//
// float[] coords = mCoords;
//
// long x = mTile.pixelX;
// long y = mTile.pixelY + Tile.TILE_SIZE;
// long z = Tile.TILE_SIZE << mTile.zoomLevel;
// float min = mSimplify;
//
// double divx, divy = 0;
// long dx = (x - (z >> 1));
// long dy = (y - (z >> 1));
//
// if (useWebMercator) {
// divx = WebMercator.f900913 / (z >> 1);
// } else {
// divx = 180000000.0 / (z >> 1);
// divy = z / PIx4;
// }
//
// for (int pos = 0, outPos = 0, i = 0, m = mIndices.length; i < m; i++) {
// int len = mIndices[i];
// if (len == 0)
// continue;
// if (len < 0)
// break;
//
// int cnt = 0;
// float lat, lon, prevLon = 0, prevLat = 0;
//
// for (int end = pos + len; pos < end; pos += 2) {
//
// if (useWebMercator) {
// lon = (float) (coords[pos] / divx - dx);
// lat = (float) (coords[pos + 1] / divx + dy);
// } else {
// lon = (float) ((coords[pos]) / divx - dx);
// double sinLat = Math.sin(coords[pos + 1] * PI180);
// lat = (float) (Math.log((1.0 + sinLat) / (1.0 - sinLat)) * divy + dy);
// }
//
// if (cnt != 0) {
// // drop small distance intermediate nodes
// if (lat == prevLat && lon == prevLon)
// continue;
//
// if ((pos != end - 2) &&
// !((lat > prevLat + min || lat < prevLat - min) ||
// (lon > prevLon + min || lon < prevLon - min)))
// continue;
// }
// coords[outPos++] = prevLon = lon;
// coords[outPos++] = prevLat = lat;
//
// cnt += 2;
// }
//
// mIndices[i] = (short) cnt;
// }
// mProjected = true;
// // mProjectedResult = true;
// return true;
// }
} }

5
src/org/oscim/overlay/OverlayItem.java
View File

@ -176,9 +176,4 @@ public class OverlayItem {
public int getHeight() { public int getHeight() {
return this.mMarker.getIntrinsicHeight(); return this.mMarker.getIntrinsicHeight();
} }
// ===========================================================
// Inner and Anonymous Classes
// ===========================================================
} }