The idea of giving the choice between relative or absolute comparisons has been keep. This is a concept found in various libraries, not an original contribution. On the actual code (excluding documentation):
ensureNonNull(…) has been reverted.assert statement (invoking get…(envelope) instead than envelope.get…()) has been reverted.if (!relativeToLength) epsilon = eps" , is trivial and has been written differently in Geotk/SIS anyway.The Javadoc, which seems a massive contribution, is actually a copy-and-paste of the Javadoc of the equals(Envelope, double)
method just above the contribution. The only new documentation are "If relativeToLength is set to true" and
"If relativeToLength is set to false, [the actual tolerance value for a given dimension i] is eps."
where the […] part is an other copy-and-paste.
Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24115:24116 https://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/geometry/AbstractEnvelope.java| Revision 24115 | Revision 24116 |
|---|---|
* @source $URL$ * @version $Id$ * @author Martin Desruisseaux * * @see Envelope2D * @see org.geotools.geometry.jts.ReferencedEnvelope |
* @source $URL$
* @version $Id$
* @author Martin Desruisseaux
* @author Simone Giannecchini
*
* @see Envelope2D
* @see org.geotools.geometry.jts.ReferencedEnvelope |
* @since 2.3
*/
public boolean equals(final Envelope envelope, final double eps) {
ensureNonNull("envelope", envelope);
final int dimension = getDimension();
if (envelope.getDimension() != dimension) {
return false;
}
assert equalsIgnoreMetadata(crs, envelope.getCoordinateReferenceSystem()) : envelope;
for (int i=0; i<dimension; i++) {
double epsilon = Math.max(getLength(i), envelope.getLength(i));
epsilon = (epsilon>0 && epsilon<Double.POSITIVE_INFINITY) ? epsilon*eps : eps;
// Comparaison below uses '!' in order to catch NaN values.
if (!(Math.abs(getMinimum(i) - envelope.getMinimum(i)) <= epsilon &&
Math.abs(getMaximum(i) - envelope.getMaximum(i)) <= epsilon)) |
* @since 2.3
*/
public boolean equals(final Envelope envelope, final double eps) {
return equals(envelope, eps,true);
}
/**
* Compares to the specified envelope for equality up to the specified tolerance value.
* The tolerance value {@code eps} can be either relative to the {@linkplain #getLength
* envelope length}along each dimension or can be an absolut value (as for example some
* ground resolution of a {@link GridCoverage}.
*
* If <code>relativeToLength</code> is set to true, the actual tolerance value for a given dimension
* <var>i</var> is {@code eps}×{@code length} where {@code length} is the maximum of
* {@linkplain #getLength this envelope length} and the specified envelope length along
* dimension <var>i</var>.
*
* If <code>relativeToLength</code> is set to false, the actual tolerance value for a given dimension
* <var>i</var> is {@code eps}.
*
* <p>
* Relative tolerance value (as opposed to absolute tolerance value) help to workaround the
* fact that tolerance value are CRS dependent. For example the tolerance value need to be
* smaller for geographic CRS than for UTM projections, because the former typically has a
* range of -180 to 180° while the later can have a range of thousands of meters.
* <p>
* This method assumes that the specified envelope uses the same CRS than this envelope.
* For performance reason, it will no be verified unless J2SE assertions are enabled.
*
* @see #contains(Envelope, boolean)
* @see #intersects(Envelope, boolean)
*
* @since 2.4
*/
public boolean equals(final Envelope envelope, final double eps,final boolean relativeToLength) {
final int dimension = getDimension();
if (envelope.getDimension() != dimension) {
return false;
}
assert equalsIgnoreMetadata(crs, getCoordinateReferenceSystem(envelope)) : envelope;
double epsilon;
for (int i=0; i<dimension; i++) {
if(relativeToLength){
epsilon = Math.max(getLength(i), envelope.getLength(i));
epsilon = (epsilon>0 && epsilon<Double.POSITIVE_INFINITY) ? epsilon*eps : eps;
}
else
epsilon=eps;
// Comparaison below uses '!' in order to catch NaN values.
if (!(Math.abs(getMinimum(i) - envelope.getMinimum(i)) <= epsilon &&
Math.abs(getMaximum(i) - envelope.getMaximum(i)) <= epsilon)) |