Revision 39608 branches/v2_0_0_prep/libraries/libProjection/src/org/cresques/impl/geo/ReProjection.java

View differences:

ReProjection.java
97 97
     * @see org.cresques.cts.ICoordTrans#convert(java.awt.geom.Rectangle2D)
98 98
     */
99 99
    public Rectangle2D convert(Rectangle2D rect) {
100

  
100 101
        Point2D pt1 = new Point2D.Double(rect.getMinX(), rect.getMinY());
101 102
        Point2D pt2 = new Point2D.Double(rect.getMaxX(), rect.getMaxY());
102
        pt1 = convert(pt1, null);
103
        pt2 = convert(pt2, null);
104
        rect = new Rectangle2D.Double();
105
        rect.setFrameFromDiagonal(pt1, pt2);
103
        Point2D pt3 = new Point2D.Double(rect.getMinX(), rect.getMaxY());
104
        Point2D pt4 = new Point2D.Double(rect.getMaxX(), rect.getMinY());
105
        
106
        convert(pt1, pt1);
107
        convert(pt2, pt2);
108
        convert(pt3, pt3);
109
        convert(pt4, pt4);
106 110

  
107
        return rect;
111
        double min_x = Math.min(
112
            Math.min(pt1.getX(), pt2.getX()),
113
            Math.min(pt3.getX(), pt4.getX()));
114
        double min_y = Math.min(
115
            Math.min(pt1.getY(), pt2.getY()),
116
            Math.min(pt3.getY(), pt4.getY()));
117
        double max_x = Math.max(
118
            Math.max(pt1.getX(), pt2.getX()),
119
            Math.max(pt3.getX(), pt4.getX()));
120
        double max_y = Math.max(
121
            Math.max(pt1.getY(), pt2.getY()),
122
            Math.max(pt3.getY(), pt4.getY()));
123
        
124
        return new Rectangle2D.Double(
125
            min_x, min_y, max_x - min_x, max_y - min_y);
108 126
    }
109 127
}

Also available in: Unified diff