This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 3b88cdcb7d Add GeoTIFF parameter names to Sinusoidal projection.
Javadoc updates.
3b88cdcb7d is described below
commit 3b88cdcb7db2041c684b8147e114de3df5f083bf
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Mon Sep 26 12:43:08 2022 +0200
Add GeoTIFF parameter names to Sinusoidal projection.
Javadoc updates.
---
.../org/apache/sis/internal/referencing/provider/ESRI.java | 13 ++++++++++---
.../apache/sis/internal/referencing/provider/Mollweide.java | 3 +++
.../internal/referencing/provider/SatelliteTracking.java | 4 ++++
.../sis/internal/referencing/provider/Sinusoidal.java | 3 +++
.../operation/transform/InterpolatedTransform.java | 8 ++++----
5 files changed, 24 insertions(+), 7 deletions(-)
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ESRI.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ESRI.java
index 3ee4617844..7af10a4c10 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ESRI.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ESRI.java
@@ -44,6 +44,7 @@ final class ESRI extends Static {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Central_Meridian </td></tr>
* <tr><td> OGC: </td><td> central_meridian </td></tr>
+ * <tr><td> GeoTIFF: </td><td> CenterLong </td></tr>
* <tr><td> Proj4: </td><td> lon_0 </td></tr>
* </table>
*/
@@ -58,6 +59,7 @@ final class ESRI extends Static {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Latitude_Of_Origin </td></tr>
* <tr><td> OGC: </td><td> latitude_of_origin </td></tr>
+ * <tr><td> GeoTIFF: </td><td> CenterLat </td></tr>
* <tr><td> Proj4: </td><td> lat_0 </td></tr>
* </table>
*/
@@ -72,6 +74,7 @@ final class ESRI extends Static {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Standard_Parallel_1 </td></tr>
* <tr><td> OGC: </td><td> standard_parallel_1 </td></tr>
+ * <tr><td> GeoTIFF: </td><td> StdParallel1 </td></tr>
* <tr><td> Proj4: </td><td> lat_1 </td></tr>
* </table>
*/
@@ -86,6 +89,7 @@ final class ESRI extends Static {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Standard_Parallel_2 </td></tr>
* <tr><td> OGC: </td><td> standard_parallel_2 </td></tr>
+ * <tr><td> GeoTIFF: </td><td> StdParallel2 </td></tr>
* <tr><td> Proj4: </td><td> lat_2 </td></tr>
* </table>
*/
@@ -100,6 +104,7 @@ final class ESRI extends Static {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> False_Easting </td></tr>
* <tr><td> OGC: </td><td> false_easting </td></tr>
+ * <tr><td> GeoTIFF: </td><td> FalseEasting </td></tr>
* <tr><td> Proj4: </td><td> x_0 </td></tr>
* </table>
*/
@@ -114,6 +119,7 @@ final class ESRI extends Static {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> False_Northing </td></tr>
* <tr><td> OGC: </td><td> false_northing </td></tr>
+ * <tr><td> GeoTIFF: </td><td> FalseNorthing </td></tr>
* <tr><td> Proj4: </td><td> y_0 </td></tr>
* </table>
*/
@@ -145,8 +151,9 @@ final class ESRI extends Static {
* @return the given {@code builder}, for method call chaining.
*/
static ParameterBuilder copyNames(final ParameterBuilder builder, final
ParameterDescriptor<Double> template) {
- return builder.addNameAndIdentifier(Citations.ESRI, template)
- .addNameAndIdentifier(Citations.OGC, template)
- .addNameAndIdentifier(Citations.PROJ4, template);
+ return builder.addNameAndIdentifier(Citations.ESRI, template)
+ .addNameAndIdentifier(Citations.OGC, template)
+ .addNameAndIdentifier(Citations.GEOTIFF, template)
+ .addNameAndIdentifier(Citations.PROJ4, template);
}
}
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mollweide.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mollweide.java
index bca51a1cf9..0aa7255b3e 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mollweide.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mollweide.java
@@ -55,6 +55,7 @@ public final class Mollweide extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Central_Meridian </td></tr>
* <tr><td> OGC: </td><td> central_meridian </td></tr>
+ * <tr><td> GeoTIFF: </td><td> CenterLong </td></tr>
* <tr><td> Proj4: </td><td> lon_0 </td></tr>
* </table>
*/
@@ -69,6 +70,7 @@ public final class Mollweide extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> False_Easting </td></tr>
* <tr><td> OGC: </td><td> false_easting </td></tr>
+ * <tr><td> GeoTIFF: </td><td> FalseEasting </td></tr>
* <tr><td> Proj4: </td><td> x_0 </td></tr>
* </table>
*/
@@ -83,6 +85,7 @@ public final class Mollweide extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> False_Northing </td></tr>
* <tr><td> OGC: </td><td> false_northing </td></tr>
+ * <tr><td> GeoTIFF: </td><td> FalseNorthing </td></tr>
* <tr><td> Proj4: </td><td> y_0 </td></tr>
* </table>
*/
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/SatelliteTracking.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/SatelliteTracking.java
index 6d9a5f30da..f4988d6d57 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/SatelliteTracking.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/SatelliteTracking.java
@@ -58,6 +58,7 @@ public class SatelliteTracking extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Central_Meridian </td></tr>
* <tr><td> OGC: </td><td> central_meridian </td></tr>
+ * <tr><td> GeoTIFF: </td><td> CenterLong </td></tr>
* <tr><td> Proj4: </td><td> lon_0 </td></tr>
* </table>
*/
@@ -71,6 +72,7 @@ public class SatelliteTracking extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Latitude_Of_Origin </td></tr>
* <tr><td> OGC: </td><td> latitude_of_origin </td></tr>
+ * <tr><td> GeoTIFF: </td><td> CenterLat </td></tr>
* <tr><td> Proj4: </td><td> lat_0 </td></tr>
* </table>
*/
@@ -86,6 +88,7 @@ public class SatelliteTracking extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Standard_Parallel_1 </td></tr>
* <tr><td> OGC: </td><td> standard_parallel_1 </td></tr>
+ * <tr><td> GeoTIFF: </td><td> StdParallel1 </td></tr>
* <tr><td> Proj4: </td><td> lat_1 </td></tr>
* </table>
*/
@@ -101,6 +104,7 @@ public class SatelliteTracking extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Standard_Parallel_2 </td></tr>
* <tr><td> OGC: </td><td> standard_parallel_2 </td></tr>
+ * <tr><td> GeoTIFF: </td><td> StdParallel2 </td></tr>
* <tr><td> Proj4: </td><td> lat_2 </td></tr>
* </table>
*/
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Sinusoidal.java
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Sinusoidal.java
index fe7b7d8586..61eade7eea 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Sinusoidal.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Sinusoidal.java
@@ -57,6 +57,7 @@ public class Sinusoidal extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> Central_Meridian </td></tr>
* <tr><td> OGC: </td><td> central_meridian </td></tr>
+ * <tr><td> GeoTIFF: </td><td> CenterLong </td></tr>
* <tr><td> Proj4: </td><td> lon_0 </td></tr>
* </table>
*/
@@ -71,6 +72,7 @@ public class Sinusoidal extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> False_Easting </td></tr>
* <tr><td> OGC: </td><td> false_easting </td></tr>
+ * <tr><td> GeoTIFF: </td><td> FalseEasting </td></tr>
* <tr><td> Proj4: </td><td> x_0 </td></tr>
* </table>
*/
@@ -85,6 +87,7 @@ public class Sinusoidal extends MapProjection {
* <caption>Parameter names</caption>
* <tr><td> ESRI: </td><td> False_Northing </td></tr>
* <tr><td> OGC: </td><td> false_northing </td></tr>
+ * <tr><td> GeoTIFF: </td><td> FalseNorthing </td></tr>
* <tr><td> Proj4: </td><td> y_0 </td></tr>
* </table>
*/
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
index 44591bf026..082da3cbbc 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
@@ -359,7 +359,7 @@ public class InterpolatedTransform extends
DatumShiftTransform {
}
/*
- * NOTE: we do not bother to override the methods expecting a 'float'
array because those methods should
+ * NOTE: we do not bother to override the methods expecting a `float`
array because those methods should
* be rarely invoked. Since there is usually LinearTransforms before
and after this transform, the
* conversion between float and double will be handled by those
LinearTransforms. If nevertheless
* this InterpolatedTransform is at the beginning or the end of a
transformation chain, the methods
@@ -568,7 +568,7 @@ public class InterpolatedTransform extends
DatumShiftTransform {
if (SIMPLE) {
/*
* We want (xi, yi) such as the following conditions
hold
- * (see next commnt for the simplification applied
here):
+ * (see next comment for the simplification applied
here):
*
* xi + vector[0] ≈ x ⟶ xi ≈ x -
vector[0]
* yi + vector[1] ≈ y ⟶ yi ≈ y -
vector[1]
@@ -577,7 +577,7 @@ public class InterpolatedTransform extends
DatumShiftTransform {
final double oy = yi;
xi = x - vector[0];
yi = y - vector[1];
- if (!(Math.abs(xi - ox) > tol || Math.abs(yi - oy) >
tol)) break; // Use '!' for catching NaN.
+ if (!(Math.abs(xi - ox) > tol || Math.abs(yi - oy) >
tol)) break; // Use `!` for catching NaN.
} else {
/*
* The error between the new position (xi + tx) and
the desired position x is measured
@@ -625,7 +625,7 @@ public class InterpolatedTransform extends
DatumShiftTransform {
*/
xi -= dx;
yi -= dy;
- if (!(Math.abs(ex) > tol || Math.abs(ey) > tol))
break; // Use '!' for catching NaN.
+ if (!(Math.abs(ex) > tol || Math.abs(ey) > tol))
break; // Use `!` for catching NaN.
}
/*
* At this point we determined that we need to iterate
more. If iteration does not converge, we may relax
