Changeset 12669 in josm for trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java

Timestamp:

2017-08-27T00:17:49+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - remove dependence on JMapViewer for package data.coor (only useful for imagery)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.imagery.CoordinateConversion;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
@@ -95 +96 @@
         this.anchor = null;
         this.maxZoomReached = false;
+    }
+
+    private EastNorth tileToEastNorth(int x, int y, int z) {
+        return CoordinateConversion.projToEn(source.tileXYtoProjected(x, y, z));
     }
 
@@ -118 +123 @@
         Projection projCurrent = Main.getProjection();
         Projection projServer = Projections.getProjectionByCode(source.getServerCRS());
-        EastNorth en00Server = new EastNorth(source.tileXYtoProjected(xtile, ytile, zoom));
-        EastNorth en11Server = new EastNorth(source.tileXYtoProjected(xtile + 1, ytile + 1, zoom));
+        EastNorth en00Server = tileToEastNorth(xtile, ytile, zoom);
+        EastNorth en11Server = tileToEastNorth(xtile + 1, ytile + 1, zoom);
         ProjectionBounds pbServer = new ProjectionBounds(en00Server);
         pbServer.extend(en11Server);