Changeset 31573 in osm for applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java

Timestamp:

2015-09-21T02:20:19+02:00 (9 years ago)

Author:

donvip

Message:

remove deprecated code

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java (modified) (4 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java

@@ -129 +129 @@
 
     @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 +142 @@
 
     @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 +155 @@
 
     @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 +165 @@
     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);
     }