Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 18772) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 18890) @@ -21,5 +21,5 @@ import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker; -import org.openstreetmap.gui.jmapviewer.interfaces.MapSquare; +import org.openstreetmap.gui.jmapviewer.interfaces.MapRectangle; import org.openstreetmap.gui.jmapviewer.interfaces.TileCache; import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; @@ -48,8 +48,8 @@ protected List mapMarkerList; - protected List mapSquareList; + protected List mapRectangleList; protected boolean mapMarkersVisible; - protected boolean mapSquaresVisible; + protected boolean mapRectanglesVisible; protected boolean tileGridVisible; @@ -88,7 +88,7 @@ tileController = new TileController(new OsmTileSource.Mapnik(), tileCache, this); mapMarkerList = new LinkedList(); - mapSquareList = new LinkedList(); + mapRectangleList = new LinkedList(); mapMarkersVisible = true; - mapSquaresVisible = true; + mapRectanglesVisible = true; tileGridVisible = false; setLayout(null); @@ -255,6 +255,6 @@ * visible. */ - public void setDisplayToFitMapSquares() { - if (mapSquareList == null || mapSquareList.size() == 0) { + public void setDisplayToFitMapRectangle() { + if (mapRectangleList == null || mapRectangleList.size() == 0) { return; } @@ -264,9 +264,9 @@ int y_max = Integer.MIN_VALUE; int mapZoomMax = tileController.getTileSource().getMaxZoom(); - for (MapSquare square : mapSquareList) { - x_max = Math.max(x_max, OsmMercator.LonToX(square.getBottomRight().getLon(), mapZoomMax)); - y_max = Math.max(y_max, OsmMercator.LatToY(square.getTopLeft().getLat(), mapZoomMax)); - x_min = Math.min(x_min, OsmMercator.LonToX(square.getTopLeft().getLon(), mapZoomMax)); - y_min = Math.min(y_min, OsmMercator.LatToY(square.getBottomRight().getLat(), mapZoomMax)); + for (MapRectangle rectangle : mapRectangleList) { + x_max = Math.max(x_max, OsmMercator.LonToX(rectangle.getBottomRight().getLon(), mapZoomMax)); + y_max = Math.max(y_max, OsmMercator.LatToY(rectangle.getTopLeft().getLat(), mapZoomMax)); + x_min = Math.min(x_min, OsmMercator.LonToX(rectangle.getTopLeft().getLon(), mapZoomMax)); + y_min = Math.min(y_min, OsmMercator.LatToY(rectangle.getBottomRight().getLat(), mapZoomMax)); } int height = Math.max(0, getHeight()); @@ -448,13 +448,13 @@ // g.drawString("Tiles in cache: " + tileCache.getTileCount(), 50, 20); - if (mapSquaresVisible && mapSquareList != null) { - for (MapSquare square : mapSquareList) { - Coordinate topLeft = square.getTopLeft(); - Coordinate bottomRight = square.getBottomRight(); + if (mapRectanglesVisible && mapRectangleList != null) { + for (MapRectangle rectangle : mapRectangleList) { + Coordinate topLeft = rectangle.getTopLeft(); + Coordinate bottomRight = rectangle.getBottomRight(); if (topLeft != null && bottomRight != null) { Point pTopLeft = getMapPosition(topLeft.getLat(), topLeft.getLon(), false); Point pBottomRight = getMapPosition(bottomRight.getLat(), bottomRight.getLon(), false); if (pTopLeft != null && pBottomRight != null) { - square.paint(g, pTopLeft, pBottomRight); + rectangle.paint(g, pTopLeft, pBottomRight); } } @@ -522,5 +522,6 @@ public void setZoom(int zoom, Point mapPoint) { - if (zoom > tileController.getTileSource().getMaxZoom() || zoom < tileController.getTileSource().getMinZoom() || zoom == this.zoom) + if (zoom > tileController.getTileSource().getMaxZoom() || zoom < tileController.getTileSource().getMinZoom() + || zoom == this.zoom) return; Coordinate zoomPos = getPosition(mapPoint); @@ -584,11 +585,11 @@ } - public void setMapSquareList(List mapSquareList) { - this.mapSquareList = mapSquareList; - repaint(); - } - - public List getMapSquareList() { - return mapSquareList; + public void setMapRectangleList(List mapRectangleList) { + this.mapRectangleList = mapRectangleList; + repaint(); + } + + public List getMapRectangleList() { + return mapRectangleList; } @@ -598,11 +599,11 @@ } - public void addMapSquare(MapSquare square) { - mapSquareList.add(square); - repaint(); - } - - public void removeMapSquare(MapSquare square) { - mapSquareList.remove(square); + public void addMapRectangle(MapRectangle rectangle) { + mapRectangleList.add(rectangle); + repaint(); + } + + public void removeMapRectangle(MapRectangle rectangle) { + mapRectangleList.remove(rectangle); repaint(); } @@ -636,17 +637,17 @@ } - public boolean isMapSquaresVisible() { - return mapSquaresVisible; - } - - /** - * Enables or disables painting of the {@link MapSquare} + public boolean isMapRectanglesVisible() { + return mapRectanglesVisible; + } + + /** + * Enables or disables painting of the {@link MapRectangle} * * @param mapMarkersVisible - * @see #addMapSquare(MapSquare) - * @see #getMapSquareList() - */ - public void setMapSquaresVisible(boolean mapSquaresVisible) { - this.mapSquaresVisible = mapSquaresVisible; + * @see #addMapRectangle(MapRectangle) + * @see #getMapRectangleList() + */ + public void setMapRectanglesVisible(boolean mapRectanglesVisible) { + this.mapRectanglesVisible = mapRectanglesVisible; repaint(); } Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java (revision 18890) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java (revision 18890) @@ -0,0 +1,39 @@ +package org.openstreetmap.gui.jmapviewer.interfaces; + +//License: GPL. Copyright 2009 by Stefan Zeller + +import java.awt.Graphics; +import java.awt.Point; + +import org.openstreetmap.gui.jmapviewer.Coordinate; +import org.openstreetmap.gui.jmapviewer.JMapViewer; + +/** + * Interface to be implemented by rectangles that can be displayed on the map. + * + * @author Stefan Zeller + * @see JMapViewer#addMapRectangle(MapRectangle) + * @see JMapViewer#getMapRectangleList() + * @date 21.06.2009S + */ +public interface MapRectangle { + + /** + * @return Latitude/Longitude of top left of rectangle + */ + public Coordinate getTopLeft(); + + /** + * @return Latitude/Longitude of bottom right of rectangle + */ + public Coordinate getBottomRight(); + + /** + * Paints the map rectangle on the map. The topLeft and + * bottomRight are specifying the coordinates within g + * + * @param g + * @param position + */ + public void paint(Graphics g, Point topLeft, Point bottomRight); +} Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapSquare.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapSquare.java (revision 18772) +++ (revision ) @@ -1,39 +1,0 @@ -package org.openstreetmap.gui.jmapviewer.interfaces; - -//License: GPL. Copyright 2009 by Stefan Zeller - -import java.awt.Graphics; -import java.awt.Point; - -import org.openstreetmap.gui.jmapviewer.Coordinate; -import org.openstreetmap.gui.jmapviewer.JMapViewer; - -/** - * Interface to be implemented by squares that can be displayed on the map. - * - * @author Stefan Zeller - * @see JMapViewer#addMapSquare(MapSquare) - * @see JMapViewer#getMapSquareList() - * @date 21.06.2009S - */ -public interface MapSquare { - - /** - * @return Latitude/Longitude of top left of square - */ - public Coordinate getTopLeft(); - - /** - * @return Latitude/Longitude of bottom right of square - */ - public Coordinate getBottomRight(); - - /** - * Paints the map square on the map. The topLeft and - * bottomRight specifies the coordinates within g - * - * @param g - * @param position - */ - public void paint(Graphics g, Point topLeft, Point bottomRight); -}