Changeset 9623 in osm for applications/editors/josm

Timestamp:

2008-08-10T20:09:05+02:00 (16 years ago)

Author:

tim

Message:

ADDED:
Quick and dirty implementation to switch between Mapnik and Osmarender map tiles

Location:

applications/editors/josm/plugins/slippy_map_chooser

Files:

• images/blue_Mapnik.png (added)
• images/blue_Osmarender.png (added)
• images/layer-switcher-maximize.png (added)
• images/layer-switcher-minimize.png (added)
• src/OsmMapControl.java (modified) (4 diffs)
• src/SlippyMapChooser.java (modified) (6 diffs)
• src/SourceButton.java (added)

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

@@ -31 +31 @@
 
         private SizeButton iSizeButton = null;
+        private SourceButton iSourceButton = null;
 
         /**
          * Create a new OsmMapControl
          */
-        public OsmMapControl(SlippyMapChooser navComp, JPanel contentPane, SizeButton sizeButton) {
+        public OsmMapControl(SlippyMapChooser navComp, JPanel contentPane, SizeButton sizeButton, SourceButton sourceButton) {
                 this.iSlippyMapChooser = navComp;
                 iSlippyMapChooser.addMouseListener(this);
@@ -53 +54 @@
                 }
                 iSizeButton = sizeButton;
+                iSourceButton = sourceButton;
         }
 
@@ -86 +88 @@
         public void mouseReleased(MouseEvent e) {
                 if (e.getButton() == MouseEvent.BUTTON1) {
+                        
+                        int sourceButton = iSourceButton.hit(e.getPoint());
+                        
                         if (iSizeButton.hit(e.getPoint())) {
                                 iSizeButton.toggle();
                                 iSlippyMapChooser.resizeSlippyMap();
-                        } else {
+                        }
+                        else if(sourceButton == SourceButton.HIDE_OR_SHOW) {
+                                iSourceButton.toggle();
+                                iSlippyMapChooser.repaint();
+                                
+                        }else if(sourceButton == SourceButton.MAPNIK || sourceButton == SourceButton.OSMARENDER) {
+                                iSlippyMapChooser.toggleMapSource(sourceButton);
+                        }
+                        else {
                                 if (e.getClickCount() == 1) {
                                         iSlippyMapChooser.setSelection(iStartSelectionPoint, e.getPoint());
@@ -98 +111 @@
                                 }
                         }
+                        
                 }
         }

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

@@ -19 +19 @@
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
+import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
+import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
@@ -40 +42 @@
 
         private SizeButton iSizeButton = new SizeButton();
+        private SourceButton iSourceButton = new SourceButton();
 
         // standard dimension
@@ -66 +69 @@
                 iGui.tabpane.add(temp, tr("Slippy map"));
 
-                new OsmMapControl(this, temp, iSizeButton);
+                new OsmMapControl(this, temp, iSizeButton, iSourceButton);
                 boundingBoxChanged(gui);
         }
@@ -103 +106 @@
 
                         iSizeButton.paint(g);
+                        iSourceButton.paint(g);
                 } catch (Exception e) {
                         e.printStackTrace();
@@ -199 +203 @@
                         int h = iScreenSize.height * 90 / 100;
                         co.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
+                        
                 }
                 // shrink
@@ -207 +212 @@
                         int h = iDownloadDialogDimension.height;
                         co.setBounds((iScreenSize.width - w) / 2, (iScreenSize.height - h) / 2, w, h);
-                }
+                        
+                }
+                
                 repaint();
         }
+        
+        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();
+        }
 
 }