You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2019/10/21 18:40:55 UTC
[sis] branch geoapi-4.0 updated: Correction in the report of
default values.
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 d28ce40 Correction in the report of default values.
d28ce40 is described below
commit d28ce4014b9283965b11ab9a34a5be9538406dea
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon Oct 21 14:17:41 2019 +0200
Correction in the report of default values.
---
.../sis/internal/referencing/provider/Equirectangular.java | 2 --
.../sis/internal/referencing/provider/GeocentricAffine.java | 3 ---
.../internal/referencing/provider/LambertConformal1SP.java | 5 -----
.../referencing/provider/LambertConformalMichigan.java | 1 -
.../referencing/provider/LambertCylindricalEqualArea.java | 1 -
.../apache/sis/internal/referencing/provider/Mercator1SP.java | 6 ------
.../apache/sis/internal/referencing/provider/Mercator2SP.java | 3 ---
.../sis/internal/referencing/provider/ObliqueMercator.java | 6 ------
.../internal/referencing/provider/ObliqueStereographic.java | 5 -----
.../internal/referencing/provider/PolarStereographicA.java | 5 -----
.../internal/referencing/provider/PolarStereographicB.java | 5 -----
.../sis/internal/referencing/provider/RegionalMercator.java | 1 -
.../sis/internal/referencing/provider/TransverseMercator.java | 5 -----
.../referencing/provider/ParameterNameTableGenerator.java | 11 ++++++++---
14 files changed, 8 insertions(+), 51 deletions(-)
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
index 8469aec..b145716 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
@@ -105,7 +105,6 @@ public final class Equirectangular extends AbstractProvider {
* <b>Notes:</b>
* <ul>
* <li>Value domain: (-90.0 … 90.0)°</li>
- * <li>No default value</li>
* </ul>
*/
public static final ParameterDescriptor<Double> STANDARD_PARALLEL;
@@ -130,7 +129,6 @@ public final class Equirectangular extends AbstractProvider {
* <b>Notes:</b>
* <ul>
* <li>Value restricted to 0</li>
- * <li>No default value</li>
* <li>Optional</li>
* </ul>
*/
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
index 032ecd2..501236a 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
@@ -131,7 +131,6 @@ public abstract class GeocentricAffine extends GeodeticOperation {
* <b>Notes:</b>
* <ul>
* <li>Value domain: [-648000.0 … 648000.0]″</li>
- * <li>No default value</li>
* </ul>
*/
static final ParameterDescriptor<Double> RX;
@@ -150,7 +149,6 @@ public abstract class GeocentricAffine extends GeodeticOperation {
* <b>Notes:</b>
* <ul>
* <li>Value domain: [-648000.0 … 648000.0]″</li>
- * <li>No default value</li>
* </ul>
*/
static final ParameterDescriptor<Double> RY;
@@ -169,7 +167,6 @@ public abstract class GeocentricAffine extends GeodeticOperation {
* <b>Notes:</b>
* <ul>
* <li>Value domain: [-648000.0 … 648000.0]″</li>
- * <li>No default value</li>
* </ul>
*/
static final ParameterDescriptor<Double> RZ;
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
index 1c8f138..9cb8a97 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal1SP.java
@@ -99,11 +99,6 @@ public final class LambertConformal1SP extends AbstractLambert {
* <tr><td> GeoTIFF: </td><td> ScaleAtNatOrigin </td></tr>
* <tr><td> Proj4: </td><td> k </td></tr>
* </table>
- * <b>Notes:</b>
- * <ul>
- * <li>Value domain: (0.0 … ∞)</li>
- * <li>Default value: 1</li>
- * </ul>
*/
public static final ParameterDescriptor<Double> SCALE_FACTOR = Mercator1SP.SCALE_FACTOR;
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
index 8143960..0716f30 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformalMichigan.java
@@ -54,7 +54,6 @@ public final class LambertConformalMichigan extends AbstractLambert {
* </table>
* <b>Notes:</b>
* <ul>
- * <li>Value domain: (0.0 … ∞)</li>
* <li>No default value</li>
* </ul>
*/
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java
index 8cedc5d..5719dd6 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java
@@ -61,7 +61,6 @@ public final class LambertCylindricalEqualArea extends MapProjection {
* <b>Notes:</b>
* <ul>
* <li>Value domain: (-90.0 … 90.0)°</li>
- * <li>No default value</li>
* </ul>
*/
public static final ParameterDescriptor<Double> STANDARD_PARALLEL = Equirectangular.STANDARD_PARALLEL;
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
index 0552b71..d84fd0e 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator1SP.java
@@ -62,7 +62,6 @@ public final class Mercator1SP extends AbstractMercator {
* <b>Notes:</b>
* <ul>
* <li>Value restricted to 0</li>
- * <li>No default value</li>
* </ul>
*/
public static final ParameterDescriptor<Double> LATITUDE_OF_ORIGIN;
@@ -98,11 +97,6 @@ public final class Mercator1SP extends AbstractMercator {
* <tr><td> GeoTIFF: </td><td> ScaleAtNatOrigin </td></tr>
* <tr><td> Proj4: </td><td> k </td></tr>
* </table>
- * <b>Notes:</b>
- * <ul>
- * <li>Value domain: (0.0 … ∞)</li>
- * <li>Default value: 1</li>
- * </ul>
*/
public static final ParameterDescriptor<Double> SCALE_FACTOR;
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
index 9569b39..18e79c2 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Mercator2SP.java
@@ -67,7 +67,6 @@ public final class Mercator2SP extends AbstractMercator {
* <b>Notes:</b>
* <ul>
* <li>Value domain: (-90.0 … 90.0)°</li>
- * <li>No default value</li>
* </ul>
*/
public static final ParameterDescriptor<Double> STANDARD_PARALLEL = Equirectangular.STANDARD_PARALLEL;
@@ -90,8 +89,6 @@ public final class Mercator2SP extends AbstractMercator {
* </table>
* <b>Notes:</b>
* <ul>
- * <li>Value domain: (0.0 … ∞)</li>
- * <li>Default value: 1</li>
* <li>Optional</li>
* </ul>
*/
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueMercator.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueMercator.java
index 3031495..9215a92 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueMercator.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueMercator.java
@@ -70,7 +70,6 @@ public class ObliqueMercator extends AbstractMercator {
* <b>Notes:</b>
* <ul>
* <li>Value domain: (-90.0 … 90.0)°</li>
- * <li>No default value</li>
* </ul>
*/
public static final ParameterDescriptor<Double> LATITUDE_OF_CENTRE;
@@ -147,11 +146,6 @@ public class ObliqueMercator extends AbstractMercator {
* <tr><td> GeoTIFF: </td><td> ScaleAtCenter </td></tr>
* <tr><td> Proj4: </td><td> k </td></tr>
* </table>
- * <b>Notes:</b>
- * <ul>
- * <li>Value domain: (0.0 … ∞)</li>
- * <li>Default value: 1</li>
- * </ul>
*/
public static final ParameterDescriptor<Double> SCALE_FACTOR;
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
index d689450..c453bd6 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
@@ -92,11 +92,6 @@ public final class ObliqueStereographic extends AbstractStereographic {
* <tr><td> GeoTIFF: </td><td> ScaleAtNatOrigin </td></tr>
* <tr><td> Proj4: </td><td> k </td></tr>
* </table>
- * <b>Notes:</b>
- * <ul>
- * <li>Value domain: (0.0 … ∞)</li>
- * <li>Default value: 1</li>
- * </ul>
*/
public static final ParameterDescriptor<Double> SCALE_FACTOR = Mercator1SP.SCALE_FACTOR; // Same as PolarStereographicA.
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
index db375a9..15f023c 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicA.java
@@ -111,11 +111,6 @@ public final class PolarStereographicA extends AbstractStereographic {
* <tr><td> GeoTIFF: </td><td> ScaleAtNatOrigin </td></tr>
* <tr><td> Proj4: </td><td> k </td></tr>
* </table>
- * <b>Notes:</b>
- * <ul>
- * <li>Value domain: (0.0 … ∞)</li>
- * <li>Default value: 1</li>
- * </ul>
*/
public static final ParameterDescriptor<Double> SCALE_FACTOR = Mercator1SP.SCALE_FACTOR;
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
index 50e47b0..d254585 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicB.java
@@ -100,11 +100,6 @@ public final class PolarStereographicB extends AbstractStereographic {
* <tr><td> ESRI: </td><td> Scale_Factor </td></tr>
* <tr><td> Proj4: </td><td> k </td></tr>
* </table>
- * <b>Notes:</b>
- * <ul>
- * <li>Value domain: (0.0 … ∞)</li>
- * <li>Default value: 1</li>
- * </ul>
*/
static final ParameterDescriptor<Double> SCALE_FACTOR;
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
index e2c39d0..8f64cb9 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/RegionalMercator.java
@@ -66,7 +66,6 @@ public class RegionalMercator extends AbstractMercator {
* <b>Notes:</b>
* <ul>
* <li>Value domain: (-90.0 … 90.0)°</li>
- * <li>No default value</li>
* </ul>
*/
public static final ParameterDescriptor<Double> LATITUDE_OF_FALSE_ORIGIN;
diff --git a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
index 3be6f8b..6b440b9 100644
--- a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
+++ b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/TransverseMercator.java
@@ -104,11 +104,6 @@ public final class TransverseMercator extends AbstractMercator {
* <tr><td> GeoTIFF: </td><td> ScaleAtNatOrigin </td></tr>
* <tr><td> Proj4: </td><td> k </td></tr>
* </table>
- * <b>Notes:</b>
- * <ul>
- * <li>Value domain: (0.0 … ∞)</li>
- * <li>Default value: 1</li>
- * </ul>
*/
public static final ParameterDescriptor<Double> SCALE_FACTOR;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ParameterNameTableGenerator.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ParameterNameTableGenerator.java
index 6f8d309..ca3b881 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ParameterNameTableGenerator.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ParameterNameTableGenerator.java
@@ -57,7 +57,8 @@ public final class ParameterNameTableGenerator extends SimpleFileVisitor<Path> {
/**
* Value as the kind of object expected in {@link DefaultParameterDescriptor}.
*/
- private static final Double POSITIVE_ZERO = +0d,
+ private static final Double ONE = 1d,
+ POSITIVE_ZERO = +0d,
NEGATIVE_ZERO = -0d,
MIN_LONGITUDE = Longitude.MIN_VALUE,
MAX_LONGITUDE = Longitude.MAX_VALUE,
@@ -228,11 +229,15 @@ public final class ParameterNameTableGenerator extends SimpleFileVisitor<Path> {
if (inclusive && MIN_LONGITUDE.equals(minValue) && MAX_LONGITUDE.equals(maxValue)) {
valueDomain = null;
}
+ } else if (fieldName.contains("SCALE")) {
+ if (!inclusive && POSITIVE_ZERO.equals(minValue) && maxValue == null) {
+ valueDomain = null;
+ }
} else if (minValue == null && maxValue == null) {
valueDomain = null;
}
}
- if (POSITIVE_ZERO.equals(defaultValue)) {
+ if ((fieldName.contains("SCALE") ? ONE : POSITIVE_ZERO).equals(defaultValue)) {
defaultValue = null;
}
if (defaultValue != null || valueDomain != null || isOptional || noDefault) {
@@ -272,7 +277,7 @@ public final class ParameterNameTableGenerator extends SimpleFileVisitor<Path> {
}
lines.add(insertAt++, buffer.append("</li>").toString());
buffer.setLength(p);
- } else {
+ } else if (noDefault) {
write(insertAt++, " <li>No default value</li>");
}
if (isOptional) {