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

Timestamp:

2017-04-09T13:52:57+02:00 (7 years ago)

Author:

Don-vip

Message:

see #7427 - checkstyle

File:

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

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

@@ -18 +18 @@
 /**
  * Tile class that stores a reprojected version of the original tile.
+ * @since 11858
  */
 public class ReprojectionTile extends Tile {
@@ -25 +26 @@
     protected boolean maxZoomReached;
 
+    /**
+     * Constructs a new {@code ReprojectionTile}.
+     * @param source sourec tile
+     * @param xtile X coordinate
+     * @param ytile Y coordinate
+     * @param zoom zoom level
+     */
     public ReprojectionTile(TileSource source, int xtile, int ytile, int zoom) {
         super(source, xtile, ytile, zoom);
@@ -50 +58 @@
         return true;
     }
-    
+
     @Override
     public void setImage(BufferedImage image) {
@@ -100 +108 @@
         Dimension dim = getDimension(pbTargetAligned, scaleMapView);
         Integer scaleFix = limitScale(source.getTileSize(), Math.sqrt(dim.getWidth() * dim.getHeight()));
-        double scale = scaleFix == null ? scaleMapView : scaleMapView * scaleFix;
+        double scale = scaleFix == null ? scaleMapView : (scaleMapView * scaleFix);
 
         ImageWarp.PointTransform pointTransform = pt -> {
@@ -153 +161 @@
      */
     protected Integer limitScale(double lenOrig, double lenNow) {
-        double LIMIT = 3;
-        if (lenNow > LIMIT * lenOrig) {
-            int n = (int) Math.ceil((Math.log(lenNow) - Math.log(LIMIT * lenOrig)) / Math.log(2));
+        final double limit = 3;
+        if (lenNow > limit * lenOrig) {
+            int n = (int) Math.ceil((Math.log(lenNow) - Math.log(limit * lenOrig)) / Math.log(2));
             int f = 1 << n;
             double lenNowFixed = lenNow / f;
-            if (!(lenNowFixed <= LIMIT * lenOrig)) throw new AssertionError();
-            if (!(lenNowFixed > LIMIT * lenOrig / 2)) throw  new AssertionError();
+            if (lenNowFixed > limit * lenOrig) throw new AssertionError();
+            if (lenNowFixed <= limit * lenOrig / 2) throw new AssertionError();
             return f;
         }
-        if (lenNow > LIMIT * lenOrig / 2)
+        if (lenNow > limit * lenOrig / 2)
             return 1;
         return null;