Changeset 18890 in osm for applications/viewer/jmapviewer/src

Timestamp:

2009-12-02T10:14:02+01:00 (15 years ago)

Author:

stotz

Message:

The name "square" in MapSquare was a bit misleading - of course rectangles are possible. All occurence of "square" has been replaced by "rectangle"

Location:

applications/viewer/jmapviewer

Files:

• . (modified) (1 prop)
• src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (modified) (10 diffs)
• src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java (moved) (moved from applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapSquare.java ) (1 diff)

applications/viewer/jmapviewer

@@ -1 @@
-tiles
+JMapViewer.jar
 JMapViewer_Demo.jar
 JMapViewer_src.jar
-JMapViewer.jar
+bin
+tiles

@@ -1 @@
-tiles
+JMapViewer.jar
 JMapViewer_Demo.jar
 JMapViewer_src.jar
-JMapViewer.jar
+bin
+tiles

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -21 +21 @@
 
 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 +48 @@
 
     protected List<MapMarker> mapMarkerList;
-    protected List<MapSquare> mapSquareList;
+    protected List<MapRectangle> mapRectangleList;
 
     protected boolean mapMarkersVisible;
-    protected boolean mapSquaresVisible;
+    protected boolean mapRectanglesVisible;
 
     protected boolean tileGridVisible;
@@ -88 +88 @@
         tileController = new TileController(new OsmTileSource.Mapnik(), tileCache, this);
         mapMarkerList = new LinkedList<MapMarker>();
-        mapSquareList = new LinkedList<MapSquare>();
+        mapRectangleList = new LinkedList<MapRectangle>();
         mapMarkersVisible = true;
-        mapSquaresVisible = true;
+        mapRectanglesVisible = true;
         tileGridVisible = false;
         setLayout(null);
@@ -255 +255 @@
      * visible.
      */
-    public void setDisplayToFitMapSquares() {
-        if (mapSquareList == null || mapSquareList.size() == 0) {
+    public void setDisplayToFitMapRectangle() {
+        if (mapRectangleList == null || mapRectangleList.size() == 0) {
             return;
         }
@@ -264 +264 @@
         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 +448 @@
         // 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 +522 @@
 
     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 +585 @@
     }
 
-    public void setMapSquareList(List<MapSquare> mapSquareList) {
-        this.mapSquareList = mapSquareList;
-        repaint();
-    }
-
-    public List<MapSquare> getMapSquareList() {
-        return mapSquareList;
+    public void setMapRectangleList(List<MapRectangle> mapRectangleList) {
+        this.mapRectangleList = mapRectangleList;
+        repaint();
+    }
+
+    public List<MapRectangle> getMapRectangleList() {
+        return mapRectangleList;
     }
 
@@ -598 +599 @@
     }
 
-    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 +637 @@
     }
 
-    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();
     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java

@@ -10 +10 @@
 
 /**
- * Interface to be implemented by squares that can be displayed on the map.
+ * Interface to be implemented by rectangles that can be displayed on the map.
  *
  * @author Stefan Zeller
- * @see JMapViewer#addMapSquare(MapSquare)
- * @see JMapViewer#getMapSquareList()
+ * @see JMapViewer#addMapRectangle(MapRectangle)
+ * @see JMapViewer#getMapRectangleList()
  * @date 21.06.2009S
  */
-public interface MapSquare {
+public interface MapRectangle {
 
     /**
-     * @return Latitude/Longitude of top left of square
+     * @return Latitude/Longitude of top left of rectangle
      */
     public Coordinate getTopLeft();
 
     /**
-     * @return Latitude/Longitude of bottom right of square
+     * @return Latitude/Longitude of bottom right of rectangle
      */
     public Coordinate getBottomRight();
 
     /**
-     * Paints the map square on the map. The <code>topLeft</code> and
-     * <code>bottomRight</code> specifies the coordinates within <code>g</code>
+     * Paints the map rectangle on the map. The <code>topLeft</code> and
+     * <code>bottomRight</code> are specifying the coordinates within <code>g</code>
      *
      * @param g

@@ -1 @@
-tiles
+JMapViewer.jar
 JMapViewer_Demo.jar
 JMapViewer_src.jar
-JMapViewer.jar
+bin
+tiles