Changeset 16032 in osm for applications/viewer/jmapviewer/src/org

Timestamp:

2009-06-21T12:38:54+02:00 (16 years ago)

Author:

szeller

Message:

added Coordinate, the interface MapSquare. MapSquares will be painted before MapSquares to avoid overlapping of them

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• Coordinate.java (added)
• JMapViewer.java (modified) (9 diffs)
• interfaces/MapMarker.java (modified) (1 diff)
• interfaces/MapSquare.java (added)

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

@@ -10 +10 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.geom.Point2D;
 import java.util.LinkedList;
 import java.util.List;
@@ -23 +22 @@
 import org.openstreetmap.gui.jmapviewer.JobDispatcher.JobThread;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
+import org.openstreetmap.gui.jmapviewer.interfaces.MapSquare;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -53 +53 @@
 
     protected List<MapMarker> mapMarkerList;
+    protected List<MapSquare> mapSquareList;
+
     protected boolean mapMarkersVisible;
+    protected boolean mapSquaresVisible;
+
     protected boolean tileGridVisible;
 
@@ -92 +96 @@
         jobDispatcher = JobDispatcher.getInstance();
         mapMarkerList = new LinkedList<MapMarker>();
+        mapSquareList = new LinkedList<MapSquare>();
         mapMarkersVisible = true;
+        mapSquaresVisible = true;
         tileGridVisible = false;
         setLayout(null);
@@ -253 +259 @@
     }
 
-    public Point2D.Double getPosition() {
+    public Coordinate getPosition() {
         double lon = OsmMercator.XToLon(center.x, zoom);
         double lat = OsmMercator.YToLat(center.y, zoom);
-        return new Point2D.Double(lat, lon);
-    }
-
-    public Point2D.Double getPosition(Point mapPoint) {
+        return new Coordinate(lat, lon);
+    }
+
+    public Coordinate getPosition(Point mapPoint) {
         int x = center.x + mapPoint.x - getWidth() / 2;
         int y = center.y + mapPoint.y - getHeight() / 2;
         double lon = OsmMercator.XToLon(x, zoom);
         double lat = OsmMercator.YToLat(y, zoom);
-        return new Point2D.Double(lat, lon);
+        return new Coordinate(lat, lon);
+    }
+
+    public Coordinate getPosition(int mapPointX, int mapPointY) {
+        int x = center.x + mapPointX - getWidth() / 2;
+        int y = center.y + mapPointY - getHeight() / 2;
+        double lon = OsmMercator.XToLon(x, zoom);
+        double lat = OsmMercator.YToLat(y, zoom);
+        return new Coordinate(lat, lon);
     }
 
@@ -357 +371 @@
 
         // g.drawString("Tiles in cache: " + tileCache.getTileCount(), 50, 20);
-        if (!mapMarkersVisible || mapMarkerList == null)
-            return;
-        for (MapMarker marker : mapMarkerList) {
-            Point p = getMapPosition(marker.getLat(), marker.getLon());
-            // System.out.println(marker + " -> " + p);
-            if (p != null)
-                marker.paint(g, p);
+
+        if (mapSquaresVisible && mapSquareList != null) {
+            for (MapSquare square : mapSquareList) {
+                Coordinate topLeft = square.getTopLeft();
+                Coordinate bottomRight = square.getBottomRight();
+                if (topLeft != null && bottomRight != null) {
+                    Point pTopLeft = getMapPosition(topLeft.getLat(), topLeft.getLon());
+                    Point pBottomRight = getMapPosition(bottomRight.getLat(), bottomRight.getLon());
+                    if (pTopLeft != null && pBottomRight != null) {
+                        square.paint(g, pTopLeft, pBottomRight);
+                    }
+                }
+            }
+        }
+
+        if (mapMarkersVisible && mapMarkerList != null) {
+            for (MapMarker marker : mapMarkerList) {
+                Point p = getMapPosition(marker.getLat(), marker.getLon());
+                if (p != null) {
+                    marker.paint(g, p);
+                }
+            }
         }
     }
@@ -419 +448 @@
         if (zoom > tileSource.getMaxZoom() || zoom < tileSource.getMinZoom() || zoom == this.zoom)
             return;
-        Point2D.Double zoomPos = getPosition(mapPoint);
+        Coordinate zoomPos = getPosition(mapPoint);
         jobDispatcher.cancelOutstandingJobs(); // Clearing outstanding load
         // requests
-        setDisplayPositionByLatLon(mapPoint, zoomPos.x, zoomPos.y, zoom);
+        setDisplayPositionByLatLon(mapPoint, zoomPos.getLat(), zoomPos.getLon(), zoom);
     }
 
@@ -505 +534 @@
     }
 
+    public void setMapSquareList(List<MapSquare> mapSquareList) {
+        this.mapSquareList = mapSquareList;
+        repaint();
+    }
+
+    public List<MapSquare> getMapSquareList() {
+        return mapSquareList;
+    }
+
     public void addMapMarker(MapMarker marker) {
         mapMarkerList.add(marker);
+        repaint();
+    }
+
+    public void addMapSquare(MapSquare square) {
+        mapSquareList.add(square);
+        repaint();
+    }
+
+    public void removeMapSquare(MapSquare square) {
+        mapSquareList.remove(square);
+        repaint();
     }
 
@@ -557 +606 @@
     }
 
+    public boolean isMapSquaresVisible() {
+        return mapSquaresVisible;
+    }
+
+    /**
+     * Enables or disables painting of the {@link MapSquare}
+     * 
+     * @param mapMarkersVisible
+     * @see #addMapSquare(MapSquare)
+     * @see #getMapSquareList()
+     */
+    public void setMapSquaresVisible(boolean mapSquaresVisible) {
+        this.mapSquaresVisible = mapSquaresVisible;
+        repaint();
+    }
 }

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

@@ -9 +9 @@
 
 /**
- * Interface to be implemented by all elements that can be displayed on the map.
+ * Interface to be implemented by all one dimensional elements that can be displayed on the map.
  * 
  * @author Jan Peter Stotz