Revision 23460

View differences:

branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/Envelope.java
131 131
	Geometry getGeometry();
132 132

  
133 133
	boolean contains(Envelope envelope);
134

  
135
	boolean intersects(Envelope envelope);
134 136
}
branches/v2_0_0_prep/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/DefaultEnvelope.java
243 243
	}
244 244

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

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

Also available in: Unified diff