Changeset 1823 in josm

Timestamp:

Jul 22, 2009 8:33:41 PM (4 years ago)

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (5 diffs)
• data/projection/Epsg4326.java (modified) (1 diff)
• data/projection/Lambert.java (modified) (1 diff)
• data/projection/LambertEST.java (modified) (1 diff)
• data/projection/Mercator.java (modified) (1 diff)
• data/projection/Projection.java (modified) (1 diff)
• data/projection/SwissGrid.java (modified) (1 diff)
• data/projection/UTM.java (modified) (1 diff)
• gui/MapSlider.java (modified) (2 diffs)
• gui/MapView.java (modified) (6 diffs)
• gui/NavigatableComponent.java (modified) (7 diffs)
• gui/layer/OsmDataLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -628 +628 @@
      */
     private void computeHelperLine() {
+        MapView mv = Main.map.mapView;
         if (mousePos == null) {
             // Don't draw the line.
@@ -651 +652 @@
 
         if (!ctrl && mousePos != null) {
-            currentMouseNode = Main.map.mapView.getNearestNode(mousePos);
+            currentMouseNode = mv.getNearestNode(mousePos);
         }
 
@@ -657 +658 @@
         // *and* there is no node nearby (because nodes beat ways when re-using)
         if(!ctrl && currentMouseNode == null) {
-            List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(mousePos);
+            List<WaySegment> wss = mv.getNearestWaySegments(mousePos);
             for(WaySegment ws : wss) {
                 mouseOnExistingWays.add(ws.way);
@@ -670 +671 @@
         } else {
             // no node found in clicked area
-            currentMouseEastNorth = Main.map.mapView.getEastNorth(mousePos.x, mousePos.y);
+            currentMouseEastNorth = mv.getEastNorth(mousePos.x, mousePos.y);
         }
 
@@ -708 +709 @@
 
         // find out the distance, in metres, between the base point and the mouse cursor
-        LatLon mouseLatLon = Main.proj.eastNorth2latlon(currentMouseEastNorth);
+        LatLon mouseLatLon = mv.getProjection().eastNorth2latlon(currentMouseEastNorth);
         distance = currentBaseNode.getCoor().greatCircleDistance(mouseLatLon);
         double hdg = Math.toDegrees(currentBaseNode.getCoor().heading(mouseLatLon));

trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.java

@@ -36 +36 @@
     }
 
-    public ProjectionBounds getWorldBounds()
-    {
-        Bounds b = getWorldBoundsLatLon();
-        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
-    }
-
     public Bounds getWorldBoundsLatLon()
     {

trunk/src/org/openstreetmap/josm/data/projection/Lambert.java

@@ -277 +277 @@
     }
 
-    public ProjectionBounds getWorldBounds()
-    {
-        Bounds b = getWorldBoundsLatLon();
-        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
-    }
-
     public Bounds getWorldBoundsLatLon()
     {

trunk/src/org/openstreetmap/josm/data/projection/LambertEST.java

@@ -107 +107 @@
     }
 
-    public ProjectionBounds getWorldBounds()
-    {
-        Bounds b = getWorldBoundsLatLon();
-        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
-    }
-
     public Bounds getWorldBoundsLatLon()
     {

trunk/src/org/openstreetmap/josm/data/projection/Mercator.java

@@ -47 +47 @@
     }
 
-    public ProjectionBounds getWorldBounds()
-    {
-        Bounds b = getWorldBoundsLatLon();
-        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
-    }
-
     public Bounds getWorldBoundsLatLon()
     {

trunk/src/org/openstreetmap/josm/data/projection/Projection.java

@@ -63 +63 @@
      * Get the bounds of the world
      */
-    ProjectionBounds getWorldBounds();
     Bounds getWorldBoundsLatLon();
 }

trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java

@@ -101 +101 @@
     }
 
-    public ProjectionBounds getWorldBounds()
-    {
-        Bounds b = getWorldBoundsLatLon();
-        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
-    }
-
     public Bounds getWorldBoundsLatLon()
     {

trunk/src/org/openstreetmap/josm/data/projection/UTM.java

@@ -354 +354 @@
     }
 
-    public ProjectionBounds getWorldBounds()
-    {
-        Bounds b = getWorldBoundsLatLon();
-        return new ProjectionBounds(latlon2eastNorth(b.min), latlon2eastNorth(b.max));
-    }
-
     public Bounds getWorldBoundsLatLon()
     {

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

@@ -30 +30 @@
         if (getModel().getValueIsAdjusting()) return;
 
-        ProjectionBounds world = Main.proj.getWorldBounds();
+        ProjectionBounds world = this.mv.getMaxProjectionBounds();
         ProjectionBounds current = this.mv.getProjectionBounds();
 
@@ -54 +54 @@
         if (preventChange) return;
 
-        ProjectionBounds world = Main.proj.getWorldBounds();
+        ProjectionBounds world = this.mv.getMaxProjectionBounds();
         double fact = Math.pow(1.1, getValue());
         double es = world.max.east()-world.min.east();

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()) {

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

@@ -72 +72 @@
     public double getDist100Pixel()
     {
-        LatLon ll1 = getLatLon(0,0);
-        LatLon ll2 = getLatLon(100,0);
+        int w = getWidth()/2;
+        int h = getHeight()/2;
+        LatLon ll1 = getLatLon(w-50,h);
+        LatLon ll2 = getLatLon(w+50,h);
         return ll1.greatCircleDistance(ll2);
     }
@@ -103 +105 @@
                         center.east() - getWidth()/2.0*scale,
                         center.north() - getHeight()/2.0*scale),
-                        new EastNorth(
-                                center.east() + getWidth()/2.0*scale,
-                                center.north() + getHeight()/2.0*scale));
+                new EastNorth(
+                        center.east() + getWidth()/2.0*scale,
+                        center.north() + getHeight()/2.0*scale));
     };
 
