Revision 25163 branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/DefaultEnvelope.java

View differences:

DefaultEnvelope.java
78 78
*/
79 79
package org.gvsig.fmap.geom.primitive;
80 80

  
81
import java.awt.geom.Rectangle2D;
82

  
83
import org.cresques.cts.ICoordTrans;
81 84
import org.gvsig.fmap.geom.Geometry;
82 85
import org.gvsig.fmap.geom.GeometryFactory;
83 86
import org.gvsig.fmap.geom.GeometryManager;
......
243 246
	}
244 247

  
245 248
	public boolean contains(Envelope envelope) {
246
		if(envelope == null) return false;
249
		if(envelope == null) {
250
			return false;
251
		}
247 252
		for (int i = 0; i < getDimension(); i++) {
248 253
			if (getMinimum(i)>=envelope.getMinimum(i) || getMaximum(i)<=envelope.getMaximum(i)){
249 254
					return false;
......
253 258
	}
254 259

  
255 260
	public boolean intersects(Envelope envelope) {
256
		if(envelope == null) return false;
261
		if(envelope == null) {
262
			return false;
263
		}
257 264
		for (int i = 0; i < getDimension(); i++) {
258 265
			if (getMinimum(i)>envelope.getMaximum(i)){
259 266
				return false;
......
263 270
		}
264 271
		return true;
265 272
	}
273

  
274
	public Envelope convert(ICoordTrans trans) {
275
		if (this.dimensions > 2) {
276
			return null;
277
		}
278
		Rectangle2D rect = new Rectangle2D.Double(this.getMinimum(0), this
279
				.getMinimum(1), this.getMaximum(0), this.getMaximum(1));
280
		Rectangle2D rectDest = trans.convert(rect);
281
		if (rectDest == null){
282
			return null;
283
		}
284

  
285
		return new DefaultEnvelope(rectDest.getMinX(), rectDest.getMinY(),
286
				rectDest.getMaxX(), rectDest.getMaxY());
287
	}
266 288
}

Also available in: Unified diff