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 a8a46288fe Parsing of `<gml:EngineeringCRS>` should accept
`<coordinateSystem>` elements in addition of the more specific `<cartesianCS>`,
`<ellipsoidalCS>`, etc. Note that this commit does not completly fix the issue,
because the CRS type is not correctly resolved.
a8a46288fe is described below
commit a8a46288fe7845d6fd94318a6e8906ba9841716b
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Thu Aug 11 15:48:10 2022 +0200
Parsing of `<gml:EngineeringCRS>` should accept `<coordinateSystem>`
elements
in addition of the more specific `<cartesianCS>`, `<ellipsoidalCS>`, etc.
Note that this commit does not completly fix the issue,
because the CRS type is not correctly resolved.
---
.../sis/referencing/AbstractIdentifiedObject.java | 4 ++++
.../sis/referencing/AbstractReferenceSystem.java | 2 ++
.../org/apache/sis/referencing/crs/AbstractCRS.java | 1 +
.../sis/referencing/crs/DefaultEngineeringCRS.java | 18 ++++++++++--------
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 285fc7f4ae..449d24bbe7 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@ -178,6 +178,7 @@ public class AbstractIdentifiedObject extends
FormattableObject implements Ident
* @see #getName()
* @see #getNames()
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
private Identifier name;
/**
@@ -188,6 +189,7 @@ public class AbstractIdentifiedObject extends
FormattableObject implements Ident
* <p><b>Consider this field as final!</b>
* This field is modified only at unmarshalling time by {@link
Names#add(Identifier)}.</p>
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
private Collection<GenericName> alias;
/**
@@ -200,6 +202,7 @@ public class AbstractIdentifiedObject extends
FormattableObject implements Ident
* @see #getIdentifiers()
* @see #getIdentifier()
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
private Set<Identifier> identifiers;
/**
@@ -210,6 +213,7 @@ public class AbstractIdentifiedObject extends
FormattableObject implements Ident
*
* @see #getRemarks()
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
private InternationalString remarks;
/**
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
index 1f3457ace8..915c24b8e3 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractReferenceSystem.java
@@ -82,6 +82,7 @@ public class AbstractReferenceSystem extends
AbstractIdentifiedObject implements
*
* @see #getDomainOfValidity()
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
private Extent domainOfValidity;
/**
@@ -93,6 +94,7 @@ public class AbstractReferenceSystem extends
AbstractIdentifiedObject implements
*
* @see #getScope()
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
private InternationalString scope;
/**
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
index 656f309cf2..2f51bc3b8e 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/AbstractCRS.java
@@ -118,6 +118,7 @@ public class AbstractCRS extends AbstractReferenceSystem
implements CoordinateRe
*
* @see #getCoordinateSystem()
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
private CoordinateSystem coordinateSystem;
/**
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
index 8d8965e149..624d907d80 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
@@ -60,7 +60,7 @@ import static
org.apache.sis.util.ArgumentChecks.ensureNonNull;
* in the javadoc, this condition holds if all components were created using
only SIS factories and static constants.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @version 0.7
+ * @version 1.3
*
* @see org.apache.sis.referencing.datum.DefaultEngineeringDatum
* @see
org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createEngineeringCRS(String)
@@ -87,6 +87,7 @@ public class DefaultEngineeringCRS extends AbstractCRS
implements EngineeringCRS
*
* @see #getDatum()
*/
+ @SuppressWarnings("serial") // Not statically typed as
Serializable.
private EngineeringDatum datum;
/**
@@ -214,13 +215,14 @@ public class DefaultEngineeringCRS extends AbstractCRS
implements EngineeringCRS
*/
@Override
@XmlElements({
- @XmlElement(name = "cartesianCS", type = DefaultCartesianCS.class),
- @XmlElement(name = "affineCS", type = DefaultAffineCS.class),
- @XmlElement(name = "cylindricalCS", type = DefaultCylindricalCS.class),
- @XmlElement(name = "linearCS", type = DefaultLinearCS.class),
- @XmlElement(name = "polarCS", type = DefaultPolarCS.class),
- @XmlElement(name = "sphericalCS", type = DefaultSphericalCS.class),
- @XmlElement(name = "userDefinedCS", type = DefaultUserDefinedCS.class)
+ @XmlElement(name = "cartesianCS", type =
DefaultCartesianCS.class),
+ @XmlElement(name = "affineCS", type = DefaultAffineCS.class),
+ @XmlElement(name = "cylindricalCS", type =
DefaultCylindricalCS.class),
+ @XmlElement(name = "linearCS", type = DefaultLinearCS.class),
+ @XmlElement(name = "polarCS", type = DefaultPolarCS.class),
+ @XmlElement(name = "sphericalCS", type =
DefaultSphericalCS.class),
+ @XmlElement(name = "userDefinedCS", type =
DefaultUserDefinedCS.class),
+ @XmlElement(name = "coordinateSystem", type = AbstractCS.class)
})
public CoordinateSystem getCoordinateSystem() {
return super.getCoordinateSystem();
