diff --git a/geotiff/src/main/java/org/orekit/rugged/geotiff/AngulerUnits.java b/geotiff/src/main/java/org/orekit/rugged/geotiff/AngulerUnits.java
index b41b8210eb2ce97bebabefc048e97ce3bc8e45f3..a642125a7ddeb5fd7b1523aece014d02e3517741 100644
--- a/geotiff/src/main/java/org/orekit/rugged/geotiff/AngulerUnits.java
+++ b/geotiff/src/main/java/org/orekit/rugged/geotiff/AngulerUnits.java
@@ -16,9 +16,13 @@
*/
package org.orekit.rugged.geotiff;
-
+/** Enumerate for angular units.
+ * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.1.4">GeoTIFF specification, section 6.3.1.4</a>
+ * @author Luc Maisonobe
+ */
enum AngulerUnits {
+ // CHECKSTYLE: stop JavadocVariable check
RADIAN(9101),
DEGREE(9102),
ARC_MINUTE(9103),
@@ -27,6 +31,7 @@ enum AngulerUnits {
GON(9106),
DMS(9107),
DMS_HEMISPHERE(9108);
+ // CHECKSTYLE: resume JavadocVariable check
/** Units ID. */
private final int id;
diff --git a/geotiff/src/main/java/org/orekit/rugged/geotiff/GeoKey.java b/geotiff/src/main/java/org/orekit/rugged/geotiff/GeoKey.java
index 225c7de73eb9c6f3dbc25bc528442f212cde45c0..c1a3b7bf67b18d7295416e9b4f41bc7cbdfadaf5 100644
--- a/geotiff/src/main/java/org/orekit/rugged/geotiff/GeoKey.java
+++ b/geotiff/src/main/java/org/orekit/rugged/geotiff/GeoKey.java
@@ -17,9 +17,13 @@
package org.orekit.rugged.geotiff;
-
+/** Enumerate for GeoTIFF keys.
+ * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.2">GeoTIFF specification, section 6.2</a>
+ * @author Luc Maisonobe
+ */
enum GeoKey {
+ // CHECKSTYLE: stop JavadocVariable check
GT_MODEL_TYPE(1024),
GT_RASTER_TYPE(1025),
GT_CITATION(1026),
@@ -68,6 +72,7 @@ enum GeoKey {
VERTICAL_CITATION(4097),
VERTICAL_DATUM(4098),
VERTICAL_UNITS(4099);
+ // CHECKSTYLE: resume JavadocVariable check
/** Key ID. */
private final int id;
diff --git a/geotiff/src/main/java/org/orekit/rugged/geotiff/GeoTiffDEM.java b/geotiff/src/main/java/org/orekit/rugged/geotiff/GeoTiffDEM.java
index 1b936478fbc7f342089c51235885d223ae02d13d..dbc6233f3b63c873c2af0a4b39c8f088268ceb70 100644
--- a/geotiff/src/main/java/org/orekit/rugged/geotiff/GeoTiffDEM.java
+++ b/geotiff/src/main/java/org/orekit/rugged/geotiff/GeoTiffDEM.java
@@ -102,37 +102,37 @@ public class GeoTiffDEM {
pixelsScales = content.findField(GeoTiffTagConstants.EXIF_TAG_MODEL_PIXEL_SCALE_TAG).getDoubleArrayValue();
tiePoint = content.findField(GeoTiffTagConstants.EXIF_TAG_MODEL_TIEPOINT_TAG).getDoubleArrayValue();
- TiffField geoAsciiParams = content.findField(GeoTiffTagConstants.EXIF_TAG_GEO_ASCII_PARAMS_TAG);
- TiffField geoDoubleParams = content.findField(GeoTiffTagConstants.EXIF_TAG_GEO_DOUBLE_PARAMS_TAG);
- int[] geoKeyDirectory = content.findField(GeoTiffTagConstants.EXIF_TAG_GEO_KEY_DIRECTORY_TAG).getIntArrayValue();
- int keyDirectoryVersion = geoKeyDirectory[0];
- int keyRevision = geoKeyDirectory[1];
- int minorRevision = geoKeyDirectory[2];
- int numberOfKeys = geoKeyDirectory[3];
+ final TiffField geoAsciiParams = content.findField(GeoTiffTagConstants.EXIF_TAG_GEO_ASCII_PARAMS_TAG);
+ final TiffField geoDoubleParams = content.findField(GeoTiffTagConstants.EXIF_TAG_GEO_DOUBLE_PARAMS_TAG);
+ final int[] geoKeyDirectory = content.findField(GeoTiffTagConstants.EXIF_TAG_GEO_KEY_DIRECTORY_TAG).getIntArrayValue();
+ final int keyDirectoryVersion = geoKeyDirectory[0];
+ final int keyRevision = geoKeyDirectory[1];
+ final int minorRevision = geoKeyDirectory[2];
+ final int numberOfKeys = geoKeyDirectory[3];
for (int i = 0; i < numberOfKeys; ++i) {
- GeoKey geoKey = GeoKey.getKey(geoKeyDirectory[4 * i + 4]);
- int location = geoKeyDirectory[4 * i + 5];
- int count = geoKeyDirectory[4 * i + 6];
- int valueOffset = geoKeyDirectory[4 * i + 7];
+ final GeoKey geoKey = GeoKey.getKey(geoKeyDirectory[4 * i + 4]);
+ final int location = geoKeyDirectory[4 * i + 5];
+ final int count = geoKeyDirectory[4 * i + 6];
+ final int valueOffset = geoKeyDirectory[4 * i + 7];
switch(geoKey) {
- case GT_MODEL_TYPE:
- modelType = ModelType.getType(getShort(geoKey, location, count, valueOffset));
- break;
- case GT_RASTER_TYPE:
- rasterType = RasterType.getType(getShort(geoKey, location, count, valueOffset));
- break;
- case GEOGRAPHIC_TYPE:
- csType = GeographicCoordinateSystemType.getType(getShort(geoKey, location, count, valueOffset));
- break;
- case GEOG_LINEAR_UNITS:
- linearUnits = LinearUnits.getUnits(getShort(geoKey, location, count, valueOffset));
- break;
- case GEOG_ANGULAR_UNITS:
- angulerUnits = AngulerUnits.getUnits(getShort(geoKey, location, count, valueOffset));
- break;
- default:
- // TODO: support the other geo keys
- throw new ImageReadException(geoKey + " unsupported for now");
+ case GT_MODEL_TYPE:
+ modelType = ModelType.getType(getShort(geoKey, location, count, valueOffset));
+ break;
+ case GT_RASTER_TYPE:
+ rasterType = RasterType.getType(getShort(geoKey, location, count, valueOffset));
+ break;
+ case GEOGRAPHIC_TYPE:
+ csType = GeographicCoordinateSystemType.getType(getShort(geoKey, location, count, valueOffset));
+ break;
+ case GEOG_LINEAR_UNITS:
+ linearUnits = LinearUnits.getUnits(getShort(geoKey, location, count, valueOffset));
+ break;
+ case GEOG_ANGULAR_UNITS:
+ angulerUnits = AngulerUnits.getUnits(getShort(geoKey, location, count, valueOffset));
+ break;
+ default:
+ // TODO: support the other geo keys
+ throw new ImageReadException(geoKey + " unsupported for now");
}
}
@@ -143,6 +143,7 @@ public class GeoTiffDEM {
* @param location location of the short
* @param count number of elements
* @param valueOffset offset of the value
+ * @return short value
* @exception ImageReadException if value cannot be retrieved
*/
private int getShort(final GeoKey key, final int location, final int count, final int valueOffset)
diff --git a/geotiff/src/main/java/org/orekit/rugged/geotiff/GeographicCoordinateSystemType.java b/geotiff/src/main/java/org/orekit/rugged/geotiff/GeographicCoordinateSystemType.java
index c695d7edce458895db049a4c0b868de4ea8787c4..ada43c73d9e3589a5d1b3d33972b3281a7e81c18 100644
--- a/geotiff/src/main/java/org/orekit/rugged/geotiff/GeographicCoordinateSystemType.java
+++ b/geotiff/src/main/java/org/orekit/rugged/geotiff/GeographicCoordinateSystemType.java
@@ -17,8 +17,13 @@
package org.orekit.rugged.geotiff;
+/** Enumerate for geographic coordinate system type.
+ * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.2.1">GeoTIFF specification, section 6.3.2.1</a>
+ * @author Luc Maisonobe
+ */
enum GeographicCoordinateSystemType {
+ // CHECKSTYLE: stop JavadocVariable check
GCS_UNDEFINED(0),
GCS_ADINDAN(4201),
GCS_AGD66(4202),
@@ -188,6 +193,7 @@ enum GeographicCoordinateSystemType {
GCSE_OSU91A(4033),
GCSE_CLARKE1880(4034),
GCSE_SPHERE(4035);
+ // CHECKSTYLE: resume JavadocVariable check
/** Type ID. */
private final int id;
diff --git a/geotiff/src/main/java/org/orekit/rugged/geotiff/LinearUnits.java b/geotiff/src/main/java/org/orekit/rugged/geotiff/LinearUnits.java
index e966797aa9e4d7f0bb773c579476701d6e361455..af1bba34e7fad53e75cacaaf91278b8dfbaecf5a 100644
--- a/geotiff/src/main/java/org/orekit/rugged/geotiff/LinearUnits.java
+++ b/geotiff/src/main/java/org/orekit/rugged/geotiff/LinearUnits.java
@@ -17,8 +17,13 @@
package org.orekit.rugged.geotiff;
+/** Enumerate for linear units.
+ * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.1.3">GeoTIFF specification, section 6.3.1.3</a>
+ * @author Luc Maisonobe
+ */
enum LinearUnits {
+ // CHECKSTYLE: stop JavadocVariable check
METER(9001),
FOOT(9002),
FOOT_US_SURVEY(9003),
@@ -34,6 +39,7 @@ enum LinearUnits {
YARD_INDIAN(9013),
FATHOM(9014),
MILE_INTERNATIONAL_NAUTICAL(9015);
+ // CHECKSTYLE: resume JavadocVariable check
/** Units ID. */
private final int id;
diff --git a/geotiff/src/main/java/org/orekit/rugged/geotiff/ModelType.java b/geotiff/src/main/java/org/orekit/rugged/geotiff/ModelType.java
index 46173d8ba1b6405011015a685159ae76452c1ed2..7f472cc6f5c956d53d8ba330f031fc2d3d224cae 100644
--- a/geotiff/src/main/java/org/orekit/rugged/geotiff/ModelType.java
+++ b/geotiff/src/main/java/org/orekit/rugged/geotiff/ModelType.java
@@ -17,12 +17,18 @@
package org.orekit.rugged.geotiff;
+/** Enumerate for model type.
+ * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.1.1">GeoTIFF specification, section 6.3.1.1</a>
+ * @author Luc Maisonobe
+ */
enum ModelType {
+ // CHECKSTYLE: stop JavadocVariable check
UNDEFINED(0),
PROJECTED(1),
GEOGRAPHIC(2),
GEOCENTRIC(3);
+ // CHECKSTYLE: resume JavadocVariable check
/** Type ID. */
private final int id;
diff --git a/geotiff/src/main/java/org/orekit/rugged/geotiff/RasterType.java b/geotiff/src/main/java/org/orekit/rugged/geotiff/RasterType.java
index 5ee46cdcd584b8ad08d95669fe18029ebb9e82b5..619f3c660927f5595baf3d07e0a0288b5377fd36 100644
--- a/geotiff/src/main/java/org/orekit/rugged/geotiff/RasterType.java
+++ b/geotiff/src/main/java/org/orekit/rugged/geotiff/RasterType.java
@@ -17,11 +17,17 @@
package org.orekit.rugged.geotiff;
+/** Enumerate for raster types.
+ * @see <a href="http://www.remotesensing.org/geotiff/spec/geotiff6.html#6.3.1.2">GeoTIFF specification, section 6.3.1.2</a>
+ * @author Luc Maisonobe
+ */
enum RasterType {
+ // CHECKSTYLE: stop JavadocVariable check
UNDEFINED(0),
RASTER_PIXEL_IS_AREA(1),
RASTER_PIXEL_IS_POINT(2);
+ // CHECKSTYLE: resume JavadocVariable check
/** Type ID. */
private final int id;