Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 31572) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 31573) @@ -457,23 +457,4 @@ Point p = tileSource.latLonToXY(lat, lon, zoom); int y = p.y - center.y - getHeight() / 2; - if (checkOutside && (y < 0 || y > getHeight())) { - return null; - } - return y; - } - - /** - * Calculates the position on the map of a given coordinate - * - * @param lat Latitude - * @param offset Offset respect Latitude - * @param checkOutside check if the point is outside the displayed area - * @return Integer the radius in pixels - * @deprecated use {@link #getLatOffset(double, double, double, boolean)} - */ - @Deprecated - public Integer getLatOffset(double lat, double offset, boolean checkOutside) { - int y = tileSource.latToY(lat + offset, zoom); - y -= center.y - getHeight() / 2; if (checkOutside && (y < 0 || y > getHeight())) { return null; Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java (revision 31572) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java (revision 31573) @@ -18,32 +18,4 @@ /** - * Specifies the different mechanisms for detecting updated tiles - * respectively only download newer tiles than those stored locally. - * - * - * - * @deprecated not used anymore - */ - @Deprecated - enum TileUpdate { - IfNoneMatch, ETag, IfModifiedSince, LastModified, None - } - - /** * Specifies the maximum zoom value. The number of zoom levels is [0.. * {@link #getMaxZoom()}]. @@ -62,10 +34,4 @@ */ int getMinZoom(); - - /** - * @return The supported tile update mechanism - * @see TileUpdate - */ - TileUpdate getTileUpdate(); /** @@ -131,24 +97,4 @@ /** - * Transform longitude to pixelspace. - * @param aLongitude longitude - * @param aZoomlevel zoom level - * @return [0..2^Zoomlevel*TILE_SIZE[ - * @deprecated use {@link #latLonToXY(double, double, int)} instead - */ - @Deprecated - int lonToX(double aLongitude, int aZoomlevel); - - /** - * Transforms latitude to pixelspace. - * @param aLat latitude - * @param aZoomlevel zoom level - * @return [0..2^Zoomlevel*TILE_SIZE[ - * @deprecated use {@link #latLonToXY(double, double, int)} instead - */ - @Deprecated - int latToY(double aLat, int aZoomlevel); - - /** * @param lon longitude * @param lat latitude @@ -166,24 +112,4 @@ /** - * Transforms pixel coordinate X to longitude - * @param aX X coordinate - * @param aZoomlevel zoom level - * @return ]-180..180[ - * @deprecated use {@link #xyToLatLon(int, int, int)} instead - */ - @Deprecated - double XToLon(int aX, int aZoomlevel); - - /** - * Transforms pixel coordinate Y to latitude. - * @param aY Y coordinate - * @param aZoomlevel zoom level - * @return [MIN_LAT..MAX_LAT] - * @deprecated use {@link #xyToLatLon(int, int, int)} instead - */ - @Deprecated - double YToLat(int aY, int aZoomlevel); - - /** * @param point point * @param zoom zoom level @@ -202,24 +128,4 @@ /** - * Transforms longitude to X tile coordinate. - * @param lon longitude - * @param zoom zoom level - * @return [0..2^Zoomlevel[ - * @deprecated use {@link #latLonToTileXY(double, double, int)} instead - */ - @Deprecated - double lonToTileX(double lon, int zoom); - - /** - * Transforms latitude to Y tile coordinate. - * @param lat latitude - * @param zoom zoom level - * @return [0..2^Zoomlevel[ - * @deprecated use {@link #latLonToTileXY(double, double, int)} instead - */ - @Deprecated - double latToTileY(double lat, int zoom); - - /** * @param lon longitude * @param lat latitude @@ -236,24 +142,4 @@ */ TileXY latLonToTileXY(ICoordinate point, int zoom); - - /** - * Transforms tile X coordinate to longitude. - * @param x X coordinate - * @param zoom zoom level - * @return ]-180..180[ - * @deprecated use {@link #tileXYToLatLon(int, int, int)} instead - */ - @Deprecated - double tileXToLon(int x, int zoom); - - /** - * Transforms tile Y coordinate to latitude. - * @param y Y coordinate - * @param zoom zoom level - * @return [MIN_LAT..MAX_LAT] - * @deprecated use {@link #tileXYToLatLon(int, int, int)} instead - */ - @Deprecated - double tileYToLat(int y, int zoom); /** Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java (revision 31572) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java (revision 31573) @@ -12,5 +12,5 @@ // MapQuest logo in base64: http://developer.mapquest.com/content/osm/mq_logo.png - private static final String LOGO_BASE64 = + private static final String LOGO_BASE64 = "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJl"+ "YWR5ccllPAAAAZtJREFUeNpi/P//P0PPcYf/DGSAEssDjIzdx+zJ0gwDLMQqVBWyZVAStGRgBMK33x8wnH62"+ @@ -28,5 +28,5 @@ private static final int NUMBER_OF_SERVERS = 4; - + private int SERVER_NUM = 1; @@ -40,9 +40,4 @@ SERVER_NUM = (SERVER_NUM % NUMBER_OF_SERVERS) + 1; return url; - } - - @Override - public TileUpdate getTileUpdate() { - return TileUpdate.IfModifiedSince; } Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java (revision 31572) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java (revision 31573) @@ -129,14 +129,4 @@ @Override - public int lonToX(double lon, int zoom) { - return (int) osmMercator.lonToX(lon, zoom); - } - - @Override - public int latToY(double lat, int zoom) { - return (int) osmMercator.latToY(lat, zoom); - } - - @Override public Point latLonToXY(double lat, double lon, int zoom) { return new Point( @@ -152,14 +142,4 @@ @Override - public double XToLon(int x, int zoom) { - return osmMercator.xToLon(x, zoom); - } - - @Override - public double YToLat(int y, int zoom) { - return osmMercator.yToLat(y, zoom); - } - - @Override public ICoordinate xyToLatLon(Point point, int zoom) { return xyToLatLon(point.x, point.y, zoom); @@ -175,14 +155,4 @@ @Override - public double latToTileY(double lat, int zoom) { - return osmMercator.latToY(lat, zoom) / tileSize; - } - - @Override - public double lonToTileX(double lon, int zoom) { - return osmMercator.lonToX(lon, zoom) / tileSize; - } - - @Override public TileXY latLonToTileXY(double lat, double lon, int zoom) { return new TileXY( @@ -195,14 +165,4 @@ public TileXY latLonToTileXY(ICoordinate point, int zoom) { return latLonToTileXY(point.getLat(), point.getLon(), zoom); - } - - @Override - public double tileYToLat(int y, int zoom) { - return osmMercator.yToLat(y * tileSize, zoom); - } - - @Override - public double tileXToLon(int x, int zoom) { - return osmMercator.xToLon(x * tileSize, zoom); } Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (revision 31572) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (revision 31573) @@ -173,9 +173,4 @@ @Override - public TileUpdate getTileUpdate() { - return TileUpdate.IfNoneMatch; - } - - @Override public boolean requiresAttribution() { return true; Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java (revision 31572) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java (revision 31573) @@ -31,9 +31,4 @@ return url; } - - @Override - public TileUpdate getTileUpdate() { - return TileUpdate.IfNoneMatch; - } } @@ -67,9 +62,4 @@ return 18; } - - @Override - public TileUpdate getTileUpdate() { - return TileUpdate.LastModified; - } } } Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java (revision 31572) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java (revision 31573) @@ -93,27 +93,4 @@ } - @Override - public int latToY(double lat, int zoom) { - return (int) (latToTileY(lat, zoom) * tileSize); - } - - @Override - public double YToLat(int y, int zoom) { - return tileYToLat((double) y / tileSize, zoom); - } - - @Override - public double latToTileY(double lat, int zoom) { - double tmp = Math.tan(Math.PI/4 * (1 + lat/90)); - double pow = Math.pow(Math.tan(Math.PI/4 + Math.asin(E * Math.sin(Math.toRadians(lat)))/2), E); - - return (EQUATOR/2 - (RADIUS_E * Math.log(tmp/pow))) * Math.pow(2.0, zoom) / EQUATOR; - } - - @Override - public double tileYToLat(int y, int zoom) { - return tileYToLat((double) y, zoom); - } - /* * To solve inverse formula latitude = f(y) we use Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java (revision 31572) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java (revision 31573) @@ -23,8 +23,3 @@ return (maxZoom == 0) ? super.getMaxZoom() : maxZoom; } - - @Override - public TileUpdate getTileUpdate() { - return TileUpdate.IfNoneMatch; - } }