Changeset 9819 in osm for applications/editors/josm/plugins/slippy_map_chooser/src/SlippyMapChooser.java

Timestamp:

2008-08-14T12:50:12+02:00 (17 years ago)

Author:

stotz

Message:

Switching between Mapnik and Osmarenderer works

File:

• applications/editors/josm/plugins/slippy_map_chooser/src/SlippyMapChooser.java (modified) (4 diffs)

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

@@ -21 +21 @@
 import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
 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.TileSource;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.download.DownloadSelection;
@@ -48 +49 @@
         // screen size
         private Dimension iScreenSize;
+
+        private TileSource[] sources = { new OsmTileSource.Mapnik(), new OsmTileSource.TilesAtHome() };
 
         /**
@@ -203 +206 @@
                         int h = iScreenSize.height * 90 / 100;
                         co.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
-                        
+
                 }
                 // shrink
@@ -212 +215 @@
                         int h = iDownloadDialogDimension.height;
                         co.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
-                        
-                }
-                
+
+                }
+
                 repaint();
         }
-        
-        public void toggleMapSource(int mapSource){
+
+        public void toggleMapSource(int mapSource) {
                 this.tileCache = new MemoryTileCache();
-                if(mapSource == SourceButton.MAPNIK){
-                        this.tileLoader = new OsmTileLoader(this,OsmTileLoader.MAP_MAPNIK);
-                }else{
-                        this.tileLoader = new OsmTileLoader(this,OsmTileLoader.MAP_OSMA);
-                }
-                repaint();
+                if (mapSource == SourceButton.MAPNIK) {
+                        this.setTileSource(sources[0]);
+                } else {
+                        this.setTileSource(sources[1]);
+                }
         }