Changeset 11891 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

Timestamp:

2017-04-13T00:03:15+02:00 (7 years ago)

Author:

Don-vip

Message:

see #7427 - sonar - squid:S1226 - Method parameters, caught exceptions and foreach variables should not be reassigned

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)

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

@@ -1444 +1444 @@
         TileXY t1, t2;
         if (coordinateConverter.requiresReprojection()) {
-            Projection projCurrent = Main.getProjection();
             Projection projServer = Projections.getProjectionByCode(tileSource.getServerCRS());
-            bounds = new ProjectionBounds(
+            ProjectionBounds projBounds = new ProjectionBounds(
                     new EastNorth(coordinateConverter.shiftDisplayToServer(bounds.getMin())),
                     new EastNorth(coordinateConverter.shiftDisplayToServer(bounds.getMax())));
-            bounds = projServer.getEastNorthBoundsBox(bounds, projCurrent);
-            t1 = tileSource.projectedToTileXY(bounds.getMin().toProjected(), zoom);
-            t2 = tileSource.projectedToTileXY(bounds.getMax().toProjected(), zoom);
+            ProjectionBounds bbox = projServer.getEastNorthBoundsBox(projBounds, Main.getProjection());
+            t1 = tileSource.projectedToTileXY(bbox.getMin().toProjected(), zoom);
+            t2 = tileSource.projectedToTileXY(bbox.getMax().toProjected(), zoom);
         } else {
             IProjected topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin());