Revision 909

View differences:

branches/v02_desarrollo/libraries/libCq CMS for java.old/src/org/cresques/cts/gt2/CoordTrans.java
4 4
package org.cresques.cts.gt2;
5 5

  
6 6
import java.awt.geom.Point2D;
7
import java.awt.geom.Rectangle2D;
7 8

  
8 9
import org.cresques.cts.ICoordTrans;
9 10
import org.cresques.cts.IProjection;
......
106 107
	public String toString() {
107 108
		return tr.toString();
108 109
	}
110

  
111
	/* (non-Javadoc)
112
	 * @see org.cresques.cts.ICoordTrans#convert(java.awt.geom.Rectangle2D)
113
	 */
114
	public Rectangle2D convert(Rectangle2D rect) {
115
		Point2D pt1 = new Point2D.Double(rect.getMinX(), rect.getMinY()); 
116
		Point2D pt2 = new Point2D.Double(rect.getMaxX(), rect.getMaxY());
117
		pt1 = convert(pt1, null);
118
		pt2 = convert(pt2, null);
119
		rect = new Rectangle2D.Double();
120
		rect.setFrameFromDiagonal(pt1, pt2);
121
		return rect;
122
	}
109 123
}
branches/v02_desarrollo/libraries/libCq CMS for java.old/src/org/cresques/cts/ProjectionPool.java
3 3
 */
4 4
package org.cresques.cts;
5 5

  
6
import java.util.ArrayList;
6 7
import java.util.Iterator;
8
import java.util.Map;
7 9
import java.util.TreeMap;
8 10

  
9 11
import org.cresques.cts.gt2.CSDatum;
......
108 110
	}
109 111
	
110 112
	public static Iterator iterator() {
111
		return data.entrySet().iterator();
113
		ArrayList projs = new ArrayList();
114
		
115
		Iterator iter = data.entrySet().iterator();
116
		while (iter.hasNext()) {
117
			projs.add(((Map.Entry) iter.next()).getValue());
118
		}
119
		return projs.iterator();
112 120
	}
113 121
	
114 122
	/**
branches/v02_desarrollo/libraries/libCq CMS for java.old/src/org/cresques/cts/ICoordTrans.java
4 4
package org.cresques.cts;
5 5

  
6 6
import java.awt.geom.Point2D;
7
import java.awt.geom.Rectangle2D;
7 8

  
8 9
/**
9 10
 * @author "Luis W. Sevilla" <sevilla_lui@gva.es>
......
13 14
	public IProjection getPDest();
14 15

  
15 16
	public Point2D convert(Point2D ptOrig, Point2D ptDest);
16
	
17

  
18
	public Rectangle2D convert(Rectangle2D rectOrig);
19

  
17 20
	public ICoordTrans getInverted();
18 21
}
branches/v02_desarrollo/libraries/libCq CMS for java.old/src/org/cresques/geo/ReProjection.java
4 4
package org.cresques.geo;
5 5

  
6 6
import java.awt.geom.Point2D;
7
import java.awt.geom.Rectangle2D;
7 8

  
8 9
import org.cresques.cts.ICoordTrans;
9 10
import org.cresques.cts.IProjection;
......
58 59
		}
59 60
		return ptDest;
60 61
	}
62

  
63
	/* (non-Javadoc)
64
	 * @see org.cresques.cts.ICoordTrans#convert(java.awt.geom.Rectangle2D)
65
	 */
66
	public Rectangle2D convert(Rectangle2D rect) {
67
		Point2D pt1 = new Point2D.Double(rect.getMinX(), rect.getMinY()); 
68
		Point2D pt2 = new Point2D.Double(rect.getMaxX(), rect.getMaxY());
69
		pt1 = convert(pt1, null);
70
		pt2 = convert(pt2, null);
71
		rect = new Rectangle2D.Double();
72
		rect.setFrameFromDiagonal(pt1, pt2);
73
		return rect;
74
	}
61 75
}

Also available in: Unified diff