Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java (revision 29757) @@ -27,5 +27,5 @@ public static final Font ATTR_FONT = new Font("Arial", Font.PLAIN, 10); public static final Font ATTR_LINK_FONT; - + protected Rectangle attrTextBounds = null; protected Rectangle attrToUBounds = null; @@ -59,7 +59,7 @@ attrImageBounds = null; attrTextBounds = null; - return; + return; } - + // Draw attribution Font font = g.getFont(); @@ -128,5 +128,5 @@ return false; } - + public boolean handleAttribution(Point p, boolean click) { if (source == null || !source.requiresAttribution()) Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java (revision 29757) @@ -198,10 +198,10 @@ map().addMapPolygon( bermudas ); map().addMapPolygon( new MapPolygonImpl(germanyEastLayer, "Riedstadt", ebersheim, darmstadt, eberstadt, empty)); - + map().addMapMarker(new MapMarkerCircle(germanyWestLayer, "North of Suisse", new Coordinate(48, 7), .5)); Layer spain = treeMap.addLayer("Spain"); map().addMapMarker(new MapMarkerCircle(spain, "La Garena", new Coordinate(40.4838, -3.39), .002)); spain.setVisible(false); - + Layer wales = treeMap.addLayer("UK"); map().addMapRectangle(new MapRectangleImpl(wales, "Wales", c(53.35,-4.57), c(51.64,-2.63))); @@ -209,5 +209,5 @@ // map.setDisplayPositionByLatLon(49.807, 8.6, 11); // map.setTileGridVisible(true); - + map().addMouseListener(new MouseAdapter() { @Override @@ -218,5 +218,5 @@ } }); - + map().addMouseMotionListener(new MouseAdapter() { @Override Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 29757) @@ -82,5 +82,5 @@ protected JButton zoomInButton; protected JButton zoomOutButton; - + public static enum ZOOM_BUTTON_STYLE { HORIZONTAL, @@ -425,5 +425,5 @@ return new Point(x, y); } - + /** * Calculates the position on the map of a given coordinate @@ -454,5 +454,5 @@ return getMapPosition(lat, lon, true); } - + /** * Calculates the position on the map of a given coordinate @@ -561,5 +561,5 @@ int x_max = getWidth(); int y_max = getHeight(); - + // calculate the length of the grid (number of squares per edge) int gridLength = 1 << zoom; @@ -617,5 +617,5 @@ center.x = center.x % mapSize; } - + if (mapPolygonsVisible && mapPolygonList != null) { for (MapPolygon polygon : mapPolygonList) { @@ -704,5 +704,5 @@ rectangle.paint(g, pTopLeft, pBottomRight); } - + } } @@ -1010,18 +1010,18 @@ repaint(); } - + public boolean isScrollWrapEnabled() { return scrollWrapEnabled; } - + public void setScrollWrapEnabled(boolean scrollWrapEnabled) { this.scrollWrapEnabled = scrollWrapEnabled; repaint(); } - + public ZOOM_BUTTON_STYLE getZoomButtonStyle() { return zoomButtonStyle; } - + public void setZoomButtonStyle(ZOOM_BUTTON_STYLE style) { zoomButtonStyle = style; @@ -1052,5 +1052,5 @@ return tileController; } - + /** * Return tile information caching class Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java (revision 29757) @@ -61,9 +61,9 @@ return coord.getLon(); } - + public double getRadius() { return radius; } - + public STYLE getMarkerStyle() { return markerStyle; @@ -73,5 +73,5 @@ int size_h = radio; int size = size_h * 2; - + if (g instanceof Graphics2D && getBackColor()!=null) { Graphics2D g2 = (Graphics2D) g; @@ -84,5 +84,5 @@ g.setColor(getColor()); g.drawOval(position.x - size_h, position.y - size_h, size, size); - + if(getLayer()==null||getLayer().isVisibleTexts()) paintText(g, position); } Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java (revision 29757) @@ -47,5 +47,5 @@ super(layer, name, coord, DOT_RADIUS, STYLE.FIXED, style); } - + public static Style getDefaultStyle(){ return new Style(Color.BLACK, Color.YELLOW, null, getDefaultFont()); Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java (revision 29757) @@ -80,5 +80,5 @@ Color oldColor = g.getColor(); g.setColor(getColor()); - + Stroke oldStroke = null; if (g instanceof Graphics2D) { Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java (revision 29757) @@ -55,5 +55,5 @@ protected String cacheDirBase; - + protected final Map sourceCacheDirMap; @@ -128,5 +128,5 @@ return dir; } - + protected class FileLoadJob implements TileJob { InputStream input = null; @@ -342,5 +342,5 @@ * * - * @param fileAge time of the + * @param fileAge time of the * @return true if the tile on the server is newer than the * file @@ -492,10 +492,10 @@ this.cacheDirBase = dir.getAbsolutePath(); } - + @Override public void clearCache(TileSource source) { clearCache(source, null); } - + @Override public void clearCache(TileSource source, TileClearController controller) { Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java (revision 29757) @@ -19,5 +19,5 @@ public static final double MAX_LAT = 85.05112877980659; public static final double MIN_LAT = -85.05112877980659; - private static double EARTH_RADIUS = 6378137; // equatorial earth radius for EPSG:3857 (Mercator) + private static double EARTH_RADIUS = 6378137; // equatorial earth radius for EPSG:3857 (Mercator) public static double radius(int aZoomlevel) { @@ -51,5 +51,5 @@ * @param x2 the second x coordinate * @param y2 the second y coordinate - * + * * @param zoomLevel the zoom level * @return the distance @@ -85,5 +85,5 @@ * Math.cos(aEndLong - aStartLong)); - return (EARTH_RADIUS * distance); + return (EARTH_RADIUS * distance); } Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java (revision 29757) @@ -60,5 +60,5 @@ try { tile.loadImage(input); - } finally { + } finally { input.close(); input = null; Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java (revision 29757) @@ -284,9 +284,9 @@ /** * Puts the given key/value pair to the metadata of the tile. - * If value is null, the (possibly existing) key/value pair is removed from + * If value is null, the (possibly existing) key/value pair is removed from * the meta data. - * + * * @param key - * @param value + * @param value */ public void putValue(String key, String value) { Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/events/JMVCommandEvent.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/events/JMVCommandEvent.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/events/JMVCommandEvent.java (revision 29757) @@ -8,5 +8,5 @@ * Used for passing events between UI components and other * objects that register as a JMapViewerEventListener - * + * * @author Jason Huntley * @@ -20,5 +20,5 @@ private COMMAND command; /** - * + * */ private static final long serialVersionUID = 8701544867914969620L; Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/JMapViewerEventListener.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/JMapViewerEventListener.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/JMapViewerEventListener.java (revision 29757) @@ -10,9 +10,9 @@ * Must be implemented for processing commands while user * interacts with map viewer. - * + * * @author Jason Huntley * */ public interface JMapViewerEventListener extends EventListener { - public void processCommand(JMVCommandEvent command); + public void processCommand(JMVCommandEvent command); } Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java (revision 29757) @@ -33,10 +33,10 @@ */ public double getLon(); - + /** * @return Radius of the map marker position */ public double getRadius(); - + /** * @return Style of the map marker Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java (revision 29757) @@ -20,5 +20,5 @@ /** - * Paints the map rectangle on the map. The points + * Paints the map rectangle on the map. The points * are specifying the coordinates within g * @@ -29,5 +29,5 @@ /** - * Paints the map rectangle on the map. The polygon + * Paints the map rectangle on the map. The polygon * is specifying the coordinates within g * Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java (revision 29731) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java (revision 29757) @@ -65,7 +65,7 @@ } - private static double RADIUS_E = 6378137; /* radius of Earth at equator, m */ + private static double RADIUS_E = 6378137; /* radius of Earth at equator, m */ private static double EQUATOR = 40075016.68557849; /* equator length, m */ - private static double E = 0.0818191908426; /* eccentricity of Earth's ellipsoid */ + private static double E = 0.0818191908426; /* eccentricity of Earth's ellipsoid */ @Override @@ -93,10 +93,10 @@ @Override public double tileYToLat(int y, int zoom) { - Random r= new Random(); + Random r= new Random(); double lat0, lat; - lat = cached_lat; - do { - lat0 = lat; + lat = cached_lat; + do { + lat0 = lat; lat = lat - Math.toDegrees(NextTerm(Math.toRadians(lat), y, zoom)); if (lat > OsmMercator.MAX_LAT || lat < OsmMercator.MIN_LAT) { @@ -105,7 +105,7 @@ OsmMercator.MIN_LAT)); } - } while ((Math.abs(lat0 - lat) > 0.000001)); + } while ((Math.abs(lat0 - lat) > 0.000001)); - cached_lat = lat; + cached_lat = lat; return (lat); @@ -116,11 +116,11 @@ double sinl=Math.sin(lat); double cosl=Math.cos(lat); - double ec, f, df; + double ec, f, df; zoom = (int )Math.pow(2.0, zoom - 1); - ec = Math.exp((1 - y/zoom)*Math.PI); + ec = Math.exp((1 - y/zoom)*Math.PI); - f = (Math.tan(Math.PI/4+lat/2) - - ec * Math.pow(Math.tan(Math.PI/4 + Math.asin(E * sinl)/2), E)); + f = (Math.tan(Math.PI/4+lat/2) - + ec * Math.pow(Math.tan(Math.PI/4 + Math.asin(E * sinl)/2), E)); df = 1/(1 - sinl) - ec * E * cosl/((1 - E * sinl) * (Math.sqrt (1 - E * E * sinl * sinl)));