Author: desruisseaux
Date: Mon Nov 9 19:57:39 2015
New Revision: 1713527
URL: http://svn.apache.org/viewvc?rev=1713527&view=rev
Log:
Merge from the JDK8 branch.
Added:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation2D.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation3D.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotation3D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation2D.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation3D.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricTranslation3D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param2D.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param3D.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PositionVector7Param3D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidalToCartesianTransform.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidalToCartesianTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform2D.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateFrameRotationTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidalToCartesianTransformTest.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidalToCartesianTransformTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
- copied unchanged from r1713526,
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_fr.java
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalBelgium.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercatorSouth.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEllipsoid.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/Matrices.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/UnmodifiableMatrix.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ConformalProjection.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Initializer.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/Mercator.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CopyTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IdentityTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform2D.java
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/package-info.java
sis/branches/JDK7/core/sis-referencing/src/main/resources/META-INF/services/org.opengis.referencing.operation.OperationMethod
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AllProvidersTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTParserTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/NormalizedProjectionTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ProjectionResultComparator.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/mock/GeodeticDatumMock.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/ShapefileByteReader.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/AbstractDbase3ByteReader.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/DBFDriver.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/Dbase3ByteReader.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/connection/DBFConnection.java
sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.java
sis/branches/JDK7/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/MappedByteReader.properties
sis/branches/JDK7/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/MappedByteReader_fr.properties
sis/branches/JDK7/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet.properties
sis/branches/JDK7/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/DBFRecordBasedResultSet_fr.properties
sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/internal/shapefile/jdbc/DBFConnectionTest.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 9 19:57:39 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1710252
+/sis/branches/JDK8:1584960-1713526
/sis/trunk:1394364-1508466,1519089-1519674
Modified:
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -75,6 +75,13 @@ public final class Assembler {
private static final String LINE_SEPARATOR = "\n";
/**
+ * Minimal number of characters in a Java identifier before to allows a
line break before the next identifier.
+ * This value if used in expressions like {@code foo.bar()} for deciding
whether or not we accept line break
+ * between {@code foo} and {@code .bar()}.
+ */
+ private static final int MINIMAL_LENGTH_BEFORE_BREAK = 3;
+
+ /**
* The directory of all input files to process.
*/
private final File inputDirectory;
@@ -318,6 +325,10 @@ public final class Assembler {
((Element) node).setAttribute("class", style);
}
}
+ String text =
insertWordSeparator(node.getTextContent());
+ if (text != null) {
+ node.setTextContent(text);
+ }
return; // Do not scan recursively the <code> text
content.
}
default: {
@@ -467,6 +478,48 @@ public final class Assembler {
}
/**
+ * Allows word break before the code in expression like {@code
Class.method()}.
+ * If there is nothing to change in the given text, returns {@code null}.
+ */
+ private static String insertWordSeparator(String text) {
+ StringBuilder buffer = null;
+ for (int i=text.length() - 1; --i > MINIMAL_LENGTH_BEFORE_BREAK;) {
+ if (text.charAt(i) == '.' &&
Character.isJavaIdentifierStart(text.charAt(i+1))) {
+ final char b = text.charAt(i-1);
+ if (Character.isJavaIdentifierPart(b) || b == ')') {
+ /*
+ * Verifiy if the element to eventually put on the next
line is a call to a method.
+ * For now we split only calls to method for avoiding to
split for example every
+ * elements in a package name.
+ */
+ for (int j=i; ++j < text.length();) {
+ final char c = text.charAt(j);
+ if (!Character.isJavaIdentifierPart(c)) {
+ if (c == '(') {
+ /*
+ * Found a call to a method. But we also
require the word before it
+ * to have more than 3 letters.
+ */
+ for (j = i;
Character.isJavaIdentifierPart(text.charAt(--j));) {
+ if (j == i - MINIMAL_LENGTH_BEFORE_BREAK) {
+ if (buffer == null) {
+ buffer = new StringBuilder(text);
+ }
+ buffer.insert(i, '\u200B'); //
Zero-width space.
+ break;
+ }
+ }
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+ return (buffer != null) ? buffer.toString() : null;
+ }
+
+ /**
* Inserts a line separator just before the given node.
*/
private void insertLineSeparator(final Node insertionPoint) {
Modified:
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_fr.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_fr.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_fr.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Resources_fr.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -28,8 +28,8 @@ public final class Resources_fr extends
@Override
protected Object[][] getContents() {
final Object[][] resources = super.getContents();
- resources[0][1] = "Chapitre suivant";
- resources[1][1] = "Chapitre précédent";
+ resources[0][1] = "Chapitre précédent";
+ resources[1][1] = "Chapitre suivant";
resources[2][1] = "Dans ce chapitre:";
return resources;
}
Modified:
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -115,6 +115,7 @@ LegalConstraints
Lineage
LinearCS
LogicalConsistency
+Matrix
MaintenanceFrequency
MaintenanceInformation
MathTransform
Modified:
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -233,3 +233,4 @@ SV_OperationChainMetadata
SV_OperationMetadata
SV_ParameterDirection
SV_ServiceIdentification
+TOWGS84
Modified:
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/SIS.lst
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -1,5 +1,7 @@
+AbstractMathTransform
AngleFormat
DefaultEllipsoid
+DefaultGeodeticDatum
DefaultMetadata
Envelopes
GeneralEnvelope
Modified:
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -336,11 +336,12 @@ public abstract class AbstractAttribute<
* @see DefaultAttributeType#characteristics()
*/
@Override
+ @SuppressWarnings("ReturnOfCollectionOrArrayField")
public Map<String,Attribute<?>> characteristics() {
if (characteristics == null) {
characteristics = newCharacteristicsMap();
}
- return characteristics;
+ return characteristics; // Intentionally modifiable
}
/**
Modified:
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -527,7 +527,7 @@ public abstract class AbstractFeature im
*/
final FeatureType valueType = ((Feature) value).getType();
final FeatureType base = role.getValueType();
- if (base != valueType &&
DefaultFeatureType.maybeAssignableFrom(base, valueType)) {
+ if (base == valueType ||
DefaultFeatureType.maybeAssignableFrom(base, valueType)) {
return isSingleton ? value : singletonList(Feature.class,
role.getMinimumOccurs(), value);
} else {
throw illegalPropertyType(role.getName(), valueType.getName());
Modified:
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -235,6 +235,7 @@ public class DefaultFeatureType extends
* @param properties Any feature operation, any feature attribute type
and any feature
* association role that carries characteristics of
a feature type.
*/
+ @SuppressWarnings("ThisEscapedInObjectConstruction")
public DefaultFeatureType(final Map<String,?> identification, final
boolean isAbstract,
final FeatureType[] superTypes, final PropertyType... properties)
{
@@ -684,8 +685,9 @@ public class DefaultFeatureType extends
* @return The parents of this feature type, or an empty set if none.
*/
@Override
+ @SuppressWarnings("ReturnOfCollectionOrArrayField")
public final Set<FeatureType> getSuperTypes() {
- return superTypes;
+ return superTypes; // Immutable
}
/**
@@ -732,6 +734,7 @@ public class DefaultFeatureType extends
* Returns the map from names to indices in an array of properties.
* This is used for {@link DenseFeature} implementation.
*/
+ @SuppressWarnings("ReturnOfCollectionOrArrayField")
final Map<String,Integer> indices() {
return indices;
}
Modified:
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DenseFeature.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -168,7 +168,7 @@ final class DenseFeature extends Abstrac
}
}
}
- properties = c; // Store only on success.
+ properties = c; // Store only on success.
}
/**
Modified:
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -123,8 +123,9 @@ final class MultiValuedAttribute<V> exte
* @return The attribute values in a <cite>live</cite> collection.
*/
@Override
+ @SuppressWarnings("ReturnOfCollectionOrArrayField")
public Collection<V> getValues() {
- return values;
+ return values; // Intentionally modifiable
}
/**
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -149,6 +149,7 @@ public class ReferencingServices extends
*
* @return The singleton instance.
*/
+ @SuppressWarnings("DoubleCheckedLocking")
public static ReferencingServices getInstance() {
ReferencingServices c = instance;
if (c == null) {
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -18,6 +18,8 @@ package org.apache.sis.internal.metadata
import java.util.ArrayList;
import java.util.List;
+import org.opengis.annotation.UML;
+import org.opengis.annotation.Specification;
import org.opengis.util.CodeList;
@@ -31,6 +33,7 @@ import org.opengis.util.CodeList;
* @version 0.7
* @module
*/
+@UML(identifier = "MI_SensorTypeCode", specification =
Specification.ISO_19115_2) // Actually only in XML schema.
public final class SensorType extends CodeList<SensorType> {
/**
* Serial number for compatibility with different versions.
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -187,7 +187,9 @@ public enum Convention {
* <li>All quoted texts (not only the remarks) preserve non-ASCII
characters.</li>
* <li>Map projections are shown as SIS stores them internally, i.e.
with the separation between
* linear and non-linear steps, rather than as a single
operation.</li>
- * <li>{@code CompoundCRS} shows nested compound CRS if any (the
structure is not flattened).</li>
+ * <li>{@code Parameter} elements omit the unit of measurement if that
unit is equal to the default unit
+ * (as declared in the parameter descriptor).</li>
+ * <li>{@code CompoundCRS} elements show nested compound CRS if any (the
structure is not flattened).</li>
* <li>{@code Id} elements are formatted for child elements in addition
to the root one.</li>
* <li>{@code Id} element omits the {@code URI} sub-element if the later
is derived by Apache SIS
* from the {@code Id} properties.</li>
Modified:
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -128,7 +128,7 @@ public strictfp class MetadataAssert ext
WKT_FORMAT.setConvention(convention);
wkt = WKT_FORMAT.format(object);
}
- if (!wkt.matches(expected)) {
+ if (!wkt.matches(expected.replace("\n", System.lineSeparator()))) {
fail("WKT does not match the expected regular expression. The
WKT that we got is:\n" + wkt);
}
}
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Formulas.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -67,6 +67,11 @@ public final class Formulas extends Stat
public static final long JULIAN_YEAR_LENGTH = 31557600000L;
/**
+ * Maximum number of iterations for iterative computations.
+ */
+ public static final int MAXIMUM_ITERATIONS = 15;
+
+ /**
* Do not allow instantiation of this class.
*/
private Formulas() {
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -179,19 +179,19 @@ public final class Equirectangular exten
// Do not declare the ESRI "Equidistant_Cylindrical" projection name
below,
// for avoiding confusion with EPSG "Equidistant Cylindrical"
ellipsoidal projection.
PARAMETERS = addIdentifierAndLegacy(builder, "1029", "9823") // 9823
uses deprecated parameter names
- .addName( "Equidistant Cylindrical (Spherical)")
- .addName( "Plate Carrée") // Not formally
defined by EPSG, but cited in documentation.
- .addName(Citations.OGC, "Equirectangular")
- .addName(Citations.ESRI, "Plate_Carree")
- .addName(Citations.GEOTIFF, "CT_Equirectangular")
- .addName(Citations.PROJ4, "eqc")
- .addIdentifier(Citations.GEOTIFF, "17")
- .createGroupForMapProjection(
- STANDARD_PARALLEL,
- LATITUDE_OF_ORIGIN, // Not formally an Equirectangular
parameter.
- LONGITUDE_OF_ORIGIN,
- FALSE_EASTING,
- FALSE_NORTHING);
+ .addName( "Equidistant Cylindrical
(Spherical)")
+ .addName( "Plate Carrée") // Not formally
defined by EPSG, but cited in documentation.
+ .addName(Citations.OGC, "Equirectangular")
+ .addName(Citations.ESRI, "Plate_Carree")
+ .addName(Citations.GEOTIFF, "CT_Equirectangular")
+ .addName(Citations.PROJ4, "eqc")
+ .addIdentifier(Citations.GEOTIFF, "17")
+ .createGroupForMapProjection(
+ STANDARD_PARALLEL,
+ LATITUDE_OF_ORIGIN, // Not formally an
Equirectangular parameter.
+ LONGITUDE_OF_ORIGIN,
+ FALSE_EASTING,
+ FALSE_NORTHING);
}
/**
@@ -265,7 +265,8 @@ public final class Equirectangular exten
* 4) Scale longitude by cos(φ1).
*/
φ1 = toRadians(φ1);
- context.getMatrix(true).convertBefore(0, cos(φ1), null);
+ final MatrixSIS normalize =
context.getMatrix(ContextualParameters.MatrixRole.NORMALIZATION);
+ normalize.convertBefore(0, cos(φ1), null);
context.normalizeGeographicInputs(λ0)
.convertBefore(1, null, -φ0);
/*
@@ -280,7 +281,7 @@ public final class Equirectangular exten
a = b / (1 - (1 - rs*rs) * (sinφ1*sinφ1));
}
final DoubleDouble k = new DoubleDouble(a);
- final MatrixSIS denormalize = context.getMatrix(false);
+ final MatrixSIS denormalize =
context.getMatrix(ContextualParameters.MatrixRole.DENORMALIZATION);
denormalize.convertAfter(0, k, new DoubleDouble(fe));
denormalize.convertAfter(1, k, new DoubleDouble(fn));
/*
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -75,17 +75,17 @@ public final class LambertConformal1SP e
.addNamesAndIdentifiers(Mercator1SP.LATITUDE_OF_ORIGIN));
PARAMETERS = builder
- .addIdentifier(IDENTIFIER)
- .addName( "Lambert Conic Conformal (1SP)")
- .addName(Citations.OGC, "Lambert_Conformal_Conic_1SP")
- .addName(Citations.GEOTIFF, "CT_LambertConfConic_1SP")
- .addIdentifier(Citations.GEOTIFF, "9")
- .createGroupForMapProjection(
- LATITUDE_OF_ORIGIN,
- LONGITUDE_OF_ORIGIN,
- SCALE_FACTOR,
- FALSE_EASTING,
- FALSE_NORTHING);
+ .addIdentifier(IDENTIFIER)
+ .addName( "Lambert Conic Conformal (1SP)")
+ .addName(Citations.OGC, "Lambert_Conformal_Conic_1SP")
+ .addName(Citations.GEOTIFF, "CT_LambertConfConic_1SP")
+ .addIdentifier(Citations.GEOTIFF, "9")
+ .createGroupForMapProjection(
+ LATITUDE_OF_ORIGIN,
+ LONGITUDE_OF_ORIGIN,
+ SCALE_FACTOR,
+ FALSE_EASTING,
+ FALSE_NORTHING);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -152,25 +152,25 @@ public final class LambertConformal2SP e
.setRequired(false).setDeprecated(true));
PARAMETERS = builder
- .addIdentifier(IDENTIFIER)
- .addName( "Lambert Conic Conformal (2SP)")
- .addName(Citations.OGC, "Lambert_Conformal_Conic_2SP")
- .addName(Citations.ESRI, "Lambert_Conformal_Conic")
- .addName(Citations.NETCDF, "LambertConformal")
- .addName(Citations.GEOTIFF, "CT_LambertConfConic_2SP")
- .addName(Citations.GEOTIFF, "CT_LambertConfConic")
- .addName(Citations.PROJ4, "lcc")
- .addIdentifier(Citations.GEOTIFF, "8")
- .addIdentifier(Citations.MAP_INFO, "3")
- .addIdentifier(Citations.S57, "6")
- .createGroupForMapProjection(
- LATITUDE_OF_FALSE_ORIGIN,
- LONGITUDE_OF_FALSE_ORIGIN,
- STANDARD_PARALLEL_1,
- STANDARD_PARALLEL_2,
- scaleFactor, // Not formally a
LambertConformal2SP parameter.
- EASTING_AT_FALSE_ORIGIN,
- NORTHING_AT_FALSE_ORIGIN);
+ .addIdentifier(IDENTIFIER)
+ .addName( "Lambert Conic Conformal (2SP)")
+ .addName(Citations.OGC, "Lambert_Conformal_Conic_2SP")
+ .addName(Citations.ESRI, "Lambert_Conformal_Conic")
+ .addName(Citations.NETCDF, "LambertConformal")
+ .addName(Citations.GEOTIFF, "CT_LambertConfConic_2SP")
+ .addName(Citations.GEOTIFF, "CT_LambertConfConic")
+ .addName(Citations.PROJ4, "lcc")
+ .addIdentifier(Citations.GEOTIFF, "8")
+ .addIdentifier(Citations.MAP_INFO, "3")
+ .addIdentifier(Citations.S57, "6")
+ .createGroupForMapProjection(
+ LATITUDE_OF_FALSE_ORIGIN,
+ LONGITUDE_OF_FALSE_ORIGIN,
+ STANDARD_PARALLEL_1,
+ STANDARD_PARALLEL_2,
+ scaleFactor, // Not formally a
LambertConformal2SP parameter.
+ EASTING_AT_FALSE_ORIGIN,
+ NORTHING_AT_FALSE_ORIGIN);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalBelgium.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalBelgium.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalBelgium.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalBelgium.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -18,7 +18,6 @@ package org.apache.sis.internal.referenc
import javax.xml.bind.annotation.XmlTransient;
import org.opengis.parameter.ParameterDescriptorGroup;
-import org.apache.sis.parameter.ParameterBuilder;
import org.apache.sis.metadata.iso.citation.Citations;
@@ -50,22 +49,20 @@ public final class LambertConformalBelgi
*/
static final ParameterDescriptorGroup PARAMETERS;
static {
- final ParameterBuilder builder = builder();
-
- PARAMETERS = builder
- .addIdentifier(IDENTIFIER)
- .addName( "Lambert Conic Conformal (2SP
Belgium)")
- .addName(Citations.OGC, "Lambert_Conformal_Conic_2SP_Belgium")
- .addName(Citations.ESRI, "Lambert_Conformal_Conic_2SP_Belgium")
- .addIdentifier(Citations.MAP_INFO, "19")
- .addIdentifier(Citations.S57, "6")
- .createGroupForMapProjection(
- LambertConformal2SP.LATITUDE_OF_FALSE_ORIGIN,
- LambertConformal2SP.LONGITUDE_OF_FALSE_ORIGIN,
- LambertConformal2SP.STANDARD_PARALLEL_1,
- LambertConformal2SP.STANDARD_PARALLEL_2,
- LambertConformal2SP.EASTING_AT_FALSE_ORIGIN,
- LambertConformal2SP.NORTHING_AT_FALSE_ORIGIN);
+ PARAMETERS = builder()
+ .addIdentifier(IDENTIFIER)
+ .addName( "Lambert Conic Conformal (2SP
Belgium)")
+ .addName(Citations.OGC,
"Lambert_Conformal_Conic_2SP_Belgium")
+ .addName(Citations.ESRI,
"Lambert_Conformal_Conic_2SP_Belgium")
+ .addIdentifier(Citations.MAP_INFO, "19")
+ .addIdentifier(Citations.S57, "6")
+ .createGroupForMapProjection(
+ LambertConformal2SP.LATITUDE_OF_FALSE_ORIGIN,
+ LambertConformal2SP.LONGITUDE_OF_FALSE_ORIGIN,
+ LambertConformal2SP.STANDARD_PARALLEL_1,
+ LambertConformal2SP.STANDARD_PARALLEL_2,
+ LambertConformal2SP.EASTING_AT_FALSE_ORIGIN,
+ LambertConformal2SP.NORTHING_AT_FALSE_ORIGIN);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -61,16 +61,16 @@ public final class LambertConformalMichi
.createStrictlyPositive(Double.NaN, Unit.ONE);
PARAMETERS = builder
- .addIdentifier(IDENTIFIER)
- .addName("Lambert Conic Conformal (2SP Michigan)")
- .createGroupForMapProjection(
- LambertConformal2SP.LATITUDE_OF_FALSE_ORIGIN,
- LambertConformal2SP.LONGITUDE_OF_FALSE_ORIGIN,
- LambertConformal2SP.STANDARD_PARALLEL_1,
- LambertConformal2SP.STANDARD_PARALLEL_2,
- LambertConformal2SP.EASTING_AT_FALSE_ORIGIN,
- LambertConformal2SP.NORTHING_AT_FALSE_ORIGIN,
- SCALE_FACTOR);
+ .addIdentifier(IDENTIFIER)
+ .addName("Lambert Conic Conformal (2SP Michigan)")
+ .createGroupForMapProjection(
+ LambertConformal2SP.LATITUDE_OF_FALSE_ORIGIN,
+ LambertConformal2SP.LONGITUDE_OF_FALSE_ORIGIN,
+ LambertConformal2SP.STANDARD_PARALLEL_1,
+ LambertConformal2SP.STANDARD_PARALLEL_2,
+ LambertConformal2SP.EASTING_AT_FALSE_ORIGIN,
+ LambertConformal2SP.NORTHING_AT_FALSE_ORIGIN,
+ SCALE_FACTOR);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalWest.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -71,14 +71,14 @@ public final class LambertConformalWest
.setRemarks(Messages.formatInternational(Messages.Keys.MisnamedParameter_1,
"False westing")));
PARAMETERS = builder
- .addIdentifier(IDENTIFIER)
- .addName("Lambert Conic Conformal (West Orientated)")
- .createGroupForMapProjection(
- LambertConformal1SP.LATITUDE_OF_ORIGIN,
- LambertConformal1SP.LONGITUDE_OF_ORIGIN,
- LambertConformal1SP.SCALE_FACTOR,
- FALSE_WESTING,
- LambertConformal1SP.FALSE_NORTHING);
+ .addIdentifier(IDENTIFIER)
+ .addName("Lambert Conic Conformal (West Orientated)")
+ .createGroupForMapProjection(
+ LambertConformal1SP.LATITUDE_OF_ORIGIN,
+ LambertConformal1SP.LONGITUDE_OF_ORIGIN,
+ LambertConformal1SP.SCALE_FACTOR,
+ FALSE_WESTING,
+ LambertConformal1SP.FALSE_NORTHING);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -58,11 +58,6 @@ public final class LongitudeRotation ext
private static final long serialVersionUID = -2104496465933824935L;
/**
- * The name of the {@link #OFFSET} parameter.
- */
- static final String NAME = "Longitude offset";
-
- /**
* The operation parameter descriptor for the <cite>"longitude
offset"</cite> parameter value.
*/
private static final ParameterDescriptor<Double> OFFSET;
@@ -73,7 +68,7 @@ public final class LongitudeRotation ext
private static final ParameterDescriptorGroup PARAMETERS;
static {
final ParameterBuilder builder = builder();
- OFFSET = createLongitude(builder.addIdentifier("8602").addName(NAME));
+ OFFSET =
createLongitude(builder.addIdentifier("8602").addName("Longitude offset"));
PARAMETERS = builder.addIdentifier("9601").addName("Longitude
rotation").createGroup(OFFSET);
}
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -44,6 +44,7 @@ import org.apache.sis.parameter.Paramete
import org.apache.sis.parameter.Parameters;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Messages;
+import org.apache.sis.util.Debug;
import static org.opengis.metadata.Identifier.AUTHORITY_KEY;
@@ -80,6 +81,13 @@ public abstract class MapProjection exte
* <p>Some names for this parameter are {@code "semi_minor"}, {@code
"SemiMinor"} and {@code "b"}.</p>
*/
public static final DefaultParameterDescriptor<Double> SEMI_MINOR;
+
+ /**
+ * The ellipsoid eccentricity, computed from the semi-major and semi-minor
axis lengths.
+ * This a SIS-specific parameter used mostly for debugging purpose.
+ */
+ @Debug
+ public static final DefaultParameterDescriptor<Double> ECCENTRICITY;
static {
final MeasurementRange<Double> valueDomain =
MeasurementRange.createGreaterThan(0, SI.METRE);
final GenericName[] aliases = {
@@ -103,6 +111,14 @@ public abstract class MapProjection exte
aliases[2] = new NamedIdentifier(Citations.GEOTIFF, "SemiMinor");
aliases[3] = new NamedIdentifier(Citations.PROJ4, "b");
SEMI_MINOR = new DefaultParameterDescriptor<>(properties, 1, 1,
Double.class, valueDomain, null, null);
+ /*
+ * SIS-specific parameter for debugging purpose only.
+ */
+ properties.clear();
+ properties.put(AUTHORITY_KEY, Citations.SIS);
+ properties.put(NAME_KEY, "eccentricity");
+ ECCENTRICITY = new DefaultParameterDescriptor<>(properties, 1, 1,
Double.class,
+ MeasurementRange.create(0d, true, 1d, true, null), null, null);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -85,20 +85,20 @@ public final class Mercator1SP extends A
.addName(Citations.PROJ4, "k"));
PARAMETERS = builder
- .addIdentifier( "9804") // The
ellipsoidal case
- .addName( "Mercator (variant A)") //
Starting from EPSG version 7.6
- .addName( "Mercator (1SP)") //
Prior to EPSG version 7.6
- .addName(Citations.OGC, "Mercator_1SP")
- .addName(Citations.GEOTIFF, "CT_Mercator")
- .addName(Citations.PROJ4, "merc")
- .addIdentifier(Citations.GEOTIFF, "7")
- .addIdentifier(Citations.MAP_INFO, "10") // MapInfo names this
projection "Mercator".
- .createGroupForMapProjection(
- LATITUDE_OF_ORIGIN,
- LONGITUDE_OF_ORIGIN,
- SCALE_FACTOR,
- FALSE_EASTING,
- FALSE_NORTHING);
+ .addIdentifier( "9804") //
The ellipsoidal case
+ .addName( "Mercator (variant A)") //
Starting from EPSG version 7.6
+ .addName( "Mercator (1SP)") //
Prior to EPSG version 7.6
+ .addName(Citations.OGC, "Mercator_1SP")
+ .addName(Citations.GEOTIFF, "CT_Mercator")
+ .addName(Citations.PROJ4, "merc")
+ .addIdentifier(Citations.GEOTIFF, "7")
+ .addIdentifier(Citations.MAP_INFO, "10") // MapInfo names
this projection "Mercator".
+ .createGroupForMapProjection(
+ LATITUDE_OF_ORIGIN,
+ LONGITUDE_OF_ORIGIN,
+ SCALE_FACTOR,
+ FALSE_EASTING,
+ FALSE_NORTHING);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.citat
/**
- * The provider for "<cite>Mercator (variant B)</cite>" projection (EPSG:9805).
+ * The provider for <cite>"Mercator (variant B)"</cite> projection (EPSG:9805).
*
* <p>This provider reuses some of the parameters defined in {@link
Mercator2SP}.</p>
*
@@ -94,22 +94,22 @@ public final class Mercator2SP extends A
.setRemarks(remarks).setDeprecated(true));
PARAMETERS = builder
- .addIdentifier( "9805")
- .addName( "Mercator (variant B)") //
Starting from EPSG version 7.6
- .addName( "Mercator (2SP)") // Prior
to EPSG version 7.6
- .addName(Citations.OGC, "Mercator_2SP")
- .addName(Citations.ESRI, "Mercator")
- .addName(Citations.NETCDF, "Mercator")
- .addName(sameNameAs(Citations.PROJ4, Mercator1SP.PARAMETERS))
- .addIdentifier(Citations.MAP_INFO, "26") // MapInfo names this
projection "Regional Mercator".
- .addIdentifier(Citations.S57, "8")
- .createGroupForMapProjection(
- STANDARD_PARALLEL,
- latitudeOfOrigin, // Not formally a Mercator2SP
parameter.
- Mercator1SP.LONGITUDE_OF_ORIGIN,
- SCALE_FACTOR, // Not formally a Mercator2SP
parameter.
- FALSE_EASTING,
- FALSE_NORTHING);
+ .addIdentifier( "9805")
+ .addName( "Mercator (variant B)") //
Starting from EPSG version 7.6
+ .addName( "Mercator (2SP)") //
Prior to EPSG version 7.6
+ .addName(Citations.OGC, "Mercator_2SP")
+ .addName(Citations.ESRI, "Mercator")
+ .addName(Citations.NETCDF, "Mercator")
+ .addName(sameNameAs(Citations.PROJ4, Mercator1SP.PARAMETERS))
+ .addIdentifier(Citations.MAP_INFO, "26") // MapInfo names
this projection "Regional Mercator".
+ .addIdentifier(Citations.S57, "8")
+ .createGroupForMapProjection(
+ STANDARD_PARALLEL,
+ latitudeOfOrigin, // Not formally a Mercator2SP
parameter.
+ Mercator1SP.LONGITUDE_OF_ORIGIN,
+ SCALE_FACTOR, // Not formally a Mercator2SP
parameter.
+ FALSE_EASTING,
+ FALSE_NORTHING);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MercatorSpherical.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -65,13 +65,13 @@ public final class MercatorSpherical ext
.setRequired(false));
PARAMETERS = addNameAndLegacy(addIdentifierAndLegacy(builder,
IDENTIFIER, "9841"),
- "Mercator (Spherical)", "Mercator (1SP) (Spherical)") //
"Mercator (Spherical)" starting from EPSG version 7.6
- .createGroupForMapProjection(
- Mercator1SP.LATITUDE_OF_ORIGIN,
- Mercator1SP.LONGITUDE_OF_ORIGIN,
- scaleFactor,
- FALSE_EASTING,
- FALSE_NORTHING);
+ "Mercator (Spherical)", "Mercator (1SP) (Spherical)") //
"Mercator (Spherical)" starting from EPSG version 7.6
+ .createGroupForMapProjection(
+ Mercator1SP.LATITUDE_OF_ORIGIN,
+ Mercator1SP.LONGITUDE_OF_ORIGIN,
+ scaleFactor,
+ FALSE_EASTING,
+ FALSE_NORTHING);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -19,12 +19,11 @@ package org.apache.sis.internal.referenc
import javax.xml.bind.annotation.XmlTransient;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.apache.sis.internal.util.Constants;
-import org.apache.sis.parameter.ParameterBuilder;
import org.apache.sis.metadata.iso.citation.Citations;
/**
- * The provider for "<cite>Miller Cylindrical</cite>" projection.
+ * The provider for <cite>"Miller Cylindrical"</cite> projection.
* This is a {@link Mercator1SP} projection with the following modifications:
*
* <ol>
@@ -64,14 +63,13 @@ public final class MillerCylindrical ext
*/
private static final ParameterDescriptorGroup PARAMETERS;
static {
- final ParameterBuilder builder = builder().setCodeSpace(Citations.OGC,
Constants.OGC);
- PARAMETERS = builder
- .addName ("Miller_Cylindrical")
- .addName (Citations.GEOTIFF, "CT_MillerCylindrical")
- .addIdentifier(Citations.GEOTIFF, "20")
- .addName (Citations.PROJ4, "mill")
- .addIdentifier(Citations.MAP_INFO, "11")
-
.createGroupForMapProjection(toArray(MercatorSpherical.PARAMETERS.descriptors()));
+ PARAMETERS = builder().setCodeSpace(Citations.OGC, Constants.OGC)
+ .addName ("Miller_Cylindrical")
+ .addName (Citations.GEOTIFF, "CT_MillerCylindrical")
+ .addIdentifier(Citations.GEOTIFF, "20")
+ .addName (Citations.PROJ4, "mill")
+ .addIdentifier(Citations.MAP_INFO, "11")
+
.createGroupForMapProjection(toArray(MercatorSpherical.PARAMETERS.descriptors()));
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -21,13 +21,12 @@ import org.opengis.parameter.ParameterDe
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.ParameterNotFoundException;
import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.parameter.ParameterBuilder;
import org.apache.sis.parameter.Parameters;
import org.apache.sis.referencing.operation.projection.NormalizedProjection;
/**
- * The provider for "<cite>Oblique Stereographic</cite>" projection
(EPSG:9809).
+ * The provider for <cite>"Oblique Stereographic"</cite> projection
(EPSG:9809).
*
* @author Rueben Schulz (UBC)
* @author Martin Desruisseaux (Geomatys)
@@ -61,25 +60,24 @@ public final class ObliqueStereographic
*/
private static final ParameterDescriptorGroup PARAMETERS;
static {
- final ParameterBuilder builder = builder();
- PARAMETERS = builder
- .addIdentifier( "9809")
- .addName( "Oblique Stereographic")
- .addName(Citations.OGC, "Oblique_Stereographic")
- .addName(Citations.ESRI, "Double_Stereographic")
- .addName(Citations.GEOTIFF, "CT_ObliqueStereographic")
- .addName(Citations.S57, "Oblique stereographic")
- .addName(Citations.S57, "OST")
- .addName(Citations.PROJ4, "sterea")
- .addName( "Roussilhe")
- .addIdentifier(Citations.GEOTIFF, "16")
- .addIdentifier(Citations.S57, "14")
- .createGroupForMapProjection(
- LATITUDE_OF_ORIGIN,
- LONGITUDE_OF_ORIGIN,
- SCALE_FACTOR,
- FALSE_EASTING,
- FALSE_NORTHING);
+ PARAMETERS = builder()
+ .addIdentifier( "9809")
+ .addName( "Oblique Stereographic")
+ .addName(Citations.OGC, "Oblique_Stereographic")
+ .addName(Citations.ESRI, "Double_Stereographic")
+ .addName(Citations.GEOTIFF, "CT_ObliqueStereographic")
+ .addName(Citations.S57, "Oblique stereographic")
+ .addName(Citations.S57, "OST")
+ .addName(Citations.PROJ4, "sterea")
+ .addName( "Roussilhe")
+ .addIdentifier(Citations.GEOTIFF, "16")
+ .addIdentifier(Citations.S57, "14")
+ .createGroupForMapProjection(
+ LATITUDE_OF_ORIGIN,
+ LONGITUDE_OF_ORIGIN,
+ SCALE_FACTOR,
+ FALSE_EASTING,
+ FALSE_NORTHING);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -74,18 +74,18 @@ public final class PolarStereographicA e
.rename(Citations.GEOTIFF, "StraightVertPoleLong"));
PARAMETERS = builder
- .addIdentifier( IDENTIFIER)
- .addName( NAME)
- .addName(Citations.OGC, "Polar_Stereographic")
- .addName(Citations.GEOTIFF, "CT_PolarStereographic")
- .addName(Citations.PROJ4, "stere")
- .addIdentifier(Citations.GEOTIFF, "15")
- .createGroupForMapProjection(
- LATITUDE_OF_ORIGIN, // Can be only ±90°
- LONGITUDE_OF_ORIGIN,
- SCALE_FACTOR,
- FALSE_EASTING,
- FALSE_NORTHING);
+ .addIdentifier( IDENTIFIER)
+ .addName( NAME)
+ .addName(Citations.OGC, "Polar_Stereographic")
+ .addName(Citations.GEOTIFF, "CT_PolarStereographic")
+ .addName(Citations.PROJ4, "stere")
+ .addIdentifier(Citations.GEOTIFF, "15")
+ .createGroupForMapProjection(
+ LATITUDE_OF_ORIGIN, // Can be only ±90°
+ LONGITUDE_OF_ORIGIN,
+ SCALE_FACTOR,
+ FALSE_EASTING,
+ FALSE_NORTHING);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -90,17 +90,17 @@ public final class PolarStereographicB e
.setRemarks(notFormalParameter("Polar Stereographic (variant
A)")).setDeprecated(true));
PARAMETERS = builder
- .addIdentifier(IDENTIFIER)
- .addName("Polar Stereographic (variant B)")
- .addName(Citations.S57, "Polar stereographic")
- .addName(Citations.S57, "PST")
- .addIdentifier(Citations.S57, "11")
- .createGroupForMapProjection(
- STANDARD_PARALLEL,
- LONGITUDE_OF_ORIGIN,
- SCALE_FACTOR, // Not formally a parameter of this
projection.
- FALSE_EASTING,
- FALSE_NORTHING);
+ .addIdentifier(IDENTIFIER)
+ .addName("Polar Stereographic (variant B)")
+ .addName(Citations.S57, "Polar stereographic")
+ .addName(Citations.S57, "PST")
+ .addIdentifier(Citations.S57, "11")
+ .createGroupForMapProjection(
+ STANDARD_PARALLEL,
+ LONGITUDE_OF_ORIGIN,
+ SCALE_FACTOR, // Not formally a parameter of
this projection.
+ FALSE_EASTING,
+ FALSE_NORTHING);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicC.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -60,14 +60,14 @@ public final class PolarStereographicC e
private static final ParameterDescriptorGroup PARAMETERS;
static {
PARAMETERS = builder()
- .addIdentifier(IDENTIFIER)
- .addName("Polar Stereographic (variant C)")
- .createGroupForMapProjection(
- PolarStereographicB.STANDARD_PARALLEL,
- PolarStereographicB.LONGITUDE_OF_ORIGIN,
- PolarStereographicB.SCALE_FACTOR, // Not formally a
parameter of this projection.
- EASTING_AT_FALSE_ORIGIN,
- NORTHING_AT_FALSE_ORIGIN);
+ .addIdentifier(IDENTIFIER)
+ .addName("Polar Stereographic (variant C)")
+ .createGroupForMapProjection(
+ PolarStereographicB.STANDARD_PARALLEL,
+ PolarStereographicB.LONGITUDE_OF_ORIGIN,
+ PolarStereographicB.SCALE_FACTOR, // Not
formally a parameter of this projection.
+ EASTING_AT_FALSE_ORIGIN,
+ NORTHING_AT_FALSE_ORIGIN);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicNorth.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -59,8 +59,8 @@ public final class PolarStereographicNor
0, Latitude.MAX_VALUE, Latitude.MAX_VALUE,
NonSI.DEGREE_ANGLE);
PARAMETERS = builder
- .addName(Citations.ESRI, "Stereographic_North_Pole")
- .createGroupForMapProjection(parameters);
+ .addName(Citations.ESRI, "Stereographic_North_Pole")
+ .createGroupForMapProjection(parameters);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -79,8 +79,8 @@ public final class PolarStereographicSou
};
PARAMETERS = builder
- .addName(Citations.ESRI, "Stereographic_South_Pole")
- .createGroupForMapProjection(parameters);
+ .addName(Citations.ESRI, "Stereographic_South_Pole")
+ .createGroupForMapProjection(parameters);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PseudoMercator.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -18,11 +18,10 @@ package org.apache.sis.internal.referenc
import javax.xml.bind.annotation.XmlTransient;
import org.opengis.parameter.ParameterDescriptorGroup;
-import org.apache.sis.parameter.ParameterBuilder;
/**
- * The provider for "<cite>Popular Visualisation Pseudo Mercator</cite>"
projection (EPSG:1024).
+ * The provider for <cite>"Popular Visualisation Pseudo Mercator"</cite>
projection (EPSG:1024).
* This is also known as the "Google projection", defined by popular demand
but not considered
* a valid projection method.
*
@@ -48,11 +47,10 @@ public final class PseudoMercator extend
*/
private static final ParameterDescriptorGroup PARAMETERS;
static {
- final ParameterBuilder builder = builder();
- PARAMETERS = builder
- .addIdentifier(IDENTIFIER)
- .addName("Popular Visualisation Pseudo Mercator")
-
.createGroupForMapProjection(toArray(MercatorSpherical.PARAMETERS.descriptors()));
+ PARAMETERS = builder()
+ .addIdentifier(IDENTIFIER)
+ .addName("Popular Visualisation Pseudo Mercator")
+
.createGroupForMapProjection(toArray(MercatorSpherical.PARAMETERS.descriptors()));
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -24,7 +24,7 @@ import org.apache.sis.parameter.Paramete
/**
- * The provider for "<cite>Mercator (variant C)</cite>" projection (EPSG:1044).
+ * The provider for <cite>"Mercator (variant C)"</cite> projection (EPSG:1044).
*
* <div class="note"><b>Note on naming:</b>
* The "Regional Mercator" class name is inspired by MapInfo practice, while
not exactly the same projection.
@@ -90,14 +90,14 @@ public class RegionalMercator extends Ab
.rename(Citations.GEOTIFF, "FalseOriginNorthing"));
PARAMETERS = builder
- .addIdentifier(IDENTIFIER)
- .addName("Mercator (variant C)")
- .createGroupForMapProjection(
- Mercator2SP.STANDARD_PARALLEL,
- Mercator1SP.LONGITUDE_OF_ORIGIN, // Really "natural
origin", not "false origin".
- LATITUDE_OF_FALSE_ORIGIN,
- EASTING_AT_FALSE_ORIGIN,
- NORTHING_AT_FALSE_ORIGIN);
+ .addIdentifier(IDENTIFIER)
+ .addName("Mercator (variant C)")
+ .createGroupForMapProjection(
+ Mercator2SP.STANDARD_PARALLEL,
+ Mercator1SP.LONGITUDE_OF_ORIGIN, // Really "natural
origin", not "false origin".
+ LATITUDE_OF_FALSE_ORIGIN,
+ EASTING_AT_FALSE_ORIGIN,
+ NORTHING_AT_FALSE_ORIGIN);
}
/**
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java?rev=1713527&r1=1713526&r2=1713527&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
[UTF-8] Mon Nov 9 19:57:39 2015
@@ -79,28 +79,28 @@ public final class TransverseMercator ex
.rename(Citations.NETCDF, "scale_factor_at_central_meridian"));
PARAMETERS = builder
- .addIdentifier( "9807")
- .addName( "Transverse Mercator")
- .addName(Citations.OGC, "Transverse_Mercator")
- .addName(Citations.ESRI, "Transverse_Mercator")
- .addName(Citations.NETCDF, "TransverseMercator")
- .addName(Citations.GEOTIFF, "CT_TransverseMercator")
- .addName(Citations.S57, "Transverse Mercator")
- .addName(Citations.PROJ4, "tmerc")
- .addName( "Gauss-Kruger")
- .addName(Citations.ESRI, "Gauss_Kruger")
- .addName( "Gauss-Boaga")
- .addName( "TM")
- .addName(Citations.S57, "TME")
- .addIdentifier(Citations.GEOTIFF, "1")
- .addIdentifier(Citations.MAP_INFO, "8")
- .addIdentifier(Citations.S57, "13")
- .createGroupForMapProjection(
- LATITUDE_OF_ORIGIN,
- LONGITUDE_OF_ORIGIN,
- SCALE_FACTOR,
- FALSE_EASTING,
- FALSE_NORTHING);
+ .addIdentifier( "9807")
+ .addName( "Transverse Mercator")
+ .addName( "Gauss-Kruger")
+ .addName( "Gauss-Boaga")
+ .addName( "TM")
+ .addName(Citations.OGC, "Transverse_Mercator")
+ .addName(Citations.ESRI, "Transverse_Mercator")
+ .addName(Citations.ESRI, "Gauss_Kruger")
+ .addName(Citations.NETCDF, "TransverseMercator")
+ .addName(Citations.GEOTIFF, "CT_TransverseMercator")
+ .addName(Citations.S57, "Transverse Mercator")
+ .addName(Citations.S57, "TME")
+ .addName(Citations.PROJ4, "tmerc")
+ .addIdentifier(Citations.GEOTIFF, "1")
+ .addIdentifier(Citations.MAP_INFO, "8")
+ .addIdentifier(Citations.S57, "13")
+ .createGroupForMapProjection(
+ LATITUDE_OF_ORIGIN,
+ LONGITUDE_OF_ORIGIN,
+ SCALE_FACTOR,
+ FALSE_EASTING,
+ FALSE_NORTHING);
}
/**
