Changeset 12541 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2017-07-30T06:29:03+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1066 - Collapsible "if" statements should be merged

File:

• trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)

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

@@ -993 +993 @@
                 drawImageInside(g, img, anchorImage, anchorScreen, null);
             }
-            if (tile instanceof ReprojectionTile) {
+            if (tile instanceof ReprojectionTile && ((ReprojectionTile) tile).needsUpdate(Main.map.mapView.getScale())) {
                 // This means we have a reprojected tile in memory cache, but not at
                 // current scale. Generally, the positioning of the tile will still
@@ -999 +999 @@
                 // reprojected to the target scale. The original tile image should
                 // still be in disk cache, so this is fairly cheap.
-                if (((ReprojectionTile) tile).needsUpdate(Main.map.mapView.getScale())) {
-                    ((ReprojectionTile) tile).invalidate();
-                    loadTile(tile, false);
-                }
+                ((ReprojectionTile) tile).invalidate();
+                loadTile(tile, false);
             }