Index: applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapKey.java =================================================================== --- applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapKey.java (revision 22848) +++ applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapKey.java (revision 23190) @@ -1,4 +1,4 @@ /** - * + * */ package org.openstreetmap.josm.plugins.slippymap; @@ -9,5 +9,5 @@ * {@link #equals(Object)} and also {@link #toString()}. *

- * + * * @author LuVar * @author Dave Hansen @@ -15,64 +15,64 @@ */ public class SlippyMapKey { - private final int x; - private final int y; - private final int level; - - /** - *

- * Constructs key for hashmaps for some tile describedy by X and Y position. X and Y are tiles - * positions on discrete map. - *

- * - * @param x x position in tiles table - * @param y y position in tiles table - */ - public final boolean valid; - public SlippyMapKey(int x, int y, int level) { - this.x = x; - this.y = y; - this.level = level; - if (level <= 0 || x < 0 || y < 0) { - this.valid = false; - System.err.println("invalid SlippyMapKey("+level+", "+x+", "+y+")"); - } else { - this.valid = true; - } - } - - /** - *

- * Returns true ONLY if x and y are equals. - *

- * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (obj instanceof SlippyMapKey) { - SlippyMapKey smk = (SlippyMapKey) obj; - if((smk.x == this.x) && (smk.y == this.y) && (smk.level == this.level)) { - return true; - } - } - return false; - } - - /** - * @return return new Integer(this.x + this.y * 10000).hashCode(); - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return new Integer(this.x + this.y * 10000 + this.level * 100000).hashCode(); - } - - /** - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "SlippyMapKey(x=" + this.x + ",y=" + this.y + ",level=" + level + ")"; - } - + private final int x; + private final int y; + private final int level; + + /** + *

+ * Constructs key for hashmaps for some tile describedy by X and Y position. X and Y are tiles + * positions on discrete map. + *

+ * + * @param x x position in tiles table + * @param y y position in tiles table + */ + public final boolean valid; + public SlippyMapKey(int x, int y, int level) { + this.x = x; + this.y = y; + this.level = level; + if (level <= 0 || x < 0 || y < 0) { + this.valid = false; + System.err.println("invalid SlippyMapKey("+level+", "+x+", "+y+")"); + } else { + this.valid = true; + } + } + + /** + *

+ * Returns true ONLY if x and y are equals. + *

+ * + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (obj instanceof SlippyMapKey) { + SlippyMapKey smk = (SlippyMapKey) obj; + if((smk.x == this.x) && (smk.y == this.y) && (smk.level == this.level)) { + return true; + } + } + return false; + } + + /** + * @return return new Integer(this.x + this.y * 10000).hashCode(); + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + return new Integer(this.x + this.y * 10000 + this.level * 100000).hashCode(); + } + + /** + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "SlippyMapKey(x=" + this.x + ",y=" + this.y + ",level=" + level + ")"; + } + } Index: applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java =================================================================== --- applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (revision 22848) +++ applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (revision 23190) @@ -212,5 +212,5 @@ // FIXME: currently ran in errors - tileOptionMenu.add(new JMenuItem( + tileOptionMenu.add(new JMenuItem( new AbstractAction(tr("Snap to tile size")) { public void actionPerformed(ActionEvent ae) { @@ -252,13 +252,13 @@ MapView.addLayerChangeListener(new LayerChangeListener() { public void activeLayerChange(Layer oldLayer, Layer newLayer) { - // + // } public void layerAdded(Layer newLayer) { - // + // } public void layerRemoved(Layer oldLayer) { - MapView.removeLayerChangeListener(this); + MapView.removeLayerChangeListener(this); } }); Index: applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPlugin.java =================================================================== --- applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPlugin.java (revision 22848) +++ applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPlugin.java (revision 23190) @@ -21,10 +21,10 @@ public SlippyMapPlugin(PluginInformation info) { - super(info); - Main.pref.addPreferenceChangeListener(this); + super(info); + Main.pref.addPreferenceChangeListener(this); } @Override - public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) + public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { if (newFrame != null && SlippyMapPreferences.getMapSource() != SlippyMapPreferences.NO_DEFAULT_TILE_SOURCE) { @@ -53,21 +53,21 @@ */ public void preferenceChanged(PreferenceChangeEvent event) { - if (!Main.isDisplayingMapView()) { - return; - } - List layes = Main.map.mapView.getLayersOfType(SlippyMapLayer.class); - assert layes.size() <= 1; - SlippyMapLayer layer = layes.isEmpty()?null:layes.get(0); + if (!Main.isDisplayingMapView()) { + return; + } + List layes = Main.map.mapView.getLayersOfType(SlippyMapLayer.class); + assert layes.size() <= 1; + SlippyMapLayer layer = layes.isEmpty()?null:layes.get(0); if (event.getKey().equals(SlippyMapPreferences.PREFERENCE_TILE_SOURCE)) { - if (layer == null && SlippyMapPreferences.getMapSource() != SlippyMapPreferences.NO_DEFAULT_TILE_SOURCE) { - Main.map.mapView.addLayer(new SlippyMapLayer()); - } else if (layer != null && SlippyMapPreferences.getMapSource() == SlippyMapPreferences.NO_DEFAULT_TILE_SOURCE) { - Main.map.mapView.removeLayer(layer); - } else if (layer == null && SlippyMapPreferences.getMapSource() == SlippyMapPreferences.NO_DEFAULT_TILE_SOURCE) { - // Do nothing - } else { - layer.newTileStorage(); - } + if (layer == null && SlippyMapPreferences.getMapSource() != SlippyMapPreferences.NO_DEFAULT_TILE_SOURCE) { + Main.map.mapView.addLayer(new SlippyMapLayer()); + } else if (layer != null && SlippyMapPreferences.getMapSource() == SlippyMapPreferences.NO_DEFAULT_TILE_SOURCE) { + Main.map.mapView.removeLayer(layer); + } else if (layer == null && SlippyMapPreferences.getMapSource() == SlippyMapPreferences.NO_DEFAULT_TILE_SOURCE) { + // Do nothing + } else { + layer.newTileStorage(); + } } else if (event.getKey().startsWith(SlippyMapPreferences.PREFERENCE_PREFIX) && layer != null) { // System.err.println(this + ".preferenceChanged('" + key + "', '" Index: applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java =================================================================== --- applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java (revision 22848) +++ applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java (revision 23190) @@ -114,8 +114,8 @@ * Actualy this method loads and sets this params:
*
    - *
  • autozoom - {@link #autozoomActive} - {@link SlippyMapPreferences#getAutozoom()}
    • - *
  • autoload - {@link #autoloadTiles} - {@link SlippyMapPreferences#getAutoloadTiles()}
    • - *
  • maxZoomLvl - {@link #maxZoomLvl} - {@link SlippyMapPreferences#getMaxZoomLvl()}
    • - *
  • minZoomLvl - {@link #minZoomLvl} - {@link SlippyMapPreferences#getMaxZoomLvl()}
    • + *
  • autozoom - {@link #autozoomActive} - {@link SlippyMapPreferences#getAutozoom()}
    • + *
  • autoload - {@link #autoloadTiles} - {@link SlippyMapPreferences#getAutoloadTiles()}
    • + *
  • maxZoomLvl - {@link #maxZoomLvl} - {@link SlippyMapPreferences#getMaxZoomLvl()}
    • + *
  • minZoomLvl - {@link #minZoomLvl} - {@link SlippyMapPreferences#getMaxZoomLvl()}
    • *
*

@@ -139,5 +139,5 @@ public boolean ok() { - SlippyMapPreferences.setMapSource((TileSource)this.tileSourceCombo.getSelectedItem()); + SlippyMapPreferences.setMapSource((TileSource)this.tileSourceCombo.getSelectedItem()); SlippyMapPreferences.setAutozoom(this.autozoomActive.isSelected()); SlippyMapPreferences.setAutoloadTiles(this.autoloadTiles.isSelected()); Index: applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java =================================================================== --- applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java (revision 22848) +++ applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java (revision 23190) @@ -21,5 +21,5 @@ public class SlippyMapPreferences { - public static final String NO_DEFAULT_TILE_SOURCE_NAME = "{%no_default%}"; + public static final String NO_DEFAULT_TILE_SOURCE_NAME = "{%no_default%}"; public static final String PREFERENCE_PREFIX = "slippymap"; @@ -47,7 +47,7 @@ public static TileSource getMapSource(String name) { - if (NO_DEFAULT_TILE_SOURCE_NAME.equals(name)) { - return NO_DEFAULT_TILE_SOURCE; // User don't want to load slippy layer on startup - } + if (NO_DEFAULT_TILE_SOURCE_NAME.equals(name)) { + return NO_DEFAULT_TILE_SOURCE; // User don't want to load slippy layer on startup + } List sources = SlippyMapPreferences.getAllMapSources(); @@ -60,5 +60,5 @@ for (TileSource s : sources) { if (name.equals(s.getName())) - return s; + return s; } @@ -67,5 +67,5 @@ public static void setMapSource(TileSource source) { - Main.pref.put(SlippyMapPreferences.PREFERENCE_TILE_SOURCE, source == NO_DEFAULT_TILE_SOURCE?NO_DEFAULT_TILE_SOURCE_NAME:source.getName()); + Main.pref.put(SlippyMapPreferences.PREFERENCE_TILE_SOURCE, source == NO_DEFAULT_TILE_SOURCE?NO_DEFAULT_TILE_SOURCE_NAME:source.getName()); } @@ -76,5 +76,5 @@ if (autozoom == null || "".equals(autozoom)) { - autozoom = "true"; + autozoom = "true"; Main.pref.put(PREFERENCE_AUTOZOOM, autozoom); } @@ -84,16 +84,16 @@ public static void setAutozoom(boolean autozoom) { - Main.pref.put(SlippyMapPreferences.PREFERENCE_AUTOZOOM, autozoom); + Main.pref.put(SlippyMapPreferences.PREFERENCE_AUTOZOOM, autozoom); } public static void setDrawDebug(boolean drawDebug) { - Main.pref.put(SlippyMapPreferences.PREFERENCE_DRAW_DEBUG, drawDebug); + Main.pref.put(SlippyMapPreferences.PREFERENCE_DRAW_DEBUG, drawDebug); } public static void setLastZoom(int zoom) { - Main.pref.put(SlippyMapPreferences.PREFERENCE_LAST_ZOOM, ""+zoom); + Main.pref.put(SlippyMapPreferences.PREFERENCE_LAST_ZOOM, ""+zoom); } public static int getLastZoom() { - int ret = -1; + int ret = -1; String pref = Main.pref.get(SlippyMapPreferences.PREFERENCE_LAST_ZOOM); try { @@ -110,5 +110,5 @@ if (drawDebug == null || "".equals(drawDebug)) { - drawDebug = "false"; + drawDebug = "false"; Main.pref.put(PREFERENCE_DRAW_DEBUG, drawDebug); } @@ -123,5 +123,5 @@ if (autoloadTiles == null || "".equals(autoloadTiles)) { - autoloadTiles = "true"; + autoloadTiles = "true"; Main.pref.put(PREFERENCE_AUTOLOADTILES, autoloadTiles); } @@ -131,10 +131,10 @@ public static void setFadeBackground(float fadeBackground) { - Main.pref.put(SlippyMapPreferences.PREFERENCE_FADE_BACKGROUND, fadeBackground + ""); + Main.pref.put(SlippyMapPreferences.PREFERENCE_FADE_BACKGROUND, fadeBackground + ""); } /** * - * @return number between 0 and 1, inclusive + * @return number between 0 and 1, inclusive */ public static float getFadeBackground() { @@ -143,5 +143,5 @@ if (fadeBackground == null || "".equals(fadeBackground)) { - fadeBackground = "0.0"; + fadeBackground = "0.0"; Main.pref.put(PREFERENCE_FADE_BACKGROUND, fadeBackground); } @@ -149,16 +149,16 @@ float parsed; try { - parsed = Float.parseFloat(fadeBackground); + parsed = Float.parseFloat(fadeBackground); } catch (Exception ex) { - setFadeBackground(0.1f); - System.out.println("Error while parsing setting fade background to float! returning 0.1, because of error:"); - ex.printStackTrace(System.out); - return 0.1f; + setFadeBackground(0.1f); + System.out.println("Error while parsing setting fade background to float! returning 0.1, because of error:"); + ex.printStackTrace(System.out); + return 0.1f; } if(parsed < 0f) { - parsed = 0f; + parsed = 0f; } else { - if(parsed > 1f) { - parsed = 1f; + if(parsed > 1f) { + parsed = 1f; } } @@ -167,5 +167,5 @@ public static void setAutoloadTiles(boolean autoloadTiles) { - Main.pref.put(SlippyMapPreferences.PREFERENCE_AUTOLOADTILES, autoloadTiles); + Main.pref.put(SlippyMapPreferences.PREFERENCE_AUTOLOADTILES, autoloadTiles); } @@ -174,10 +174,10 @@ int pref; try { - //Should we use Main.pref.getInteger(str)? - pref = Main.pref.getInteger(prefName, def); + //Should we use Main.pref.getInteger(str)? + pref = Main.pref.getInteger(prefName, def); } catch (Exception ex) { String str = Main.pref.get(prefName); Main.pref.put(prefName, null); - throw new RuntimeException("Problem while converting string to int. " + throw new RuntimeException("Problem while converting string to int. " + "Converting value of preferences " + prefName + ". Value=\"" + str @@ -190,15 +190,15 @@ static int checkMaxZoomLvl(int maxZoomLvl) { - if(maxZoomLvl > MAX_ZOOM) { - System.err.println("MaxZoomLvl shouldnt be more than 30! Setting to 30."); - maxZoomLvl = MAX_ZOOM; - } - if(maxZoomLvl < SlippyMapPreferences.__getMinZoomLvl()) { - System.err.println("maxZoomLvl shouldnt be more than minZoomLvl! Setting to minZoomLvl."); - maxZoomLvl = SlippyMapPreferences.__getMinZoomLvl(); - } + if(maxZoomLvl > MAX_ZOOM) { + System.err.println("MaxZoomLvl shouldnt be more than 30! Setting to 30."); + maxZoomLvl = MAX_ZOOM; + } + if(maxZoomLvl < SlippyMapPreferences.__getMinZoomLvl()) { + System.err.println("maxZoomLvl shouldnt be more than minZoomLvl! Setting to minZoomLvl."); + maxZoomLvl = SlippyMapPreferences.__getMinZoomLvl(); + } TileSource ts = getMapSource(); if (ts != null && ts.getMaxZoom() < SlippyMapPreferences.__getMinZoomLvl()) { - System.err.println("decreasing maxZoomLvl to match new tile source"); + System.err.println("decreasing maxZoomLvl to match new tile source"); maxZoomLvl = ts.getMaxZoom(); } @@ -214,5 +214,5 @@ public static void setMaxZoomLvl(int maxZoomLvl) { maxZoomLvl = checkMaxZoomLvl(maxZoomLvl); - Main.pref.put(SlippyMapPreferences.PREFERENCE_MAX_ZOOM_LVL, "" + maxZoomLvl); + Main.pref.put(SlippyMapPreferences.PREFERENCE_MAX_ZOOM_LVL, "" + maxZoomLvl); } @@ -220,11 +220,11 @@ { if(minZoomLvl < MIN_ZOOM) { - System.err.println("minZoomLvl shouldnt be lees than "+MIN_ZOOM+"! Setting to that."); - minZoomLvl = MIN_ZOOM; - } - if(minZoomLvl > SlippyMapPreferences.getMaxZoomLvl()) { - System.err.println("minZoomLvl shouldnt be more than maxZoomLvl! Setting to maxZoomLvl."); - minZoomLvl = SlippyMapPreferences.getMaxZoomLvl(); - } + System.err.println("minZoomLvl shouldnt be lees than "+MIN_ZOOM+"! Setting to that."); + minZoomLvl = MIN_ZOOM; + } + if(minZoomLvl > SlippyMapPreferences.getMaxZoomLvl()) { + System.err.println("minZoomLvl shouldnt be more than maxZoomLvl! Setting to maxZoomLvl."); + minZoomLvl = SlippyMapPreferences.getMaxZoomLvl(); + } return minZoomLvl; } @@ -242,11 +242,11 @@ public static void setMinZoomLvl(int minZoomLvl) { minZoomLvl = checkMinZoomLvl(minZoomLvl); - Main.pref.put(SlippyMapPreferences.PREFERENCE_MIN_ZOOM_LVL, "" + minZoomLvl); + Main.pref.put(SlippyMapPreferences.PREFERENCE_MIN_ZOOM_LVL, "" + minZoomLvl); } public static TileSource NO_DEFAULT_TILE_SOURCE = new AbstractOsmTileSource(tr("(none)"), "") { - public TileUpdate getTileUpdate() { - return null; - } + public TileUpdate getTileUpdate() { + return null; + } }; @@ -282,10 +282,10 @@ @Override - public int getMaxZoom() { + public int getMaxZoom() { return 21; } @Override - public String getTilePath(int zoom, int tilex, int tiley) { + public String getTilePath(int zoom, int tilex, int tiley) { return "z=" + zoom + "&x=" + tilex + "&y=" + tiley; } @@ -303,11 +303,11 @@ @Override - public int getMaxZoom() { + public int getMaxZoom() { return 21; } @Override - public String getTilePath(int zoom, int tilex, int tiley) { - return "/" + zoom + "/" + tilex + "/" + tiley + ".png"; + public String getTilePath(int zoom, int tilex, int tiley) { + return "/" + zoom + "/" + tilex + "/" + tiley + ".png"; }