Changeset 9851 in osm

Timestamp:

2008-08-15T13:26:27+02:00 (16 years ago)

Author:

stotz

Message:

Updated because of changes in JMapViewer

Location:

applications/editors/josm/plugins/slippy_map_chooser/src

Files:

• SlippyMapChooser.java (modified) (3 diffs)
• SlippyMapChooserPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/slippy_map_chooser/src/SlippyMapChooser.java

@@ -20 +20 @@
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
 import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
+import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
+import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.OsmTileSource;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
@@ -51 +54 @@
 
         private TileSource[] sources = { new OsmTileSource.Mapnik(), new OsmTileSource.TilesAtHome() };
+        TileLoader cachedLoader;
+        TileLoader uncachedLoader;
 
         /**
@@ -57 +62 @@
         public SlippyMapChooser() {
                 super();
+                cachedLoader = new OsmFileCacheTileLoader(this);
+                uncachedLoader = new OsmTileLoader(this);
                 setZoomContolsVisible(false);
                 setMapMarkerVisible(false);
                 setMinimumSize(new Dimension(350, 350 / 2));
+                setFileCacheEnabled(SlippyMapChooserPlugin.ENABLE_FILE_CACHE);
+                setMaxTilesInmemory(SlippyMapChooserPlugin.MAX_TILES_IN_MEMORY);
+        }
+
+        public void setMaxTilesInmemory(int tiles) {
+                ((MemoryTileCache) getTileCache()).setCacheSize(tiles);
+        }
+
+        public void setFileCacheEnabled(boolean enabled) {
+                if (enabled)
+                        setTileLoader(cachedLoader);
+                else
+                        setTileLoader(uncachedLoader);
         }
 

applications/editors/josm/plugins/slippy_map_chooser/src/SlippyMapChooserPlugin.java

@@ -12 +12 @@
  * @author Tim Haussmann
  */
-public class SlippyMapChooserPlugin extends Plugin implements PreferenceChangedListener{
-        
+public class SlippyMapChooserPlugin extends Plugin implements PreferenceChangedListener {
+
         static String iPluginFolder = "";
-        
-        private static final String KEY_MAX_TILES_IN_DB = "slippy_map_chooser.max_tiles";
-        private static final String KEY_MAX_TILES_REDUCE_BY = "slippy_map_chooser.max_tiles_reduce_by";
-        public static boolean DEBUG_MODE = false;
-        
-        
-        static int MAX_TILES_IN_DB = 200;
-        static int MAX_TILES_REDUCE_BY = 40;
-        
-        public SlippyMapChooserPlugin(){
-                // create the plugin folder 
-//              iPluginFolder = getPluginDir();
-//              File pluginFolder = new File(iPluginFolder);
-//              if(!pluginFolder.exists())
-//                      pluginFolder.mkdir();
-//              
-//              //init the logger
-//              Logger.setLogFile(iPluginFolder+"\\slippy_map_chooser.log");
-                
-                //Add this plugin to the preference changed listener list
+
+        private static final String KEY_MAX_TILES_IN_MEMORY = "slippy_map_chooser.max_tiles";
+        private static final String KEY_ENABLE_FILE_CACHE = "slippy_map_chooser.file_cache";
+
+        static int MAX_TILES_IN_MEMORY = 200;
+        static boolean ENABLE_FILE_CACHE = true;
+
+        public SlippyMapChooserPlugin() {
+                // create the plugin folder
+                // iPluginFolder = getPluginDir();
+                // File pluginFolder = new File(iPluginFolder);
+                // if(!pluginFolder.exists())
+                // pluginFolder.mkdir();
+                //              
+                // //init the logger
+                // Logger.setLogFile(iPluginFolder+"\\slippy_map_chooser.log");
+
+                // Add this plugin to the preference changed listener list
                 Main.pref.listener.add(this);
-                
-                //load prefs
-                String maxTiles = Main.pref.get(KEY_MAX_TILES_IN_DB);
-                if(!maxTiles.equals("")){
-                        preferenceChanged(KEY_MAX_TILES_IN_DB, maxTiles);
-                }else{
-                        Main.pref.put(KEY_MAX_TILES_IN_DB, String.valueOf(MAX_TILES_IN_DB));
+
+                // load prefs
+                String maxTiles = Main.pref.get(KEY_MAX_TILES_IN_MEMORY);
+                if (!maxTiles.equals("")) {
+                        preferenceChanged(KEY_MAX_TILES_IN_MEMORY, maxTiles);
+                } else {
+                        Main.pref.put(KEY_MAX_TILES_IN_MEMORY, Integer.toString(MAX_TILES_IN_MEMORY));
                 }
-                
-                String maxTilesReduce = Main.pref.get(KEY_MAX_TILES_REDUCE_BY);
-                if(!maxTilesReduce.equals("")){
-                        preferenceChanged(KEY_MAX_TILES_REDUCE_BY, maxTilesReduce);
-                }else{
-                        Main.pref.put(KEY_MAX_TILES_REDUCE_BY, String.valueOf(MAX_TILES_REDUCE_BY));
+                String enableFileCache = Main.pref.get(KEY_ENABLE_FILE_CACHE);
+                if (!enableFileCache.equals("")) {
+                        preferenceChanged(KEY_ENABLE_FILE_CACHE, enableFileCache);
+                } else {
+                        Main.pref.put(KEY_ENABLE_FILE_CACHE, Boolean.toString(ENABLE_FILE_CACHE));
                 }
         }
-        
-        
-        public void addDownloadSelection(List<DownloadSelection> list){ 
-                list.add(new SlippyMapChooser());               
+
+        public void addDownloadSelection(List<DownloadSelection> list) {
+                list.add(new SlippyMapChooser());
         }
 
-
         public void preferenceChanged(String key, String newValue) {
-                if(key.equals(KEY_MAX_TILES_IN_DB)){
-                        try{
-                                MAX_TILES_IN_DB = Integer.parseInt(newValue);
-                        }catch(Exception e){
-                                MAX_TILES_IN_DB = 1000;
+                if (KEY_MAX_TILES_IN_MEMORY.equals(key)) {
+                        try {
+                                MAX_TILES_IN_MEMORY = Integer.parseInt(newValue);
+                        } catch (Exception e) {
+                                MAX_TILES_IN_MEMORY = 1000;
                         }
-                        
-                }else if(key.equals(KEY_MAX_TILES_REDUCE_BY)){
-                        try{
-                                MAX_TILES_REDUCE_BY = Integer.parseInt(newValue);
-                        }catch(Exception e){
-                                MAX_TILES_REDUCE_BY = 100;
+                } else if (KEY_ENABLE_FILE_CACHE.equals(key)) {
+                        try {
+                                ENABLE_FILE_CACHE = Boolean.parseBoolean(newValue);
+                        } catch (Exception e) {
+                                MAX_TILES_IN_MEMORY = 1000;
                         }
                 }
         }
-        
+
 }