Changeset 8772 in josm for trunk/src/org/openstreetmap

Timestamp:

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

Author:

Don-vip

Message:

remove deprecated code from jmapviewer, deprecate plugin imagerycache (feature now in core)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/TemplatedWMSTileSource.java (modified) (1 diff)
• data/imagery/WMTSTileSource.java (modified) (3 diffs)
• plugins/PluginHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -311 +311 @@
     }
 
-    @Override
-    public double lonToTileX(double lon, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double tileXToLon(int x, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double tileYToLat(int y, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double getDistance(double lat1, double lon1, double lat2, double lon2) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public int lonToX(double lon, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public int latToY(double lat, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double XToLon(int x, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double YToLat(int y, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double latToTileY(double lat, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
     /**
      * Checks if url is acceptable by this Tile Source

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -495 +495 @@
 
     @Override
-    public int lonToX(double lon, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public int latToY(double lat, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double XToLon(int x, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double YToLat(int y, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double latToTileY(double lat, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
     public ICoordinate tileXYToLatLon(Tile tile) {
         return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom());
@@ -622 +597 @@
 
     @Override
-    public double lonToTileX(double lon, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double tileXToLon(int x, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double tileYToLat(int y, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
     public Map<String, String> getHeaders() {
         return headers;
@@ -653 +613 @@
         return getTileUrl(zoom, tilex, tiley);
     }
-
 
     /**

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -128 +128 @@
             new DeprecatedPlugin("notes", IN_CORE),
             new DeprecatedPlugin("mirrored_download", IN_CORE),
+            new DeprecatedPlugin("imagerycache", IN_CORE),
         });
     }