+    /* FIXME: replace with better method - used by MapSlider */
+    public ProjectionBounds getMaxProjectionBounds() {
+        Bounds b = getProjection().getWorldBoundsLatLon();
+        return new ProjectionBounds(getProjection().latlon2eastNorth(b.min),
+            getProjection().latlon2eastNorth(b.max));
+    };
+
+    /* FIXME: replace with better method - used by Main to reset Bounds when projection changes, don't use otherwise */
     public Bounds getRealBounds() {
         return new Bounds(
@@ -113 +123 @@
                         center.east() - getWidth()/2.0*scale,
                         center.north() - getHeight()/2.0*scale)),
-                        getProjection().eastNorth2latlon(new EastNorth(
-                                center.east() + getWidth()/2.0*scale,
-                                center.north() + getHeight()/2.0*scale)));
+                getProjection().eastNorth2latlon(new EastNorth(
+                        center.east() + getWidth()/2.0*scale,
+                        center.north() + getHeight()/2.0*scale)));
     };
 
@@ -161 +171 @@
      */
     private void zoomTo(EastNorth newCenter, double newScale) {
-        /* TODO: check that newCenter is really inside visible world and that scale is correct, don't allow zooming out to much */
         boolean rep = false;
+
+        Bounds b = getProjection().getWorldBoundsLatLon();
+        CachedLatLon cl = new CachedLatLon(newCenter);
+        boolean changed = false;;
+        double lat = cl.lat();
+        double lon = cl.lon();
+        if(lat < b.min.lat()) {changed = true; lat = b.min.lat(); }
+        else if(lat > b.max.lat()) {changed = true; lat = b.max.lat(); }
+        if(lon < b.min.lon()) {changed = true; lon = b.min.lon(); }
+        else if(lon > b.max.lon()) {changed = true; lon = b.max.lon(); }
+        if(changed)
+          newCenter = new CachedLatLon(lat, lon).getEastNorth();
         if (!newCenter.equals(center)) {
             EastNorth oldCenter = center;
@@ -169 +190 @@
             firePropertyChange("center", oldCenter, newCenter);
         }
+
+        int width = getWidth()/2;
+        int height = getHeight()/2;
+        LatLon l1 = new LatLon(b.min.lat(), lon);
+        LatLon l2 = new LatLon(b.max.lat(), lon);
+        EastNorth e1 = getProjection().latlon2eastNorth(l1);
+        EastNorth e2 = getProjection().latlon2eastNorth(l2);
+        double d = e2.north() - e1.north();
+        if(d < height*newScale)
+        {
+            double newScaleH = d/height;
+            e1 = getProjection().latlon2eastNorth(new LatLon(lat, b.min.lon()));
+            e2 = getProjection().latlon2eastNorth(new LatLon(lat, b.max.lon()));
+            d = e2.east() - e1.east();
+            if(d < width*newScale)
+                newScale = Math.max(newScaleH, d/width);
+        }
+        else
+        {
+            d = d/(l1.greatCircleDistance(l2)*height*10);
+            if(newScale < d)
+                newScale = d;
+        }
         if (scale != newScale) {
             double oldScale = scale;
@@ -175 +219 @@
             firePropertyChange("scale", oldScale, newScale);
         }
+
         if(rep) {
             repaint();
@@ -461 +506 @@
      * @return The projection to be used in calculating stuff.
      */
-    protected Projection getProjection() {
+    public Projection getProjection() {
         return Main.proj;
     }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -196 +196 @@
      */
     @Override public void paint(final Graphics g, final MapView mv) {
-        boolean active = Main.map.mapView.getActiveLayer() == this;
+        boolean active = mv.getActiveLayer() == this;
         boolean inactive = !active && Main.pref.getBoolean("draw.data.inactive_color", true);
-        boolean virtual = !inactive && Main.map.mapView.isVirtualNodesEnabled();
+        boolean virtual = !inactive && mv.isVirtualNodesEnabled();
 
         // draw the hatched area for non-downloaded region. only draw if we're the active
@@ -204 +204 @@
         if (active && Main.pref.getBoolean("draw.data.downloaded_area", true) && !data.dataSources.isEmpty()) {
             // initialize area with current viewport
-            Rectangle b = Main.map.mapView.getBounds();
+            Rectangle b = mv.getBounds();
             // on some platforms viewport bounds seem to be offset from the left,
             // over-grow it just to be sure
@@ -213 +213 @@
             for (DataSource src : data.dataSources) {
                 if (src.bounds != null && !src.bounds.min.equals(src.bounds.max)) {
-                    EastNorth en1 = Main.proj.latlon2eastNorth(src.bounds.min);
-                    EastNorth en2 = Main.proj.latlon2eastNorth(src.bounds.max);
+                    EastNorth en1 = mv.getProjection().latlon2eastNorth(src.bounds.min);
+                    EastNorth en2 = mv.getProjection().latlon2eastNorth(src.bounds.max);
                     Point p1 = mv.getPoint(en1);
                     Point p2 = mv.getPoint(en2);
@@ -536 +536 @@
     /**
      * replies the set of conflicts currently managed in this layer
-     * 
+     *
      * @return the set of conflicts currently managed in this layer
      */