Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileXY.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileXY.java	(revision 31310)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileXY.java	(revision 31339)
@@ -38,5 +38,5 @@
      */
     public int getYIndex() {
-        return y < 0 ? (int) Math.ceil(x) : (int) Math.floor(y);
+        return y < 0 ? (int) Math.ceil(y) : (int) Math.floor(y);
     }
 
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java	(revision 31310)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java	(revision 31339)
@@ -161,10 +161,10 @@
 
     @Override
-    public Coordinate XYToLatLon(Point point, int zoom) {
+    public ICoordinate XYToLatLon(Point point, int zoom) {
         return XYToLatLon(point.x, point.y, zoom);
     }
 
     @Override
-    public Coordinate XYToLatLon(int x, int y, int zoom) {
+    public ICoordinate XYToLatLon(int x, int y, int zoom) {
         return new Coordinate(
                 osmMercator.YToLat(y, zoom),
@@ -207,15 +207,15 @@
 
     @Override
-    public Coordinate tileXYToLatLon(TileXY xy, int zoom) {
+    public ICoordinate tileXYToLatLon(TileXY xy, int zoom) {
         return tileXYToLatLon(xy.getXIndex(), xy.getYIndex(), zoom);
     }
 
     @Override
-    public Coordinate tileXYToLatLon(Tile tile) {
+    public ICoordinate tileXYToLatLon(Tile tile) {
         return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom());
     }
 
     @Override
-    public Coordinate tileXYToLatLon(int x, int y, int zoom) {
+    public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
         return new Coordinate(
                 osmMercator.YToLat(y * tileSize, zoom),