Author: desruisseaux
Date: Mon Apr 25 19:57:45 2016
New Revision: 1740884
URL: http://svn.apache.org/viewvc?rev=1740884&view=rev
Log:
Do not search transformation path between deprecated CRS by default.
If nevertheless the user ask to take in account deprecated CRS, reduce the
amount of warnings.
Modified:
sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
Modified:
sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java?rev=1740884&r1=1740883&r2=1740884&view=diff
==============================================================================
---
sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
[UTF-8] (original)
+++
sis/branches/JDK8/application/sis-console/src/main/java/org/apache/sis/console/TransformCommand.java
[UTF-8] Mon Apr 25 19:57:45 2016
@@ -365,7 +365,6 @@ final class TransformCommand extends Met
final int dimension = cs.getDimension();
numFractionDigits = new int[dimension];
thresholdForScientificNotation = new double[dimension];
- final double thresholdFactor = MathFunctions.pow10(ordinateWidth - 1);
for (int i=0; i<dimension; i++) {
final Unit<?> unit = cs.getAxis(0).getUnit();
final Unit<?> source;
@@ -384,7 +383,7 @@ final class TransformCommand extends Met
if (precision > 0) {
numFractionDigits[i] =
Math.max(DecimalFunctions.fractionDigitsForDelta(precision, false) + 1, 0);
}
- thresholdForScientificNotation[i] = thresholdFactor *
MathFunctions.pow10(-numFractionDigits[i]);
+ thresholdForScientificNotation[i] =
MathFunctions.pow10(ordinateWidth - 1 - numFractionDigits[i]);
}
}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1740884&r1=1740883&r2=1740884&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
[UTF-8] Mon Apr 25 19:57:45 2016
@@ -1411,13 +1411,14 @@ addURIs: for (int i=0; ; i++) {
* may be recreated every time a deprecated
ProjectedCRS is created, we temporarily
* shutdown the loggings in order to avoid the
same warning to be logged many time.
*/
+ final boolean old = quiet;
try {
quiet = true;
replaceDeprecatedCS = true;
baseCRS =
createCoordinateReferenceSystem(geoCode); // Do not cache that CRS.
} finally {
replaceDeprecatedCS = false;
- quiet = false;
+ quiet = old;
}
/*
* The crsFactory method calls will indirectly
create a parameterized MathTransform.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java?rev=1740884&r1=1740883&r2=1740884&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
[UTF-8] Mon Apr 25 19:57:45 2016
@@ -225,7 +225,6 @@ class CoordinateOperationRegistry {
CoordinateOperationRegistry.class, "<init>", e);
}
if (codeFinder != null) {
-
codeFinder.setSearchDomain(IdentifiedObjectFinder.Domain.ALL_DATASET);
codeFinder.setIgnoringAxes(true);
}
}
