diff --git a/geoapi/src/main/java/org/opengis/annotation/Specification.java b/geoapi/src/main/java/org/opengis/annotation/Specification.java index 9296a26a8..0281e722c 100644 --- a/geoapi/src/main/java/org/opengis/annotation/Specification.java +++ b/geoapi/src/main/java/org/opengis/annotation/Specification.java @@ -148,46 +148,57 @@ public enum Specification { ISO_19109((short) 2013), /** - * ISO 19111, Spatial Referencing by Coordinates + * ISO 19111, Referencing by coordinates * (OGC Topic 2). * This is the specification for package {@link org.opengis.referencing} and sub-packages. * *

ISO abstract:

*
- *

Defines the conceptual schema for the description of spatial referencing by - * coordinates, optionally extended to spatio-temporal referencing. It describes the minimum - * data required to define one-, two- and three-dimensional spatial coordinate reference systems - * with an extension to merged spatial-temporal reference systems. It allows additional descriptive - * information to be provided. It also describes the information required to change coordinates - * from one coordinate reference system to another.

- * - *

In ISO 19111, a coordinate reference system does not change with time. - * For coordinate reference systems defined on moving platforms such as cars, ships, aircraft and - * spacecraft, the transformation to an Earth-fixed coordinate reference system can include a time - * element.

- * - *

ISO 19111 is applicable to producers and users of geographic information. - * Although it is applicable to digital geographic data, its principles can be extended to many - * other forms of geographic data such as maps, charts and text documents.

- * - *

The schema described can be applied to the combination of horizontal - * position with a third non-spatial parameter which varies monotonically with height or depth. - * This extension to non-spatial data is beyond the scope of ISO 19111 but can be implemented - * through profiles.

+ *

Defines the conceptual schema for the description of referencing by coordinates. + * It describes the minimum data required to define coordinate reference systems. + * This document supports the definition of:

+ * + *

The definition of a coordinate reference system does not change with time, + * although in some cases some of the defining parameters can include a rate of change of the parameter. + * The coordinate values within a dynamic and in a temporal coordinate reference system can change with time.

+ * + *

This document also describes the conceptual schema for defining the information required to describe + * operations that change coordinate values. In addition to the minimum data required for the definition of + * the coordinate reference system or coordinate operation, the conceptual schema allows additional descriptive + * information – coordinate reference system metadata – to be provided.

*
* *

Version numbers used in GeoAPI:

* * * @see #OGC_01009 - * @see ISO 19111:2007 on standards catalogue - * @see Download from OGC + * @see ISO 19111:2019 on standards catalogue + * @see Download from OGC */ - ISO_19111((short) 2007), + ISO_19111((short) 2019), /** * ISO 19111-2, Part 2: Extension for parametric values diff --git a/geoapi/src/main/java/org/opengis/annotation/UML.java b/geoapi/src/main/java/org/opengis/annotation/UML.java index fcd0d8eb2..0c2e3039d 100644 --- a/geoapi/src/main/java/org/opengis/annotation/UML.java +++ b/geoapi/src/main/java/org/opengis/annotation/UML.java @@ -76,9 +76,6 @@ * * * @return the specification version, or 0 for the default (usually latest) specification. diff --git a/geoapi/src/main/java/org/opengis/annotation/package-info.java b/geoapi/src/main/java/org/opengis/annotation/package-info.java index 48b47f9b0..f174f01be 100644 --- a/geoapi/src/main/java/org/opengis/annotation/package-info.java +++ b/geoapi/src/main/java/org/opengis/annotation/package-info.java @@ -26,7 +26,7 @@ * interface appears in the source code as: * * {@snippet lang="java" : - * @UML(identifier = "SC_ProjectedCRS", specification = ISO_19111) + * @UML(identifier = "ProjectedCRS", specification = ISO_19111) * } * * These annotations are available at runtime by Java introspection. This is useful, for example, diff --git a/geoapi/src/main/java/org/opengis/parameter/GeneralParameterDescriptor.java b/geoapi/src/main/java/org/opengis/parameter/GeneralParameterDescriptor.java index 594d2a726..407352a00 100644 --- a/geoapi/src/main/java/org/opengis/parameter/GeneralParameterDescriptor.java +++ b/geoapi/src/main/java/org/opengis/parameter/GeneralParameterDescriptor.java @@ -144,7 +144,7 @@ * @see GeneralParameterValue */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="CC_GeneralOperationParameter", specification=ISO_19111) +@UML(identifier="CC_GeneralOperationParameter", specification=ISO_19111, version=2007) public interface GeneralParameterDescriptor extends IdentifiedObject { /** * The name, as used by the service or operation for this parameter. diff --git a/geoapi/src/main/java/org/opengis/parameter/GeneralParameterValue.java b/geoapi/src/main/java/org/opengis/parameter/GeneralParameterValue.java index f8a04d3d3..445a9519e 100644 --- a/geoapi/src/main/java/org/opengis/parameter/GeneralParameterValue.java +++ b/geoapi/src/main/java/org/opengis/parameter/GeneralParameterValue.java @@ -36,7 +36,7 @@ * @see GeneralParameterDescriptor */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="CC_GeneralParameterValue", specification=ISO_19111) +@UML(identifier="CC_GeneralParameterValue", specification=ISO_19111, version=2007) public interface GeneralParameterValue { /** * Returns the abstract definition of this parameter or group of parameters. diff --git a/geoapi/src/main/java/org/opengis/parameter/ParameterDescriptor.java b/geoapi/src/main/java/org/opengis/parameter/ParameterDescriptor.java index 9dddcb52c..cd9113763 100644 --- a/geoapi/src/main/java/org/opengis/parameter/ParameterDescriptor.java +++ b/geoapi/src/main/java/org/opengis/parameter/ParameterDescriptor.java @@ -56,7 +56,7 @@ * @see ParameterValue * @see ParameterDescriptorGroup */ -@UML(identifier="CC_OperationParameter", specification=ISO_19111) +@UML(identifier="CC_OperationParameter", specification=ISO_19111, version=2007) public interface ParameterDescriptor extends GeneralParameterDescriptor { /** * Returns the name that describes the type of parameter values. diff --git a/geoapi/src/main/java/org/opengis/parameter/ParameterDescriptorGroup.java b/geoapi/src/main/java/org/opengis/parameter/ParameterDescriptorGroup.java index 20d8ed3e8..abb64e6b1 100644 --- a/geoapi/src/main/java/org/opengis/parameter/ParameterDescriptorGroup.java +++ b/geoapi/src/main/java/org/opengis/parameter/ParameterDescriptorGroup.java @@ -40,7 +40,7 @@ * @see ParameterValueGroup * @see ParameterDescriptor */ -@UML(identifier="CC_OperationParameterGroup", specification=ISO_19111) +@UML(identifier="CC_OperationParameterGroup", specification=ISO_19111, version=2007) public interface ParameterDescriptorGroup extends GeneralParameterDescriptor { /** * Returns the parameters in this group. diff --git a/geoapi/src/main/java/org/opengis/parameter/ParameterValue.java b/geoapi/src/main/java/org/opengis/parameter/ParameterValue.java index 1be179858..8f6f87729 100644 --- a/geoapi/src/main/java/org/opengis/parameter/ParameterValue.java +++ b/geoapi/src/main/java/org/opengis/parameter/ParameterValue.java @@ -67,7 +67,7 @@ * @see ParameterValueGroup */ @Classifier(Stereotype.UNION) -@UML(identifier="CC_ParameterValue", specification=ISO_19111) +@UML(identifier="CC_ParameterValue", specification=ISO_19111, version=2007) public interface ParameterValue extends GeneralParameterValue { /** * Returns the abstract definition of this parameter value. diff --git a/geoapi/src/main/java/org/opengis/parameter/ParameterValueGroup.java b/geoapi/src/main/java/org/opengis/parameter/ParameterValueGroup.java index 7a04ead95..48d9620cf 100644 --- a/geoapi/src/main/java/org/opengis/parameter/ParameterValueGroup.java +++ b/geoapi/src/main/java/org/opengis/parameter/ParameterValueGroup.java @@ -55,7 +55,7 @@ * @see ParameterDescriptorGroup * @see ParameterValue */ -@UML(identifier="CC_ParameterValueGroup", specification=ISO_19111) +@UML(identifier="CC_ParameterValueGroup", specification=ISO_19111, version=2007) public interface ParameterValueGroup extends GeneralParameterValue { /** * The abstract definition of this group of parameters. diff --git a/geoapi/src/main/java/org/opengis/referencing/IdentifiedObject.java b/geoapi/src/main/java/org/opengis/referencing/IdentifiedObject.java index 3cd40de16..d0b5cf3d7 100644 --- a/geoapi/src/main/java/org/opengis/referencing/IdentifiedObject.java +++ b/geoapi/src/main/java/org/opengis/referencing/IdentifiedObject.java @@ -71,7 +71,7 @@ * @since 2.0 */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="IO_IdentifiedObject", specification=ISO_19111) +@UML(identifier="IO_IdentifiedObject", specification=ISO_19111, version=2007) public interface IdentifiedObject { /** * Key for the {@value} property to be given to the diff --git a/geoapi/src/main/java/org/opengis/referencing/ReferenceSystem.java b/geoapi/src/main/java/org/opengis/referencing/ReferenceSystem.java index 99fe1f403..76483be7f 100644 --- a/geoapi/src/main/java/org/opengis/referencing/ReferenceSystem.java +++ b/geoapi/src/main/java/org/opengis/referencing/ReferenceSystem.java @@ -101,7 +101,7 @@ public interface ReferenceSystem extends IdentifiedObject { * collection. The singleton has been preserved in GeoAPI for historical reasons, * and also because the {@code Extent} attributes already allow collections. */ - @UML(identifier="domainOfValidity", obligation=OPTIONAL, specification=ISO_19111) + @UML(identifier="domainOfValidity", obligation=OPTIONAL, specification=ISO_19111, version=2007) default Extent getDomainOfValidity() { return null; } @@ -125,7 +125,7 @@ default Extent getDomainOfValidity() { * GeoAPI keeps the singleton type for historical reasons. * */ - @UML(identifier="SC_CRS.scope", obligation=OPTIONAL, specification=ISO_19111) + @UML(identifier="SC_CRS.scope", obligation=OPTIONAL, specification=ISO_19111, version=2007) default InternationalString getScope() { return null; } diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/CompoundCRS.java b/geoapi/src/main/java/org/opengis/referencing/crs/CompoundCRS.java index 85dabfeb2..a50a6afb5 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/CompoundCRS.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/CompoundCRS.java @@ -59,7 +59,7 @@ * @see CRSAuthorityFactory#createCompoundCRS(String) * @see CRSFactory#createCompoundCRS(Map, CoordinateReferenceSystem[]) */ -@UML(identifier="SC_CompoundCRS", specification=ISO_19111) +@UML(identifier="SC_CompoundCRS", specification=ISO_19111, version=2007) public interface CompoundCRS extends CoordinateReferenceSystem { /** * The ordered list of coordinate reference systems. diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/CoordinateReferenceSystem.java b/geoapi/src/main/java/org/opengis/referencing/crs/CoordinateReferenceSystem.java index f55e84ff9..482f8c45e 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/CoordinateReferenceSystem.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/CoordinateReferenceSystem.java @@ -60,7 +60,7 @@ * @since 1.0 */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="SC_CRS", specification=ISO_19111) +@UML(identifier="SC_CRS", specification=ISO_19111, version=2007) public interface CoordinateReferenceSystem extends ReferenceSystem { /** * Returns the coordinate system of a single CRS, or a view over all coordinate systems of a compound CRS. diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/DerivedCRS.java b/geoapi/src/main/java/org/opengis/referencing/crs/DerivedCRS.java index 66bf2e3db..7d566dcd3 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/DerivedCRS.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/DerivedCRS.java @@ -60,6 +60,6 @@ * @see CRSAuthorityFactory#createDerivedCRS(String) * @see CRSFactory#createDerivedCRS(Map, CoordinateReferenceSystem, Conversion, CoordinateSystem) */ -@UML(identifier="SC_DerivedCRS", specification=ISO_19111) +@UML(identifier="SC_DerivedCRS", specification=ISO_19111, version=2007) public interface DerivedCRS extends GeneralDerivedCRS { } diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/EngineeringCRS.java b/geoapi/src/main/java/org/opengis/referencing/crs/EngineeringCRS.java index 04f49e019..53816b6aa 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/EngineeringCRS.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/EngineeringCRS.java @@ -70,7 +70,7 @@ * @see CRSAuthorityFactory#createEngineeringCRS(String) * @see CRSFactory#createEngineeringCRS(Map, EngineeringDatum, CoordinateSystem) */ -@UML(identifier="SC_EngineeringCRS", specification=ISO_19111) +@UML(identifier="SC_EngineeringCRS", specification=ISO_19111, version=2007) public interface EngineeringCRS extends SingleCRS { /** * Returns the datum, which shall be an engineering one. diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/GeneralDerivedCRS.java b/geoapi/src/main/java/org/opengis/referencing/crs/GeneralDerivedCRS.java index 0aab759d9..7d8d46418 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/GeneralDerivedCRS.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/GeneralDerivedCRS.java @@ -42,7 +42,7 @@ * @since 1.0 */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="SC_GeneralDerivedCRS", specification=ISO_19111) +@UML(identifier="SC_GeneralDerivedCRS", specification=ISO_19111, version=2007) public interface GeneralDerivedCRS extends SingleCRS { /** * Returns the base coordinate reference system. diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/GeodeticCRS.java b/geoapi/src/main/java/org/opengis/referencing/crs/GeodeticCRS.java index 07da7f59a..02082198c 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/GeodeticCRS.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/GeodeticCRS.java @@ -38,7 +38,7 @@ * @version 3.0 * @since 2.1 */ -@UML(identifier="SC_GeodeticCRS", specification=ISO_19111) +@UML(identifier="SC_GeodeticCRS", specification=ISO_19111, version=2007) public interface GeodeticCRS extends SingleCRS { /** * Returns the datum, which shall be geodetic. diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/ImageCRS.java b/geoapi/src/main/java/org/opengis/referencing/crs/ImageCRS.java index ca2ee08a9..18e558b26 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/ImageCRS.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/ImageCRS.java @@ -46,7 +46,7 @@ * @see CRSAuthorityFactory#createImageCRS(String) * @see CRSFactory#createImageCRS(Map, ImageDatum, AffineCS) */ -@UML(identifier="SC_ImageCRS", specification=ISO_19111) +@UML(identifier="SC_ImageCRS", specification=ISO_19111, version=2007) public interface ImageCRS extends SingleCRS { /** * Returns the affine coordinate system, which shall be {@linkplain AffineCS affine} or diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/ProjectedCRS.java b/geoapi/src/main/java/org/opengis/referencing/crs/ProjectedCRS.java index a41c60958..d5fdcd9ee 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/ProjectedCRS.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/ProjectedCRS.java @@ -44,7 +44,7 @@ * @see CRSAuthorityFactory#createProjectedCRS(String) * @see CRSFactory#createProjectedCRS(Map, GeographicCRS, Conversion, CartesianCS) */ -@UML(identifier="SC_ProjectedCRS", specification=ISO_19111) +@UML(identifier="SC_ProjectedCRS", specification=ISO_19111, version=2007) public interface ProjectedCRS extends GeneralDerivedCRS { /** * Returns the base coordinate reference system, which must be geographic. diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/SingleCRS.java b/geoapi/src/main/java/org/opengis/referencing/crs/SingleCRS.java index edc606633..c3442f725 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/SingleCRS.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/SingleCRS.java @@ -44,7 +44,7 @@ * @see org.opengis.referencing.datum.Datum */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="SC_SingleCRS", specification=ISO_19111) +@UML(identifier="SC_SingleCRS", specification=ISO_19111, version=2007) public interface SingleCRS extends CoordinateReferenceSystem { /** * Returns the coordinate system associated to this CRS. diff --git a/geoapi/src/main/java/org/opengis/referencing/crs/VerticalCRS.java b/geoapi/src/main/java/org/opengis/referencing/crs/VerticalCRS.java index 296bd6205..2e973c602 100644 --- a/geoapi/src/main/java/org/opengis/referencing/crs/VerticalCRS.java +++ b/geoapi/src/main/java/org/opengis/referencing/crs/VerticalCRS.java @@ -51,7 +51,7 @@ * @see CRSAuthorityFactory#createVerticalCRS(String) * @see CRSFactory#createVerticalCRS(Map, VerticalDatum, VerticalCS) */ -@UML(identifier="SC_VerticalCRS", specification=ISO_19111) +@UML(identifier="SC_VerticalCRS", specification=ISO_19111, version=2007) public interface VerticalCRS extends SingleCRS { /** * Returns the coordinate system, which shall be vertical. diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/AffineCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/AffineCS.java index 39c82824d..6d84ed581 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/AffineCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/AffineCS.java @@ -36,6 +36,6 @@ * @see CSFactory#createAffineCS(Map, CoordinateSystemAxis, CoordinateSystemAxis) * @see CSFactory#createAffineCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ -@UML(identifier="CS_AffineCS", specification=ISO_19111) +@UML(identifier="CS_AffineCS", specification=ISO_19111, version=2007) public interface AffineCS extends CoordinateSystem { } diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/AxisDirection.java b/geoapi/src/main/java/org/opengis/referencing/cs/AxisDirection.java index b18d851c0..d7e803316 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/AxisDirection.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/AxisDirection.java @@ -41,7 +41,7 @@ * * @see CoordinateSystemAxis#getDirection() */ -@UML(identifier="CS_AxisDirection", specification=ISO_19111) +@UML(identifier="CS_AxisDirection", specification=ISO_19111, version=2007) public final class AxisDirection extends CodeList { /** * Serial number for compatibility with different versions. diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/CartesianCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/CartesianCS.java index e2a171bd0..30a043442 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/CartesianCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/CartesianCS.java @@ -85,6 +85,6 @@ * @see CSFactory#createCartesianCS(Map, CoordinateSystemAxis, CoordinateSystemAxis) * @see CSFactory#createCartesianCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ -@UML(identifier="CS_CartesianCS", specification=ISO_19111) +@UML(identifier="CS_CartesianCS", specification=ISO_19111, version=2007) public interface CartesianCS extends AffineCS { } diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/CoordinateSystem.java b/geoapi/src/main/java/org/opengis/referencing/cs/CoordinateSystem.java index 817737cbe..2c94edfda 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/CoordinateSystem.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/CoordinateSystem.java @@ -42,7 +42,7 @@ * @see org.opengis.referencing.crs.CoordinateReferenceSystem */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="CS_CoordinateSystem", specification=ISO_19111) +@UML(identifier="CS_CoordinateSystem", specification=ISO_19111, version=2007) public interface CoordinateSystem extends IdentifiedObject { /** * Returns the dimension of the coordinate system. diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/CoordinateSystemAxis.java b/geoapi/src/main/java/org/opengis/referencing/cs/CoordinateSystemAxis.java index cf0372bb7..fd0e26c63 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/CoordinateSystemAxis.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/CoordinateSystemAxis.java @@ -76,7 +76,7 @@ * @see CSAuthorityFactory#createCoordinateSystemAxis(String) * @see CSFactory#createCoordinateSystemAxis(Map, String, AxisDirection, Unit) */ -@UML(identifier="CS_CoordinateSystemAxis", specification=ISO_19111) +@UML(identifier="CS_CoordinateSystemAxis", specification=ISO_19111, version=2007) public interface CoordinateSystemAxis extends IdentifiedObject { /** * Returns the abbreviation used for this coordinate system axes. diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/CylindricalCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/CylindricalCS.java index 03e8ccace..b96bbc44e 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/CylindricalCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/CylindricalCS.java @@ -37,6 +37,6 @@ * @see CSAuthorityFactory#createCylindricalCS(String) * @see CSFactory#createCylindricalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ -@UML(identifier="CS_CylindricalCS", specification=ISO_19111) +@UML(identifier="CS_CylindricalCS", specification=ISO_19111, version=2007) public interface CylindricalCS extends CoordinateSystem { } diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/EllipsoidalCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/EllipsoidalCS.java index 28db2fccf..4011b0926 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/EllipsoidalCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/EllipsoidalCS.java @@ -53,6 +53,6 @@ * @see CSFactory#createEllipsoidalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis) * @see CSFactory#createEllipsoidalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ -@UML(identifier="CS_EllipsoidalCS", specification=ISO_19111) +@UML(identifier="CS_EllipsoidalCS", specification=ISO_19111, version=2007) public interface EllipsoidalCS extends CoordinateSystem { } diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/LinearCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/LinearCS.java index d0d9c561b..beed41886 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/LinearCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/LinearCS.java @@ -40,6 +40,6 @@ * * @see CSFactory#createLinearCS(Map, CoordinateSystemAxis) */ -@UML(identifier="CS_LinearCS", specification=ISO_19111) +@UML(identifier="CS_LinearCS", specification=ISO_19111, version=2007) public interface LinearCS extends CoordinateSystem { } diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/PolarCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/PolarCS.java index 5fb9475d0..11d2016f2 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/PolarCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/PolarCS.java @@ -49,6 +49,6 @@ * @see CSAuthorityFactory#createPolarCS(String) * @see CSFactory#createPolarCS(Map, CoordinateSystemAxis, CoordinateSystemAxis) */ -@UML(identifier="CS_PolarCS", specification=ISO_19111) +@UML(identifier="CS_PolarCS", specification=ISO_19111, version=2007) public interface PolarCS extends CoordinateSystem { } diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/RangeMeaning.java b/geoapi/src/main/java/org/opengis/referencing/cs/RangeMeaning.java index 1693b86eb..13f1ae704 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/RangeMeaning.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/RangeMeaning.java @@ -38,7 +38,7 @@ * * @see CoordinateSystemAxis#getRangeMeaning() */ -@UML(identifier="CS_RangeMeaning", specification=ISO_19111) +@UML(identifier="CS_RangeMeaning", specification=ISO_19111, version=2007) public final class RangeMeaning extends CodeList { /** * Serial number for compatibility with different versions. diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/SphericalCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/SphericalCS.java index 2324ffb6c..021b9bb3a 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/SphericalCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/SphericalCS.java @@ -59,6 +59,6 @@ * @see CSAuthorityFactory#createSphericalCS(String) * @see CSFactory#createSphericalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ -@UML(identifier="CS_SphericalCS", specification=ISO_19111) +@UML(identifier="CS_SphericalCS", specification=ISO_19111, version=2007) public interface SphericalCS extends CoordinateSystem { } diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/TimeCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/TimeCS.java index f2e958d8b..857639b84 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/TimeCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/TimeCS.java @@ -37,6 +37,6 @@ * @see CSAuthorityFactory#createTimeCS(String) * @see CSFactory#createTimeCS(Map, CoordinateSystemAxis) */ -@UML(identifier="CS_TimeCS", specification=ISO_19111) +@UML(identifier="CS_TimeCS", specification=ISO_19111, version=2007) public interface TimeCS extends CoordinateSystem { } diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/UserDefinedCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/UserDefinedCS.java index c6bc84ed0..a42cdc3a1 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/UserDefinedCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/UserDefinedCS.java @@ -41,6 +41,6 @@ * @see CSFactory#createUserDefinedCS(Map, CoordinateSystemAxis, CoordinateSystemAxis) * @see CSFactory#createUserDefinedCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ -@UML(identifier="CS_UserDefinedCS", specification=ISO_19111) +@UML(identifier="CS_UserDefinedCS", specification=ISO_19111, version=2007) public interface UserDefinedCS extends CoordinateSystem { } diff --git a/geoapi/src/main/java/org/opengis/referencing/cs/VerticalCS.java b/geoapi/src/main/java/org/opengis/referencing/cs/VerticalCS.java index 241844d86..4df0d3ee2 100644 --- a/geoapi/src/main/java/org/opengis/referencing/cs/VerticalCS.java +++ b/geoapi/src/main/java/org/opengis/referencing/cs/VerticalCS.java @@ -52,6 +52,6 @@ * @see CSAuthorityFactory#createVerticalCS(String) * @see CSFactory#createVerticalCS(Map, CoordinateSystemAxis) */ -@UML(identifier="CS_VerticalCS", specification=ISO_19111) +@UML(identifier="CS_VerticalCS", specification=ISO_19111, version=2007) public interface VerticalCS extends CoordinateSystem { } diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/Datum.java b/geoapi/src/main/java/org/opengis/referencing/datum/Datum.java index ad768cec1..7ce09503b 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/Datum.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/Datum.java @@ -50,7 +50,7 @@ * @see org.opengis.referencing.crs.CoordinateReferenceSystem */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="CD_Datum", specification=ISO_19111) +@UML(identifier="CD_Datum", specification=ISO_19111, version=2007) public interface Datum extends IdentifiedObject { /** * Key for the {@value} property to be given to the diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/Ellipsoid.java b/geoapi/src/main/java/org/opengis/referencing/datum/Ellipsoid.java index 69a66826d..874efa725 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/Ellipsoid.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/Ellipsoid.java @@ -69,7 +69,7 @@ * @see DatumFactory#createEllipsoid(Map, double, double, Unit) * @see DatumFactory#createFlattenedSphere(Map, double, double, Unit) */ -@UML(identifier="CD_Ellipsoid", specification=ISO_19111) +@UML(identifier="CD_Ellipsoid", specification=ISO_19111, version=2007) public interface Ellipsoid extends IdentifiedObject { /** * Returns the linear unit of the {@linkplain #getSemiMajorAxis() semi-major} diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/EngineeringDatum.java b/geoapi/src/main/java/org/opengis/referencing/datum/EngineeringDatum.java index b62e86823..7cd546eaa 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/EngineeringDatum.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/EngineeringDatum.java @@ -35,6 +35,6 @@ * @see DatumAuthorityFactory#createEngineeringDatum(String) * @see DatumFactory#createEngineeringDatum(Map) */ -@UML(identifier="CD_EngineeringDatum", specification=ISO_19111) +@UML(identifier="CD_EngineeringDatum", specification=ISO_19111, version=2007) public interface EngineeringDatum extends Datum { } diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/GeodeticDatum.java b/geoapi/src/main/java/org/opengis/referencing/datum/GeodeticDatum.java index c0b2252aa..1e3578530 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/GeodeticDatum.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/GeodeticDatum.java @@ -39,7 +39,7 @@ * @see DatumAuthorityFactory#createGeodeticDatum(String) * @see DatumFactory#createGeodeticDatum(Map, Ellipsoid, PrimeMeridian) */ -@UML(identifier="CD_GeodeticDatum", specification=ISO_19111) +@UML(identifier="CD_GeodeticDatum", specification=ISO_19111, version=2007) public interface GeodeticDatum extends Datum { /** * Returns the ellipsoid. diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/ImageDatum.java b/geoapi/src/main/java/org/opengis/referencing/datum/ImageDatum.java index 233a6817d..db57a5f75 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/ImageDatum.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/ImageDatum.java @@ -41,7 +41,7 @@ * @see DatumAuthorityFactory#createImageDatum(String) * @see DatumFactory#createImageDatum(Map, PixelInCell) */ -@UML(identifier="CD_ImageDatum", specification=ISO_19111) +@UML(identifier="CD_ImageDatum", specification=ISO_19111, version=2007) public interface ImageDatum extends Datum { /** * Specification of the way the image grid is associated with the image data attributes. diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/PixelInCell.java b/geoapi/src/main/java/org/opengis/referencing/datum/PixelInCell.java index b8b187264..45fa473e6 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/PixelInCell.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/PixelInCell.java @@ -39,7 +39,7 @@ * * @see org.opengis.metadata.spatial.PixelOrientation */ -@UML(identifier="CD_PixelInCell", specification=ISO_19111) +@UML(identifier="CD_PixelInCell", specification=ISO_19111, version=2007) public final class PixelInCell extends CodeList { /** * Serial number for compatibility with different versions. diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/PrimeMeridian.java b/geoapi/src/main/java/org/opengis/referencing/datum/PrimeMeridian.java index 9e4ddc3a4..fbc8b9401 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/PrimeMeridian.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/PrimeMeridian.java @@ -46,7 +46,7 @@ * @see DatumAuthorityFactory#createPrimeMeridian(String) * @see DatumFactory#createPrimeMeridian(Map, double, Unit) */ -@UML(identifier="CD_PrimeMeridian", specification=ISO_19111) +@UML(identifier="CD_PrimeMeridian", specification=ISO_19111, version=2007) public interface PrimeMeridian extends IdentifiedObject { /** * Longitude of the prime meridian measured from the Greenwich meridian, positive eastward. diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/TemporalDatum.java b/geoapi/src/main/java/org/opengis/referencing/datum/TemporalDatum.java index 1de926ae3..5f5641842 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/TemporalDatum.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/TemporalDatum.java @@ -36,7 +36,7 @@ * @see DatumAuthorityFactory#createTemporalDatum(String) * @see DatumFactory#createTemporalDatum(Map, Date) */ -@UML(identifier="CD_TemporalDatum", specification=ISO_19111) +@UML(identifier="CD_TemporalDatum", specification=ISO_19111, version=2007) public interface TemporalDatum extends Datum { /** * The date and time origin of this temporal datum. diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/VerticalDatum.java b/geoapi/src/main/java/org/opengis/referencing/datum/VerticalDatum.java index b791ccc8b..5acf75b66 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/VerticalDatum.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/VerticalDatum.java @@ -40,7 +40,7 @@ * @see DatumAuthorityFactory#createVerticalDatum(String) * @see DatumFactory#createVerticalDatum(Map, VerticalDatumType) */ -@UML(identifier="CD_VerticalDatum", specification=ISO_19111) +@UML(identifier="CD_VerticalDatum", specification=ISO_19111, version=2007) public interface VerticalDatum extends Datum { /** * The type of this vertical datum. diff --git a/geoapi/src/main/java/org/opengis/referencing/datum/VerticalDatumType.java b/geoapi/src/main/java/org/opengis/referencing/datum/VerticalDatumType.java index 6857ff0a4..79b4f8089 100644 --- a/geoapi/src/main/java/org/opengis/referencing/datum/VerticalDatumType.java +++ b/geoapi/src/main/java/org/opengis/referencing/datum/VerticalDatumType.java @@ -48,7 +48,7 @@ * @version 3.0 * @since 1.0 */ -@UML(identifier="CD_VerticalDatumType", specification=ISO_19111) +@UML(identifier="CD_VerticalDatumType", specification=ISO_19111, version=2003) public final class VerticalDatumType extends CodeList { /** * Serial number for compatibility with different versions. diff --git a/geoapi/src/main/java/org/opengis/referencing/operation/ConcatenatedOperation.java b/geoapi/src/main/java/org/opengis/referencing/operation/ConcatenatedOperation.java index 55f32452a..ebef2e4a6 100644 --- a/geoapi/src/main/java/org/opengis/referencing/operation/ConcatenatedOperation.java +++ b/geoapi/src/main/java/org/opengis/referencing/operation/ConcatenatedOperation.java @@ -41,7 +41,7 @@ * * @see CoordinateOperationFactory#createConcatenatedOperation(Map, CoordinateOperation[]) */ -@UML(identifier="CC_ConcatenatedOperation", specification=ISO_19111) +@UML(identifier="CC_ConcatenatedOperation", specification=ISO_19111, version=2007) public interface ConcatenatedOperation extends CoordinateOperation { /** * Returns the sequence of operations. diff --git a/geoapi/src/main/java/org/opengis/referencing/operation/Conversion.java b/geoapi/src/main/java/org/opengis/referencing/operation/Conversion.java index f36d48625..84c65603f 100644 --- a/geoapi/src/main/java/org/opengis/referencing/operation/Conversion.java +++ b/geoapi/src/main/java/org/opengis/referencing/operation/Conversion.java @@ -45,7 +45,7 @@ * @see Transformation * @see CoordinateOperationFactory#createDefiningConversion(Map, OperationMethod, ParameterValueGroup) */ -@UML(identifier="CC_Conversion", specification=ISO_19111) +@UML(identifier="CC_Conversion", specification=ISO_19111, version=2007) public interface Conversion extends SingleOperation { /** * Returns the source CRS. Conversions may have a source CRS that diff --git a/geoapi/src/main/java/org/opengis/referencing/operation/CoordinateOperation.java b/geoapi/src/main/java/org/opengis/referencing/operation/CoordinateOperation.java index f68c71a0a..5efa598c5 100644 --- a/geoapi/src/main/java/org/opengis/referencing/operation/CoordinateOperation.java +++ b/geoapi/src/main/java/org/opengis/referencing/operation/CoordinateOperation.java @@ -59,7 +59,7 @@ * @see CoordinateOperationFactory#createOperation(CoordinateReferenceSystem, CoordinateReferenceSystem) */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="CC_CoordinateOperation", specification=ISO_19111) +@UML(identifier="CC_CoordinateOperation", specification=ISO_19111, version=2007) public interface CoordinateOperation extends IdentifiedObject { /** * Key for the {@value} property. diff --git a/geoapi/src/main/java/org/opengis/referencing/operation/Formula.java b/geoapi/src/main/java/org/opengis/referencing/operation/Formula.java index b2a46055a..5232089b9 100644 --- a/geoapi/src/main/java/org/opengis/referencing/operation/Formula.java +++ b/geoapi/src/main/java/org/opengis/referencing/operation/Formula.java @@ -46,7 +46,7 @@ * @see OperationMethod#getFormula() */ @Classifier(Stereotype.UNION) -@UML(identifier="CC_Formula", specification=ISO_19111) +@UML(identifier="CC_Formula", specification=ISO_19111, version=2007) public interface Formula { /** * Formula(s) or procedure used by the operation method. diff --git a/geoapi/src/main/java/org/opengis/referencing/operation/OperationMethod.java b/geoapi/src/main/java/org/opengis/referencing/operation/OperationMethod.java index 292f9ab6e..d48ab7138 100644 --- a/geoapi/src/main/java/org/opengis/referencing/operation/OperationMethod.java +++ b/geoapi/src/main/java/org/opengis/referencing/operation/OperationMethod.java @@ -76,7 +76,7 @@ * @see CoordinateOperationAuthorityFactory#createOperationMethod(String) * @see CoordinateOperationFactory#createOperationMethod(Map, Integer, Integer, ParameterDescriptorGroup) */ -@UML(identifier="CC_OperationMethod", specification=ISO_19111) +@UML(identifier="CC_OperationMethod", specification=ISO_19111, version=2007) public interface OperationMethod extends IdentifiedObject { /* * NOTE FOR JAVADOC WRITER: diff --git a/geoapi/src/main/java/org/opengis/referencing/operation/PassThroughOperation.java b/geoapi/src/main/java/org/opengis/referencing/operation/PassThroughOperation.java index 39a571033..b0ed71475 100644 --- a/geoapi/src/main/java/org/opengis/referencing/operation/PassThroughOperation.java +++ b/geoapi/src/main/java/org/opengis/referencing/operation/PassThroughOperation.java @@ -31,7 +31,7 @@ * @version 4.0 * @since 1.0 */ -@UML(identifier="CC_PassThroughOperation", specification=ISO_19111) +@UML(identifier="CC_PassThroughOperation", specification=ISO_19111, version=2007) public interface PassThroughOperation extends CoordinateOperation { /** * Returns the operation to apply on the subset of a coordinate tuple. diff --git a/geoapi/src/main/java/org/opengis/referencing/operation/SingleOperation.java b/geoapi/src/main/java/org/opengis/referencing/operation/SingleOperation.java index 03c727b97..20a3f29c2 100644 --- a/geoapi/src/main/java/org/opengis/referencing/operation/SingleOperation.java +++ b/geoapi/src/main/java/org/opengis/referencing/operation/SingleOperation.java @@ -37,7 +37,7 @@ * @since 1.0 */ @Classifier(Stereotype.ABSTRACT) -@UML(identifier="CC_SingleOperation", specification=ISO_19111) +@UML(identifier="CC_SingleOperation", specification=ISO_19111, version=2007) public interface SingleOperation extends CoordinateOperation { /** * Returns the operation method. diff --git a/geoapi/src/main/java/org/opengis/referencing/operation/Transformation.java b/geoapi/src/main/java/org/opengis/referencing/operation/Transformation.java index dd18427bd..df4c1eee8 100644 --- a/geoapi/src/main/java/org/opengis/referencing/operation/Transformation.java +++ b/geoapi/src/main/java/org/opengis/referencing/operation/Transformation.java @@ -38,7 +38,7 @@ * * @see Conversion */ -@UML(identifier="CC_Transformation", specification=ISO_19111) +@UML(identifier="CC_Transformation", specification=ISO_19111, version=2007) public interface Transformation extends SingleOperation { /** * Returns the source CRS.