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

Timestamp:

2020-06-14T14:55:11+02:00 (4 years ago)

Author:

simon04

Message:

see #19360 - Fix NPE in TileCoordinateConverter

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.imagery;
 
+import java.awt.GraphicsConfiguration;
 import java.awt.Polygon;
 import java.awt.Rectangle;
@@ -9 +10 @@
 import java.awt.geom.Rectangle2D;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.openstreetmap.gui.jmapviewer.Tile;
@@ -35 +37 @@
     private final TileSourceDisplaySettings settings;
     private final TileSource tileSource;
+    private final AffineTransform transform;
 
     /**
@@ -47 +50 @@
         this.tileSource = Objects.requireNonNull(tileSource, "tileSource");
         this.settings = Objects.requireNonNull(settings, "settings");
+        this.transform = Optional.ofNullable(mapView.getGraphicsConfiguration())
+                .map(GraphicsConfiguration::getDefaultTransform)
+                .orElseGet(AffineTransform::new);
     }
 
@@ -184 +190 @@
             t2 = tileSource.projectedToTileXY(CoordinateConversion.enToProj(botRightEN), zoom);
         }
-        AffineTransform transform = mapView.getGraphicsConfiguration().getDefaultTransform();
         int screenPixels = (int) (mapView.getWidth() * mapView.getHeight() * transform.getScaleX() * transform.getScaleY());
         double tilePixels = Math.abs((t2.getY()-t1.getY())*(t2.getX()-t1.getX())*tileSource.getTileSize()*tileSource.getTileSize());