Changeset 11846 in josm for trunk

Timestamp:

2017-04-06T10:10:50+02:00 (8 years ago)

Author:

bastiK

Message:

see #7427 - move class TileAnchor from jmapviewer to JOSM

Location:

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

Files:

• AbstractTileSourceLayer.java (modified) (7 diffs)
• imagery/TileAnchor.java (added)
• imagery/TileCoordinateConverter.java (modified) (1 diff)

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

@@ -27 +27 @@
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -64 +63 @@
 import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
-import org.openstreetmap.gui.jmapviewer.Projected;
 import org.openstreetmap.gui.jmapviewer.Tile;
-import org.openstreetmap.gui.jmapviewer.TileAnchor;
 import org.openstreetmap.gui.jmapviewer.TileRange;
 import org.openstreetmap.gui.jmapviewer.TileXY;
@@ -99 +96 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings.FilterChangeListener;
+import org.openstreetmap.josm.gui.layer.imagery.TileAnchor;
 import org.openstreetmap.josm.gui.layer.imagery.TileCoordinateConverter;
 import org.openstreetmap.josm.gui.layer.imagery.TilePosition;
@@ -1087 +1085 @@
             boolean miss = false;
             BufferedImage img = null;
-            TileAnchor anchorImage = null;
             if (!tile.isLoaded() || tile.hasError()) {
                 miss = true;
             } else {
-                synchronized (tile) {
-                    img = getLoadedTileImage(tile);
-                    anchorImage = tile.getAnchor();
-                }
+                img = getLoadedTileImage(tile);
                 if (img == null) {
                     miss = true;
@@ -1103 +1097 @@
                 return;
             }
+            TileAnchor anchorImage = new TileAnchor(
+                    new Point.Double(0, 0),
+                    new Point.Double(img.getWidth(), img.getHeight()));
             img = applyImageProcessors((BufferedImage) img);
             TileAnchor anchorScreen = coordinateConverter.getScreenAnchorForTile(tile);
@@ -1131 +1128 @@
             boolean miss = false;
             BufferedImage img = null;
-            TileAnchor anchorImage = null;
             if (!tile.isLoaded() || tile.hasError()) {
                 miss = true;
             } else {
-               synchronized (tile) {
-                    img = getLoadedTileImage(tile);
-                    anchorImage = tile.getAnchor();
-                }
+                img = getLoadedTileImage(tile);
                 if (img == null) {
                     miss = true;
@@ -1147 +1140 @@
                 continue;
             }
+            TileAnchor anchorImage = new TileAnchor(
+                    new Point.Double(0, 0),
+                    new Point.Double(img.getWidth(), img.getHeight()));
 
             // applying all filters to this layer

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

@@ -8 +8 @@
 
 import org.openstreetmap.gui.jmapviewer.Tile;
-import org.openstreetmap.gui.jmapviewer.TileAnchor;
 import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;