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

rename Tile.TILE_SIZE to Tile.SIZE, while I'm at refactoring

Browse Source
This commit is contained in:
Hannes Janetzek
2013-04-07 15:59:57 +02:00
parent 8e01dce85e
commit 491e41becc
27 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/oscim/core/MercatorProjection.java
View File

@@ -57,7 +57,7 @@ public final class MercatorProjection {
*/
public static double calculateGroundResolution(double latitude, int zoomLevel) {
return Math.cos(latitude * (Math.PI / 180)) * EARTH_CIRCUMFERENCE
/ ((long) Tile.TILE_SIZE << zoomLevel);
/ ((long) Tile.SIZE << zoomLevel);
}
/**
@@ -130,7 +130,7 @@ public final class MercatorProjection {
* @return the longitude value of the pixel X coordinate.
*/
public static double pixelXToLongitude(double pixelX, int zoomLevel) {
return 360 * ((pixelX / ((long) Tile.TILE_SIZE << zoomLevel)) - 0.5);
return 360 * ((pixelX / ((long) Tile.SIZE << zoomLevel)) - 0.5);
}
/**
@@ -144,7 +144,7 @@ public final class MercatorProjection {
* @return the pixel X coordinate of the longitude value.
*/
public static double longitudeToPixelX(double longitude, int zoomLevel) {
return (longitude + 180) / 360 * ((long) Tile.TILE_SIZE << zoomLevel);
return (longitude + 180) / 360 * ((long) Tile.SIZE << zoomLevel);
}
/**
@@ -158,7 +158,7 @@ public final class MercatorProjection {
* @return the latitude value of the pixel Y coordinate.
*/
public static double pixelYToLatitude(double pixelY, int zoomLevel) {
double y = 0.5 - (pixelY / ((long) Tile.TILE_SIZE << zoomLevel));
double y = 0.5 - (pixelY / ((long) Tile.SIZE << zoomLevel));
return 90 - 360 * Math.atan(Math.exp(-y * (2 * Math.PI))) / Math.PI;
}
@@ -175,7 +175,7 @@ public final class MercatorProjection {
public static double latitudeToPixelY(double latitude, int zoomLevel) {
double sinLatitude = Math.sin(latitude * (Math.PI / 180));
return (0.5 - Math.log((1 + sinLatitude) / (1 - sinLatitude)) / (4 * Math.PI))
* ((long) Tile.TILE_SIZE << zoomLevel);
* ((long) Tile.SIZE << zoomLevel);
}
private MercatorProjection() {

2
src/org/oscim/core/Tile.java
View File

@@ -24,7 +24,7 @@ public class Tile {
/**
* Width and height of a map tile in pixel.
*/
public static int TILE_SIZE = 256;
public static int SIZE = 256;
/**
* The X number of this tile.

4
src/org/oscim/core/WebMercator.java
View File

@@ -63,7 +63,7 @@ public class WebMercator {
* @return ...
*/
public static double PixelYtoSphericalMercator(long pixelY, byte z) {
long half = (Tile.TILE_SIZE << z) >> 1;
long half = (Tile.SIZE << z) >> 1;
return ((half - pixelY) / (double) half) * f900913;
}
@@ -75,7 +75,7 @@ public class WebMercator {
* @return ...
*/
public static double PixelXtoSphericalMercator(long pixelX, byte z) {
long half = (Tile.TILE_SIZE << z) >> 1;
long half = (Tile.SIZE << z) >> 1;
return ((pixelX - half) / (double) half) * f900913;
}