From 79aafb1b6d0dab116299ce843c6242b9b261d486 Mon Sep 17 00:00:00 2001
From: "taylor.smock" <taylor.smock@0c6e7542-c601-0410-84e7-c038aed88b3b>
Date: Thu, 14 Dec 2023 00:09:48 +0000
Subject: [PATCH] Fix #23113: Use default methods from JMapViewer

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18911 0c6e7542-c601-0410-84e7-c038aed88b3b
---
 .../data/imagery/AbstractWMSTileSource.java   | 26 -------------------
 .../josm/data/imagery/WMTSTileSource.java     | 25 ------------------
 2 files changed, 51 deletions(-)

diff --git a/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java b/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
index 985139d5288..c0ee96ab486 100644
--- a/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
@@ -8,7 +8,6 @@
 import java.util.Locale;
 
 import org.openstreetmap.gui.jmapviewer.Projected;
-import org.openstreetmap.gui.jmapviewer.Tile;
 import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
@@ -103,16 +102,6 @@ public void initProjection(Projection proj) {
         }
     }
 
-    @Override
-    public ICoordinate tileXYToLatLon(Tile tile) {
-        return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom());
-    }
-
-    @Override
-    public ICoordinate tileXYToLatLon(TileXY xy, int zoom) {
-        return tileXYToLatLon(xy.getXIndex(), xy.getYIndex(), zoom);
-    }
-
     @Override
     public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
         return CoordinateConversion.llToCoor(tileProjection.eastNorth2latlon(getTileEastNorth(x, y, zoom)));
@@ -132,11 +121,6 @@ public TileXY latLonToTileXY(double lat, double lon, int zoom) {
         return eastNorthToTileXY(enPoint, zoom);
     }
 
-    @Override
-    public TileXY latLonToTileXY(ICoordinate point, int zoom) {
-        return latLonToTileXY(point.getLat(), point.getLon(), zoom);
-    }
-
     @Override
     public int getTileXMax(int zoom) {
         return tileXMax[zoom];
@@ -167,16 +151,6 @@ public Point latLonToXY(double lat, double lon, int zoom) {
                 );
     }
 
-    @Override
-    public Point latLonToXY(ICoordinate point, int zoom) {
-        return latLonToXY(point.getLat(), point.getLon(), zoom);
-    }
-
-    @Override
-    public ICoordinate xyToLatLon(Point point, int zoom) {
-        return xyToLatLon(point.x, point.y, zoom);
-    }
-
     @Override
     public ICoordinate xyToLatLon(int x, int y, int zoom) {
         double scale = getDegreesPerTile(zoom) / getTileSize();
diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
index 29a895ca966..b3fc7f2e0ee 100644
--- a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
@@ -929,16 +929,6 @@ public double getDistance(double lat1, double lon1, double lat2, double lon2) {
         throw new UnsupportedOperationException("Not implemented");
     }
 
-    @Override
-    public ICoordinate tileXYToLatLon(Tile tile) {
-        return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom());
-    }
-
-    @Override
-    public ICoordinate tileXYToLatLon(TileXY xy, int zoom) {
-        return tileXYToLatLon(xy.getXIndex(), xy.getYIndex(), zoom);
-    }
-
     @Override
     public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
         TileMatrix matrix = getTileMatrix(zoom);
@@ -965,11 +955,6 @@ public TileXY latLonToTileXY(double lat, double lon, int zoom) {
                 );
     }
 
-    @Override
-    public TileXY latLonToTileXY(ICoordinate point, int zoom) {
-        return latLonToTileXY(point.getLat(), point.getLon(), zoom);
-    }
-
     @Override
     public int getTileXMax(int zoom) {
         return getTileXMax(zoom, tileProjection);
@@ -994,16 +979,6 @@ public Point latLonToXY(double lat, double lon, int zoom) {
                 );
     }
 
-    @Override
-    public Point latLonToXY(ICoordinate point, int zoom) {
-        return latLonToXY(point.getLat(), point.getLon(), zoom);
-    }
-
-    @Override
-    public Coordinate xyToLatLon(Point point, int zoom) {
-        return xyToLatLon(point.x, point.y, zoom);
-    }
-
     @Override
     public Coordinate xyToLatLon(int x, int y, int zoom) {
         TileMatrix matrix = getTileMatrix(zoom);