formatting

This commit is contained in:
Hannes Janetzek
2013-02-04 20:14:58 +01:00
parent 303e0cb4ce
commit f2b7a9fdf8
72 changed files with 403 additions and 240 deletions

View File

@@ -2,7 +2,7 @@
* Copyright 2010, 2011, 2012 mapsforge.org
* Copyright 2012 osmdroid authors: Nicolas Gramlich, Theodore Hong
* Copyright 2012 Hannes Janetzek
*
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.

View File

@@ -70,12 +70,14 @@ public class MapPosition {
// (float) (MercatorProjection.latitudeToPixelY(in.getLatitude(), zoomLevel) - y);
// }
/** @param geoPoint
/**
* @param geoPoint
* the map position.
* @param zoomLevel
* the zoom level.
* @param scale
* ... */
* ...
*/
public MapPosition(GeoPoint geoPoint, byte zoomLevel, float scale) {
this.zoomLevel = zoomLevel;
this.scale = scale;

View File

@@ -49,6 +49,7 @@ public final class MercatorProjection {
/**
* Calculates the distance on the ground that is represented by a single
* pixel on the map.
*
* @param latitude
* the latitude coordinate at which the resolution should be
* calculated.
@@ -64,6 +65,7 @@ public final class MercatorProjection {
/**
* Converts a latitude coordinate (in degrees) to a pixel Y coordinate at a
* certain zoom level.
*
* @param latitude
* the latitude coordinate that should be converted.
* @param zoomLevel
@@ -84,6 +86,7 @@ public final class MercatorProjection {
/**
* Projects a longitude coordinate (in degrees) to the range [0.0,1.0]
*
* @param latitude
* the latitude coordinate that should be converted.
* @return the position .
@@ -96,6 +99,7 @@ public final class MercatorProjection {
/**
* Converts a latitude coordinate (in degrees) to a tile Y number at a
* certain zoom level.
*
* @param latitude
* the latitude coordinate that should be converted.
* @param zoomLevel
@@ -138,6 +142,7 @@ public final class MercatorProjection {
/**
* Converts a longitude coordinate (in degrees) to a pixel X coordinate at a
* certain zoom level.
*
* @param longitude
* the longitude coordinate that should be converted.
* @param zoomLevel
@@ -155,6 +160,7 @@ public final class MercatorProjection {
/**
* Projects a longitude coordinate (in degrees) to the range [0.0,1.0]
*
* @param longitude
* the longitude coordinate that should be converted.
* @return the position .
@@ -166,6 +172,7 @@ public final class MercatorProjection {
/**
* Converts a longitude coordinate (in degrees) to the tile X number at a
* certain zoom level.
*
* @param longitude
* the longitude coordinate that should be converted.
* @param zoomLevel
@@ -179,6 +186,7 @@ public final class MercatorProjection {
/**
* Converts a pixel X coordinate at a certain zoom level to a longitude
* coordinate.
*
* @param pixelX
* the pixel X coordinate that should be converted.
* @param zoomLevel
@@ -191,6 +199,7 @@ public final class MercatorProjection {
/**
* Converts a pixel X coordinate to the tile X number.
*
* @param pixelX
* the pixel X coordinate that should be converted.
* @param zoomLevel
@@ -205,6 +214,7 @@ public final class MercatorProjection {
/**
* Converts a pixel Y coordinate at a certain zoom level to a latitude
* coordinate.
*
* @param pixelY
* the pixel Y coordinate that should be converted.
* @param zoomLevel
@@ -218,6 +228,7 @@ public final class MercatorProjection {
/**
* Converts a pixel Y coordinate to the tile Y number.
*
* @param pixelY
* the pixel Y coordinate that should be converted.
* @param zoomLevel
@@ -232,6 +243,7 @@ public final class MercatorProjection {
/**
* Converts a tile X number at a certain zoom level to a longitude
* coordinate.
*
* @param tileX
* the tile X number that should be converted.
* @param zoomLevel
@@ -245,6 +257,7 @@ public final class MercatorProjection {
/**
* Converts a tile Y number at a certain zoom level to a latitude
* coordinate.
*
* @param tileY
* the tile Y number that should be converted.
* @param zoomLevel

View File

@@ -16,11 +16,11 @@
package org.oscim.core;
/**
*
*
*/
public class WebMercator {
/**
*
*
*/
public static final String NAME = "SphericalMercator";
@@ -85,7 +85,7 @@ public class WebMercator {
/**
* from http://pauldendulk.com/2011/04/projecting-from-wgs84-to.html
*
*
* @param lon
* ...
* @param lat
@@ -106,7 +106,7 @@ public class WebMercator {
/**
* from http://pauldendulk.com/2011/04/projecting-from-wgs84-to.html
*
*
* @param x
* ...
* @param y