Changeset 8168 in josm
- Timestamp:
- 2015-04-06T01:43:03+02:00 (9 years ago)
- Location:
- trunk
- Files:
-
- 10 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/build.xml
r8157 r8168 221 221 <!-- get rid of "internal proprietary API" warning --> 222 222 <compilerarg value="-XDignore.symbol.file"/> 223 <exclude name="org/apache/commons/jcs/admin/**"/> 224 <exclude name="org/apache/commons/jcs/auxiliary/disk/jdbc/**"/> 225 <exclude name="org/apache/commons/jcs/auxiliary/remote/**"/> 226 <exclude name="org/apache/commons/jcs/utils/servlet/**"/> 227 <exclude name="org/apache/commons/logging/impl/AvalonLogger.java"/> 228 <exclude name="org/apache/commons/logging/impl/Log4JLogger.java"/> 229 <exclude name="org/apache/commons/logging/impl/LogKitLogger.java"/> 230 <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"/> 223 231 </javac> 224 232 <!-- JMapViewer/JOSM --> -
trunk/src/org/apache/commons
-
trunk/src/org/openstreetmap/josm/Main.java
r8126 r8168 68 68 import org.openstreetmap.josm.data.UndoRedoHandler; 69 69 import org.openstreetmap.josm.data.ViewportData; 70 import org.openstreetmap.josm.data.cache.JCSCacheManager; 70 71 import org.openstreetmap.josm.data.coor.CoordinateFormat; 71 72 import org.openstreetmap.josm.data.coor.LatLon; … … 1089 1090 */ 1090 1091 public static boolean exitJosm(boolean exit, int exitCode) { 1092 JCSCacheManager.shutdown(); 1091 1093 if (Main.saveUnsavedModifications()) { 1092 1094 geometry.remember("gui.geometry"); -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
r7005 r8168 12 12 import java.util.Arrays; 13 13 import java.util.Collections; 14 import java.util.HashMap; 14 15 import java.util.HashSet; 15 16 import java.util.List; 17 import java.util.Map; 16 18 import java.util.Set; 17 19 import java.util.concurrent.CopyOnWriteArrayList; … … 26 28 import org.openstreetmap.gui.jmapviewer.OsmTileLoader; 27 29 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker; 30 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; 28 31 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource; 29 32 import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource; … … 114 117 public static final String RESIZE_PROP = SlippyMapBBoxChooser.class.getName() + ".resize"; 115 118 116 private OsmTileLoader cachedLoader;119 private TileLoader cachedLoader; 117 120 private OsmTileLoader uncachedLoader; 118 121 … … 132 135 SpringLayout springLayout = new SpringLayout(); 133 136 setLayout(springLayout); 134 TMSLayer.setMaxWorkers(); 135 cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this); 137 138 Map<String, String> headers = new HashMap<>(); 139 headers.put("User-Agent", Version.getInstance().getFullAgentString()); 140 141 cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this, headers); 136 142 137 143 uncachedLoader = new OsmTileLoader(this); 138 uncachedLoader.headers.put ("User-Agent", Version.getInstance().getFullAgentString());144 uncachedLoader.headers.putAll(headers); 139 145 setZoomContolsVisible(Main.pref.getBoolean("slippy_map_chooser.zoomcontrols",false)); 140 146 setMapMarkerVisible(false); -
trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
r8153 r8168 22 22 import java.util.ArrayList; 23 23 import java.util.Collections; 24 import java.util.Hash Set;24 import java.util.HashMap; 25 25 import java.util.LinkedList; 26 26 import java.util.List; 27 27 import java.util.Map; 28 import java.util.Map.Entry;29 28 import java.util.Scanner; 30 import java.util.Set;31 29 import java.util.concurrent.Callable; 32 30 import java.util.regex.Matcher; … … 42 40 import org.openstreetmap.gui.jmapviewer.AttributionSupport; 43 41 import org.openstreetmap.gui.jmapviewer.Coordinate; 44 import org.openstreetmap.gui.jmapviewer.JobDispatcher;45 42 import org.openstreetmap.gui.jmapviewer.MemoryTileCache; 46 import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader;47 43 import org.openstreetmap.gui.jmapviewer.OsmTileLoader; 48 import org.openstreetmap.gui.jmapviewer.TMSFileCacheTileLoader;49 44 import org.openstreetmap.gui.jmapviewer.Tile; 50 45 import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader; 51 import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController; 46 import org.openstreetmap.gui.jmapviewer.interfaces.TileCache; 47 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; 52 48 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener; 53 49 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource; … … 64 60 import org.openstreetmap.josm.data.imagery.ImageryInfo; 65 61 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; 62 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader; 66 63 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 67 64 import org.openstreetmap.josm.data.preferences.BooleanProperty; … … 76 73 import org.openstreetmap.josm.gui.dialogs.LayerListPopup; 77 74 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 78 import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;79 75 import org.openstreetmap.josm.io.CacheCustomContent; 80 76 import org.openstreetmap.josm.io.OsmTransferException; … … 109 105 //public static final BooleanProperty PROP_DRAW_DEBUG = new BooleanProperty(PREFERENCE_PREFIX + ".draw_debug", false); 110 106 public static final BooleanProperty PROP_ADD_TO_SLIPPYMAP_CHOOSER = new BooleanProperty(PREFERENCE_PREFIX + ".add_to_slippymap_chooser", true); 111 public static final IntegerProperty PROP_TMS_JOBS = new IntegerProperty("tmsloader.maxjobs", 25);112 107 public static final StringProperty PROP_TILECACHE_DIR; 113 108 … … 123 118 124 119 public interface TileLoaderFactory { 125 OsmTileLoader makeTileLoader(TileLoaderListener listener); 126 } 127 128 protected MemoryTileCache tileCache; 120 TileLoader makeTileLoader(TileLoaderListener listener); 121 TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> headers); 122 } 123 124 protected TileCache tileCache; 129 125 protected TileSource tileSource; 130 protected OsmTileLoader tileLoader; 126 protected TileLoader tileLoader; 127 131 128 132 129 public static TileLoaderFactory loaderFactory = new TileLoaderFactory() { 133 130 @Override 134 public OsmTileLoader makeTileLoader(TileLoaderListener listener) { 135 String cachePath = TMSLayer.PROP_TILECACHE_DIR.get(); 136 if (cachePath != null && !cachePath.isEmpty()) { 137 try { 138 OsmFileCacheTileLoader loader; 139 loader = new TMSFileCacheTileLoader(listener, new File(cachePath)); 140 loader.headers.put("User-Agent", Version.getInstance().getFullAgentString()); 141 return loader; 142 } catch (IOException e) { 143 Main.warn(e); 144 } 131 public TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> inputHeaders) { 132 Map<String, String> headers = new HashMap<>(); 133 headers.put("User-Agent", Version.getInstance().getFullAgentString()); 134 headers.put("Accept", "text/html, image/png, image/jpeg, image/gif, */*"); 135 if (inputHeaders != null) 136 headers.putAll(inputHeaders); 137 138 try { 139 return new TMSCachedTileLoader(listener, "TMS", 140 Main.pref.getInteger("socket.timeout.connect",15) * 1000, 141 Main.pref.getInteger("socket.timeout.read", 30) * 1000, 142 headers, 143 PROP_TILECACHE_DIR.get()); 144 } catch (IOException e) { 145 Main.warn(e); 145 146 } 146 147 return null; 148 } 149 150 @Override 151 public TileLoader makeTileLoader(TileLoaderListener listener) { 152 return makeTileLoader(listener, null); 147 153 } 148 154 }; … … 151 157 * Plugins that wish to set custom tile loader should call this method 152 158 */ 159 153 160 public static void setCustomTileLoaderFactory(TileLoaderFactory loaderFactory) { 154 161 TMSLayer.loaderFactory = loaderFactory; 155 162 } 156 157 private Set<Tile> tileRequestsOutstanding = new HashSet<>();158 163 159 164 @Override … … 166 171 tile.setImage(sharpenImage(tile.getImage())); 167 172 } 168 tile.setLoaded( true);173 tile.setLoaded(success); 169 174 needRedraw = true; 170 175 if (Main.map != null) { 171 176 Main.map.repaint(100); 172 177 } 173 tileRequestsOutstanding.remove(tile);174 178 if (Main.isDebugEnabled()) { 175 179 Main.debug("tileLoadingFinished() tile: " + tile + " success: " + success); 176 }177 }178 179 private static class TmsTileClearController implements TileClearController, CancelListener {180 181 private final ProgressMonitor monitor;182 private boolean cancel = false;183 184 public TmsTileClearController(ProgressMonitor monitor) {185 this.monitor = monitor;186 this.monitor.addCancelListener(this);187 }188 189 @Override190 public void initClearDir(File dir) {191 }192 193 @Override194 public void initClearFiles(File[] files) {195 monitor.setTicksCount(files.length);196 monitor.setTicks(0);197 }198 199 @Override200 public boolean cancel() {201 return cancel;202 }203 204 @Override205 public void fileDeleted(File file) {206 monitor.setTicks(monitor.getTicks()+1);207 }208 209 @Override210 public void clearFinished() {211 monitor.finishTask();212 }213 214 @Override215 public void operationCanceled() {216 cancel = true;217 180 } 218 181 } … … 226 189 * 227 190 * @param monitor 228 * @see MemoryTileCache#clear()229 191 * @see OsmFileCacheTileLoader#clearCache(org.openstreetmap.gui.jmapviewer.interfaces.TileSource, org.openstreetmap.gui.jmapviewer.interfaces.TileClearController) 230 192 */ … … 232 194 tileCache.clear(); 233 195 if (tileLoader instanceof CachedTileLoader) { 234 ((CachedTileLoader)tileLoader).clearCache( tileSource, new TmsTileClearController(monitor));196 ((CachedTileLoader)tileLoader).clearCache(); 235 197 } 236 198 } … … 416 378 currentZoomLevel = getBestZoom(); 417 379 418 tileCache = new MemoryTileCache(); 419 420 tileLoader = loaderFactory.makeTileLoader(this); 421 if (tileLoader == null) { 380 Map<String, String> headers = null; 381 if (tileSource instanceof TemplatedTMSTileSource) { 382 headers = (((TemplatedTMSTileSource)tileSource).getHeaders()); 383 } 384 385 // FIXME: tileCache = new MemoryTileCache(); 386 tileLoader = loaderFactory.makeTileLoader(this, headers); 387 if (tileLoader instanceof TMSCachedTileLoader) { 388 tileCache = (TileCache) tileLoader; 389 } else { 390 tileCache = new MemoryTileCache(); 391 } 392 if (tileLoader == null) 422 393 tileLoader = new OsmTileLoader(this); 423 }424 tileLoader.timeoutConnect = Main.pref.getInteger("socket.timeout.connect",15) * 1000;425 tileLoader.timeoutRead = Main.pref.getInteger("socket.timeout.read", 30) * 1000;426 if (tileSource instanceof TemplatedTMSTileSource) {427 for(Entry<String, String> e : ((TemplatedTMSTileSource)tileSource).getHeaders().entrySet()) {428 tileLoader.headers.put(e.getKey(), e.getValue());429 }430 }431 tileLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());432 }433 434 @Override435 public void setOffset(double dx, double dy) {436 super.setOffset(dx, dy);437 needRedraw = true;438 394 } 439 395 … … 472 428 } 473 429 474 /**475 * Function to set the maximum number of workers for tile loading to the value defined476 * in preferences.477 */478 public static void setMaxWorkers() {479 JobDispatcher.setMaxWorkers(PROP_TMS_JOBS.get());480 JobDispatcher.getInstance().setLIFO(true);481 }482 483 430 @SuppressWarnings("serial") 484 431 public TMSLayer(ImageryInfo info) { 485 432 super(info); 486 433 487 setMaxWorkers();488 434 if(!isProjectionSupported(Main.getProjection())) { 489 435 JOptionPane.showMessageDialog(Main.parent, 490 tr("TMS layers do not support the projection {0}.\n{1}\n"491 + "Change the projection or remove the layer.",492 Main.getProjection().toCode(), nameSupportedProjections()),493 tr("Warning"),494 JOptionPane.WARNING_MESSAGE);436 tr("TMS layers do not support the projection {0}.\n{1}\n" 437 + "Change the projection or remove the layer.", 438 Main.getProjection().toCode(), nameSupportedProjections()), 439 tr("Warning"), 440 JOptionPane.WARNING_MESSAGE); 495 441 } 496 442 … … 685 631 } 686 632 needRedraw = true; 687 JobDispatcher.getInstance().cancelOutstandingJobs();688 tileRequestsOutstanding.clear();689 633 } 690 634 … … 771 715 * into the tileCache. 772 716 */ 773 synchronizedTile tempCornerTile(Tile t) {717 Tile tempCornerTile(Tile t) { 774 718 int x = t.getXtile() + 1; 775 719 int y = t.getYtile() + 1; … … 781 725 } 782 726 783 synchronizedTile getOrCreateTile(int x, int y, int zoom) {727 Tile getOrCreateTile(int x, int y, int zoom) { 784 728 Tile tile = getTile(x, y, zoom); 785 729 if (tile == null) { … … 795 739 * already in the cache. 796 740 */ 797 synchronizedTile getTile(int x, int y, int zoom) {741 Tile getTile(int x, int y, int zoom) { 798 742 int max = (1 << zoom); 799 743 if (x < 0 || x >= max || y < 0 || y >= max) … … 802 746 } 803 747 804 synchronizedboolean loadTile(Tile tile, boolean force) {748 boolean loadTile(Tile tile, boolean force) { 805 749 if (tile == null) 806 750 return false; 807 if (!force && (tile. hasError() || tile.isLoaded()))751 if (!force && (tile.isLoaded() || tile.hasError())) 808 752 return false; 809 753 if (tile.isLoading()) 810 754 return false; 811 if (tileRequestsOutstanding.contains(tile)) 812 return false; 813 tileRequestsOutstanding.add(tile); 814 JobDispatcher.getInstance().addJob(tileLoader.createTileLoaderJob(tile)); 755 tileLoader.createTileLoaderJob(tile).submit(); 815 756 return true; 816 757 } … … 1269 1210 if (zoom < minZoom) 1270 1211 return nullTileSet; 1271 TileSet ts = tileSets[zoom-minZoom]; 1272 if (ts == null) { 1273 ts = new TileSet(topLeft, botRight, zoom); 1274 tileSets[zoom-minZoom] = ts; 1275 } 1276 return ts; 1277 } 1212 synchronized (tileSets) { 1213 TileSet ts = tileSets[zoom-minZoom]; 1214 if (ts == null) { 1215 ts = new TileSet(topLeft, botRight, zoom); 1216 tileSets[zoom-minZoom] = ts; 1217 } 1218 return ts; 1219 } 1220 } 1221 1278 1222 public TileSetInfo getTileSetInfo(int zoom) { 1279 1223 if (zoom < minZoom) 1280 1224 return new TileSetInfo(); 1281 TileSetInfo tsi = tileSetInfos[zoom-minZoom]; 1282 if (tsi == null) { 1283 tsi = TMSLayer.getTileSetInfo(getTileSet(zoom)); 1284 tileSetInfos[zoom-minZoom] = tsi; 1285 } 1286 return tsi; 1225 synchronized (tileSetInfos) { 1226 TileSetInfo tsi = tileSetInfos[zoom-minZoom]; 1227 if (tsi == null) { 1228 tsi = TMSLayer.getTileSetInfo(getTileSet(zoom)); 1229 tileSetInfos[zoom-minZoom] = tsi; 1230 } 1231 return tsi; 1232 } 1287 1233 } 1288 1234 } … … 1290 1236 @Override 1291 1237 public void paint(Graphics2D g, MapView mv, Bounds bounds) { 1292 //long start = System.currentTimeMillis();1293 1238 EastNorth topLeft = mv.getEastNorth(0, 0); 1294 1239 EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight()); … … 1436 1381 myDrawString(g, tr("Pixel scale: {0}", getScaleFactor(currentZoomLevel)), 50, 170); 1437 1382 myDrawString(g, tr("Best zoom: {0}", Math.log(getScaleFactor(1))/Math.log(2)/2+1), 50, 185); 1383 if(tileLoader instanceof TMSCachedTileLoader) { 1384 TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader)tileLoader; 1385 int offset = 185; 1386 for(String part: cachedTileLoader.getStats().split("\n")) { 1387 myDrawString(g, tr("Cache stats: {0}", part), 50, offset+=15); 1388 } 1389 1390 } 1438 1391 } 1439 1392 } -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/TMSSettingsPanel.java
r7937 r8168 12 12 import javax.swing.SpinnerNumberModel; 13 13 14 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader; 15 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoaderJob; 14 16 import org.openstreetmap.josm.gui.layer.TMSLayer; 17 import org.openstreetmap.josm.gui.widgets.JosmTextField; 15 18 import org.openstreetmap.josm.tools.GBC; 16 import org.openstreetmap.josm.gui.widgets.JosmTextField;17 19 18 20 /** … … 29 31 private final JCheckBox addToSlippyMapChosser = new JCheckBox(); 30 32 private final JosmTextField tilecacheDir = new JosmTextField(); 33 private final JSpinner maxElementsOnDisk; 34 private final JSpinner maxConcurrentDownloads; 35 31 36 32 37 /** … … 37 42 minZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.DEFAULT_MIN_ZOOM, TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1)); 38 43 maxZoomLvl = new JSpinner(new SpinnerNumberModel(TMSLayer.DEFAULT_MAX_ZOOM, TMSLayer.MIN_ZOOM, TMSLayer.MAX_ZOOM, 1)); 44 maxElementsOnDisk = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get().intValue(), 0, Integer.MAX_VALUE, 1)); 45 maxConcurrentDownloads = new JSpinner(new SpinnerNumberModel(TMSCachedTileLoaderJob.THREAD_LIMIT.get().intValue(), 0, Integer.MAX_VALUE, 1)); 39 46 40 47 add(new JLabel(tr("Auto zoom by default: ")), GBC.std()); … … 61 68 add(GBC.glue(5, 0), GBC.std()); 62 69 add(tilecacheDir, GBC.eol().fill(GBC.HORIZONTAL)); 70 71 add(new JLabel(tr("Maximum concurrent downloads: ")), GBC.std()); 72 add(GBC.glue(5, 0), GBC.std()); 73 add(maxConcurrentDownloads, GBC.eol()); 74 75 add(new JLabel(tr("Maximum elements in disk cache: ")), GBC.std()); 76 add(GBC.glue(5, 0), GBC.std()); 77 add(this.maxElementsOnDisk, GBC.eol()); 78 63 79 } 64 80 65 81 /** 66 82 * Loads the TMS settings. … … 73 89 this.minZoomLvl.setValue(TMSLayer.getMinZoomLvl(null)); 74 90 this.tilecacheDir.setText(TMSLayer.PROP_TILECACHE_DIR.get()); 91 this.maxElementsOnDisk.setValue(TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.get()); 92 this.maxConcurrentDownloads.setValue(TMSCachedTileLoaderJob.THREAD_LIMIT.get()); 75 93 } 76 94 77 95 /** 78 96 * Saves the TMS settings. … … 81 99 public boolean saveSettings() { 82 100 boolean restartRequired = false; 83 101 84 102 if (TMSLayer.PROP_ADD_TO_SLIPPYMAP_CHOOSER.get() != this.addToSlippyMapChosser.isSelected()) { 85 103 restartRequired = true; … … 90 108 TMSLayer.setMaxZoomLvl((Integer)this.maxZoomLvl.getValue()); 91 109 TMSLayer.setMinZoomLvl((Integer)this.minZoomLvl.getValue()); 92 TMSLayer.PROP_TILECACHE_DIR.put(this.tilecacheDir.getText()); 93 110 111 TMSCachedTileLoader.MAX_OBJECTS_ON_DISK.put((Integer) this.maxElementsOnDisk.getValue()); 112 113 if (!TMSCachedTileLoaderJob.THREAD_LIMIT.get().equals(this.maxConcurrentDownloads.getValue())) { 114 restartRequired = true; 115 TMSCachedTileLoaderJob.THREAD_LIMIT.put((Integer) this.maxConcurrentDownloads.getValue()); 116 } 117 118 if (!TMSLayer.PROP_TILECACHE_DIR.get().equals(this.tilecacheDir.getText())) { 119 restartRequired = true; 120 TMSLayer.PROP_TILECACHE_DIR.put(this.tilecacheDir.getText()); 121 } 122 94 123 return restartRequired; 95 124 }
Note:
See TracChangeset
for help on using the changeset viewer.