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

Timestamp:

2017-04-05T20:55:28+02:00 (7 years ago)

Author:

bastiK

Message:

see #7427 - better return type

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (2 diffs)
• imagery/TileCoordinateConverter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -71 +71 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
 import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
@@ -1400 +1401 @@
      */
     protected TileSet getTileSet(ProjectionBounds bounds, int zoom) {
-        EastNorth topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin());
-        EastNorth botRightUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMax());
-        TileXY t1 = tileSource.projectedToTileXY(topLeftUnshifted.toProjected(), zoom);
-        TileXY t2 = tileSource.projectedToTileXY(botRightUnshifted.toProjected(), zoom);
+        IProjected topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin());
+        IProjected botRightUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMax());
+        TileXY t1 = tileSource.projectedToTileXY(topLeftUnshifted, zoom);
+        TileXY t2 = tileSource.projectedToTileXY(botRightUnshifted, zoom);
         return new TileSet(t1, t2, zoom);
     }

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

@@ -54 +54 @@
      *
      * @param en EastNorth coordinate representing a pixel on screen
-     * @return EastNorth coordinate as it would e.g. be sent to a WMS server
+     * @return IProjected coordinate as it would e.g. be sent to a WMS server
      */
-    public EastNorth shiftDisplayToServer(EastNorth en) {
-        return en.subtract(settings.getDisplacement());
+    public IProjected shiftDisplayToServer(EastNorth en) {
+        return en.subtract(settings.getDisplacement()).toProjected();
     }