Changeset 13327 in osm for applications/editors/josm/plugins

Timestamp:

2009-01-23T19:26:39+01:00 (16 years ago)

Author:

tim

Message:

ADDED: CycleMap is now available in slippy_map_chooser

Location:

applications/editors/josm/plugins/slippy_map_chooser

Files:

• build.xml (modified) (1 diff)
• images/blue_CycleMap.png (added)
• images/blue_Mapnik.png (modified) ( previous)
• images/blue_Osmarender.png (modified) ( previous)
• src/OsmMapControl.java (modified) (1 diff)
• src/SlippyMapChooser.java (modified) (4 diffs)
• src/SourceButton.java (modified) (5 diffs)

applications/editors/josm/plugins/slippy_map_chooser/build.xml

@@ -6 +6 @@
             <os family="windows"/>
         </and>
-    </condition>
+    </condition>        
 <!-- compilation properties -->
     <property name="josm.build.dir"   value="../../core"/>

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

@@ -99 +99 @@
                 iSlippyMapChooser.repaint();
                 
-            }else if(sourceButton == SourceButton.MAPNIK || sourceButton == SourceButton.OSMARENDER) {
+            }else if(sourceButton == SourceButton.MAPNIK || sourceButton == SourceButton.OSMARENDER || sourceButton == SourceButton.CYCLEMAP) {
                 iSlippyMapChooser.toggleMapSource(sourceButton);
             }

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

@@ -26 +26 @@
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.OsmTileSource;
+import org.openstreetmap.gui.jmapviewer.OsmTileSource.CycleMap;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -56 +57 @@
     private Dimension iScreenSize;
 
-    private TileSource[] sources = { new OsmTileSource.Mapnik(), new OsmTileSource.TilesAtHome() };
+    private TileSource[] sources = { new OsmTileSource.Mapnik(), new OsmTileSource.TilesAtHome(),new OsmTileSource.CycleMap()};
     TileLoader cachedLoader;
     TileLoader uncachedLoader;
@@ -78 +79 @@
         String mapStyle = Main.pref.get("slippy_map_chooser.mapstyle", "mapnik");
         if(mapStyle.equals("osmarender")) {
-            iSourceButton.setIsMapStyleMapnik(false);
+            iSourceButton.setMapStyle(SourceButton.OSMARENDER);
             this.setTileSource(sources[1]);
+        }else if(mapStyle.equals("cyclemap")){
+                 iSourceButton.setMapStyle(SourceButton.CYCLEMAP);
+             this.setTileSource(sources[2]);
         }
         else {
@@ -261 +265 @@
             this.setTileSource(sources[0]);
             Main.pref.put("slippy_map_chooser.mapstyle", "mapnik");
-        } else {
+        }else if (mapSource == SourceButton.CYCLEMAP) {
+            this.setTileSource(sources[2]);
+            Main.pref.put("slippy_map_chooser.mapstyle", "cyclemap");
+        }else {
             this.setTileSource(sources[1]);
             Main.pref.put("slippy_map_chooser.mapstyle", "osmarender");

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

@@ -15 +15 @@
     private ImageIcon imageMapnik;
     private ImageIcon imageOsmarender;
+    private ImageIcon imageCycleMap;
 
     private boolean isEnlarged = false;
 
-    private boolean isMapnik = true;
+    private int currentMap = MAPNIK;
 
     public static final int HIDE_OR_SHOW = 1;
     public static final int MAPNIK = 2;
     public static final int OSMARENDER = 3;
+    public static final int CYCLEMAP = 4;
 
     public SourceButton() {
@@ -29 +31 @@
         imageMapnik = ImageProvider.get("", "blue_Mapnik.png");
         imageOsmarender = ImageProvider.get("", "blue_Osmarender.png");
+        imageCycleMap = ImageProvider.get("","blue_CycleMap.png");
     }
 
@@ -34 +37 @@
 
         if (isEnlarged) {
-            if (isMapnik) {
+            if (currentMap == MAPNIK) {
                 g.drawImage(imageMapnik.getImage(), g.getClipBounds().width
                         - imageMapnik.getIconWidth(), y, null);
-            } else {
+            }else if(currentMap == CYCLEMAP){
+                 g.drawImage(imageCycleMap.getImage(), g.getClipBounds().width
+                         - imageCycleMap.getIconWidth(), y, null);
+            }
+            else {
                 g.drawImage(imageOsmarender.getImage(), g.getClipBounds().width
                         - imageMapnik.getIconWidth(), y, null);
@@ -67 +74 @@
                 }
             } else if (x - imageMapnik.getIconWidth() < point.x && point.x < x) {
-                if (y < point.y && point.y < y + imageMapnik.getIconHeight() / 2) {
-                    isMapnik = false;
+                if (y < point.y && point.y < y + imageMapnik.getIconHeight() / 3) {
+                    currentMap = OSMARENDER;
                     return OSMARENDER;
-                } else if (y + imageMapnik.getIconHeight() / 2 < point.y
+                } else if (y + imageMapnik.getIconHeight() / 3 < point.y
+                        && point.y < y + imageMapnik.getIconHeight() *2/3) {
+                    currentMap = MAPNIK;
+                    return MAPNIK;
+                } else if (y + imageMapnik.getIconHeight()* 2/3 < point.y
                         && point.y < y + imageMapnik.getIconHeight()) {
-                    isMapnik = true;
-                    return MAPNIK;
+                    currentMap = CYCLEMAP;
+                    System.out.println("HIT Cycle");
+                    return CYCLEMAP;
                 }
             }
@@ -87 +99 @@
     }
     
-    public void setIsMapStyleMapnik (boolean style) {
-        isMapnik = style;
+    /**
+     * One of the constants OSMARENDER,MAPNIK or CYCLEMAP
+     */
+    public void setMapStyle (int style) {
+       if(style < 2 || style > 4){
+           currentMap = MAPNIK;
+       }
+       currentMap = style;
     }
 }