Changeset 1823 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2009-07-22T20:33:41+02:00 (15 years ago)

Author:

stoecker

Message:

some projection and zoom cleanups - projection classes still need better handling of outside-world coordinates

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -13 +13 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
+import java.awt.geom.GeneralPath;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
@@ -29 +30 @@
 import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -35 +37 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
@@ -295 +298 @@
         // draw world borders
         tempG.setColor(Color.WHITE);
-        ProjectionBounds b = getProjection().getWorldBounds();
-        Point min = getPoint(b.min);
-        Point max = getPoint(b.max);
-        int x1 = Math.min(min.x, max.x);
-        int y1 = Math.min(min.y, max.y);
-        int x2 = Math.max(min.x, max.x);
-        int y2 = Math.max(min.y, max.y);
-        if (x1 > 0 || y1 > 0 || x2 < getWidth() || y2 < getHeight()) {
-            tempG.drawRect(x1, y1, x2-x1+1, y2-y1+1);
+        GeneralPath path = new GeneralPath();
+        Bounds b = getProjection().getWorldBoundsLatLon();
+        double lat = b.min.lat();
+        double lon = b.min.lon();
+
+        Point p = getPoint(b.min);
+        path.moveTo(p.x, p.y);
+
+        double max = b.max.lat();
+        for(; lat <= max; lat += 1.0)
+        {
+            p = getPoint(new LatLon(lat >= max ? max : lat, lon));
+            path.lineTo(p.x, p.y);
+        }
+        lat = max; max = b.max.lon();
+        for(; lon <= max; lon += 1.0)
+        {
+            p = getPoint(new LatLon(lat, lon >= max ? max : lon));
+            path.lineTo(p.x, p.y);
+        }
+        lon = max; max = b.min.lat();
+        for(; lat >= max; lat -= 1.0)
+        {
+            p = getPoint(new LatLon(lat <= max ? max : lat, lon));
+            path.lineTo(p.x, p.y);
+        }
+        lat = max; max = b.min.lon();
+        for(; lon >= max; lon -= 1.0)
+        {
+            p = getPoint(new LatLon(lat, lon <= max ? max : lon));
+            path.lineTo(p.x, p.y);
         }
 
@@ -309 +334 @@
             playHeadMarker.paint(tempG, this);
         }
+        tempG.draw(path);
 
         g.drawImage(offscreenBuffer, 0, 0, null);
@@ -322 +348 @@
         }
         if (box.getBounds() == null) {
-            box.visit(getProjection().getWorldBounds());
+            box.visit(getProjection().getWorldBoundsLatLon());
         }
         if (!box.hasExtend()) {