- Timestamp:
- 2017-04-06T10:10:50+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r11845 r11846 27 27 import java.net.MalformedURLException; 28 28 import java.net.URL; 29 import java.text.MessageFormat;30 29 import java.text.SimpleDateFormat; 31 30 import java.util.ArrayList; … … 64 63 import org.openstreetmap.gui.jmapviewer.MemoryTileCache; 65 64 import org.openstreetmap.gui.jmapviewer.OsmTileLoader; 66 import org.openstreetmap.gui.jmapviewer.Projected;67 65 import org.openstreetmap.gui.jmapviewer.Tile; 68 import org.openstreetmap.gui.jmapviewer.TileAnchor;69 66 import org.openstreetmap.gui.jmapviewer.TileRange; 70 67 import org.openstreetmap.gui.jmapviewer.TileXY; … … 99 96 import org.openstreetmap.josm.gui.dialogs.LayerListPopup; 100 97 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings.FilterChangeListener; 98 import org.openstreetmap.josm.gui.layer.imagery.TileAnchor; 101 99 import org.openstreetmap.josm.gui.layer.imagery.TileCoordinateConverter; 102 100 import org.openstreetmap.josm.gui.layer.imagery.TilePosition; … … 1087 1085 boolean miss = false; 1088 1086 BufferedImage img = null; 1089 TileAnchor anchorImage = null;1090 1087 if (!tile.isLoaded() || tile.hasError()) { 1091 1088 miss = true; 1092 1089 } else { 1093 synchronized (tile) { 1094 img = getLoadedTileImage(tile); 1095 anchorImage = tile.getAnchor(); 1096 } 1090 img = getLoadedTileImage(tile); 1097 1091 if (img == null) { 1098 1092 miss = true; … … 1103 1097 return; 1104 1098 } 1099 TileAnchor anchorImage = new TileAnchor( 1100 new Point.Double(0, 0), 1101 new Point.Double(img.getWidth(), img.getHeight())); 1105 1102 img = applyImageProcessors((BufferedImage) img); 1106 1103 TileAnchor anchorScreen = coordinateConverter.getScreenAnchorForTile(tile); … … 1131 1128 boolean miss = false; 1132 1129 BufferedImage img = null; 1133 TileAnchor anchorImage = null;1134 1130 if (!tile.isLoaded() || tile.hasError()) { 1135 1131 miss = true; 1136 1132 } else { 1137 synchronized (tile) { 1138 img = getLoadedTileImage(tile); 1139 anchorImage = tile.getAnchor(); 1140 } 1133 img = getLoadedTileImage(tile); 1141 1134 if (img == null) { 1142 1135 miss = true; … … 1147 1140 continue; 1148 1141 } 1142 TileAnchor anchorImage = new TileAnchor( 1143 new Point.Double(0, 0), 1144 new Point.Double(img.getWidth(), img.getHeight())); 1149 1145 1150 1146 // applying all filters to this layer -
trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
r11845 r11846 8 8 9 9 import org.openstreetmap.gui.jmapviewer.Tile; 10 import org.openstreetmap.gui.jmapviewer.TileAnchor;11 10 import org.openstreetmap.gui.jmapviewer.TileXY; 12 11 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
Note:
See TracChangeset
for help on using the changeset viewer.