This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-3.1 by this push:
new d9303f1d7d Temporarily use "2.0" as the version number for methods
that are deprecated in the `geoapi-3.1` branch but not yet on main.
d9303f1d7d is described below
commit d9303f1d7d9a1126f0c7c7ff4bec383a60d2574b
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Apr 16 13:08:39 2024 +0200
Temporarily use "2.0" as the version number for methods that are deprecated
in the `geoapi-3.1` branch but not yet on main.
---
.../main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java | 4 ++--
.../org/apache/sis/referencing/factory/AuthorityFactoryProxy.java | 4 +++-
.../apache/sis/referencing/factory/ConcurrentAuthorityFactory.java | 2 +-
.../apache/sis/referencing/factory/GeodeticAuthorityFactory.java | 2 +-
.../org/apache/sis/referencing/factory/GeodeticObjectFactory.java | 6 +++---
.../org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java | 2 +-
.../org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java | 2 +-
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
index f7584808d6..e0a3a531aa 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
@@ -168,7 +168,7 @@ public class DefaultVerticalDatum extends AbstractDatum
implements VerticalDatum
*
* @deprecated As of ISO 19111:2019, the {@code VerticalDatumType}
argument is replaced by {@code RealizationMethod}.
*/
- @Deprecated(since = "2.0")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public DefaultVerticalDatum(final Map<String,?> properties, final
VerticalDatumType type) {
super(properties);
this.type = Objects.requireNonNull(type);
@@ -289,7 +289,7 @@ public class DefaultVerticalDatum extends AbstractDatum
implements VerticalDatum
* @deprecated As of ISO 19111:2019, the {@code VerticalDatumType}
argument is replaced by {@code RealizationMethod}.
*/
@Override
- @Deprecated(since = "2.0")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public VerticalDatumType getVerticalDatumType() {
return type();
}
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
index 2063b996f8..1c2cba8911 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
@@ -460,7 +460,7 @@ abstract class AuthorityFactoryProxy<T> {
}
};
- @Deprecated(since = "1.5")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
static final AuthorityFactoryProxy<GeocentricCRS> GEOCENTRIC_CRS =
new AuthorityFactoryProxy<GeocentricCRS>(GeocentricCRS.class,
AuthorityFactoryIdentifier.CRS) {
@Override GeocentricCRS create(GeodeticAuthorityFactory factory,
String code) throws FactoryException {
@@ -571,6 +571,8 @@ abstract class AuthorityFactoryProxy<T> {
static final AuthorityFactoryProxy<?>[] PROXIES = new
AuthorityFactoryProxy<?>[] {
PROJECTED_CRS, // Special kind of GeneralDerivedCRS.
GEOGRAPHIC_CRS, // Special kind of GeodeticCRS.
+ GEOCENTRIC_CRS, // Special kind of GeodeticCRS.
+ GEODETIC_CRS,
VERTICAL_CRS,
TEMPORAL_CRS,
IMAGE_CRS, // Can be seen as a special kind of EngineeringCRS
(even if not shown in hierarchy).
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
index d413fc2e81..74351d232d 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
@@ -959,7 +959,7 @@ public abstract class ConcurrentAuthorityFactory<DAO
extends GeodeticAuthorityFa
* Use {@link #createGeodeticCRS(String)} instead.
*/
@Override
- @Deprecated(since = "1.5")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public GeocentricCRS createGeocentricCRS(final String code) throws
FactoryException {
if (isDefault(GeocentricCRS.class)) {
return super.createGeocentricCRS(code);
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
index dd82d9d24a..f821033e25 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
@@ -352,7 +352,7 @@ public abstract class GeodeticAuthorityFactory extends
AbstractFactory implement
* @deprecated ISO 19111:2019 does not define an explicit class for
geocentric CRS.
* Use {@link #createGeodeticCRS(String)} instead.
*/
- @Deprecated(since = "1.5")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public GeocentricCRS createGeocentricCRS(final String code) throws
NoSuchAuthorityCodeException, FactoryException {
return cast(GeocentricCRS.class,
createCoordinateReferenceSystem(code), code);
}
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
index 4ce6146e6e..e65cd8db77 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
@@ -370,7 +370,7 @@ public class GeodeticObjectFactory extends AbstractFactory
implements CRSFactory
* Use {@link #createGeodeticCRS(Map, GeodeticDatum, CartesianCS)} instead.
*/
@Override
- @Deprecated(since = "1.5")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public GeocentricCRS createGeocentricCRS(final Map<String,?> properties,
final GeodeticDatum datum, final CartesianCS cs) throws
FactoryException
{
@@ -475,7 +475,7 @@ public class GeodeticObjectFactory extends AbstractFactory
implements CRSFactory
* Use {@link #createGeodeticCRS(Map, GeodeticDatum, SphericalCS)} instead.
*/
@Override
- @Deprecated(since = "1.5")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public GeocentricCRS createGeocentricCRS(final Map<String,?> properties,
final GeodeticDatum datum, final SphericalCS cs) throws
FactoryException
{
@@ -981,7 +981,7 @@ public class GeodeticObjectFactory extends AbstractFactory
implements CRSFactory
* @deprecated As of ISO 19111:2019, the {@code VerticalDatumType}
argument is replaced by {@code RealizationMethod}.
*/
@Override
- @Deprecated(since = "2.0")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public VerticalDatum createVerticalDatum(final Map<String,?> properties,
final VerticalDatumType type) throws FactoryException
{
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
index 90c823c28c..f576b9134a 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
@@ -973,7 +973,7 @@ public class MultiAuthoritiesFactory extends
GeodeticAuthorityFactory implements
* Use {@link #createGeodeticCRS(String)} instead.
*/
@Override
- @Deprecated(since = "1.5")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public GeocentricCRS createGeocentricCRS(final String code) throws
FactoryException {
return create(AuthorityFactoryProxy.GEOCENTRIC_CRS, code);
}
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
index 5f7e4168c7..fb8d75c11c 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxyCRS.java
@@ -82,7 +82,7 @@ public final class EPSGFactoryProxyCRS extends
EPSGFactoryProxy implements CRSAu
return factory().createGeographicCRS(code);
}
- @Deprecated(since = "1.5")
+ @Deprecated(since = "2.0") // Temporary version number until this branch
is released.
public GeocentricCRS createGeocentricCRS(String code) throws
FactoryException {
return factory().createGeocentricCRS(code);
}
