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/05/01 16:01:15 UTC
[sis] branch geoapi-3.1 updated (2751173 -> 8164ff4)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git.
from 2751173 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains work on netCDF and addition of two map projections.
add 1f0fbb9 Fix a thread-safety hole.
add 24fcb0f Implements GridEnvelope and GridCoordinates following resolution of https://github.com/opengeospatial/geoapi/issues/36
new 77720b8 Merge branch 'geoapi-4.0' into geoapi-3.1: implementation of GridEnvelope interface.
add fceec82 Fix missing "s" in "getOrderOptionsType()" for ISO 19115 compliance. https://github.com/opengeospatial/geoapi/issues/21
add 59b5551 Fix spelling error in method name, but not in XML annotation since the spelling exists in ISO specification. https://github.com/opengeospatial/geoapi/issues/43
new 9426368 Merge branch 'geoapi-4.0' into geoapi-3.1 but without the change in Objective.getObjectiveOccurences() method name. The old name is kept on GeoAPI 3.1 branch for compatibility reason.
add 2492289 Rename "polarization" as "polarisation" in two method names for compliance with latest ISO 19115 revision. https://github.com/opengeospatial/geoapi/issues/15
add d6b8565 Renamed PolarizationOrientation as PolarisationOrientation for compliance with latest ISO 19115-2 revision. Part of https://github.com/opengeospatial/geoapi/issues/23
new f7fb545 Merge branch 'geoapi-4.0' into geoapi-3.1, taking only the renaming in annotations. Renaming of methods or classes are not taken for compatibility reasons.
add bf56b15 Renamed getCenterPoint() as getCentrePoint() for compliance with ISO 19115:2014.
new 8164ff4 Merge branch 'geoapi-4.0' into geoapi-3.1, but replacing method renaming by a comment about future evolution.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/sis/internal/book/GEOAPI.lst | 2 +-
.../resources/org/apache/sis/internal/book/OGC.lst | 2 +-
...de.java => MI_PolarisationOrientationCode.java} | 12 ++---
.../apache/sis/metadata/PropertyInformation.java | 3 +-
.../metadata/iso/acquisition/DefaultObjective.java | 54 ++++++++++++++++------
.../sis/metadata/iso/content/DefaultBand.java | 20 ++++++++
.../sis/metadata/iso/content/package-info.java | 6 +--
.../distribution/DefaultStandardOrderProcess.java | 42 +++++++++++++----
.../metadata/iso/spatial/DefaultGeorectified.java | 8 ++++
.../sis/test/xml/AnnotationConsistencyCheck.java | 16 -------
.../sis/coverage/grid/GridCoordinatesView.java | 18 ++++----
.../org/apache/sis/coverage/grid/GridExtent.java | 23 ++++-----
12 files changed, 133 insertions(+), 73 deletions(-)
rename core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/{MI_PolarizationOrientationCode.java => MI_PolarisationOrientationCode.java} (88%)
[sis] 01/04: Merge branch 'geoapi-4.0' into geoapi-3.1:
implementation of GridEnvelope interface.
Posted by de...@apache.org.
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
commit 77720b878b35098dd4fb48255a84a526c90dc724
Merge: 2751173 24fcb0f
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed May 1 13:17:54 2019 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: implementation of GridEnvelope interface.
.../apache/sis/metadata/PropertyInformation.java | 3 ++-
.../sis/coverage/grid/GridCoordinatesView.java | 18 +++++++++--------
.../org/apache/sis/coverage/grid/GridExtent.java | 23 ++++++++++------------
3 files changed, 22 insertions(+), 22 deletions(-)
[sis] 02/04: Merge branch 'geoapi-4.0' into geoapi-3.1 but without
the change in Objective.getObjectiveOccurences() method name. The old name
is kept on GeoAPI 3.1 branch for compatibility reason.
Posted by de...@apache.org.
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
commit 9426368e13a5abcfb28fd91f44c991dbf3484219
Merge: 77720b8 59b5551
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed May 1 14:48:24 2019 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1 but without the change in Objective.getObjectiveOccurences() method name.
The old name is kept on GeoAPI 3.1 branch for compatibility reason.
.../metadata/iso/acquisition/DefaultObjective.java | 54 ++++++++++++++++------
.../distribution/DefaultStandardOrderProcess.java | 42 +++++++++++++----
2 files changed, 72 insertions(+), 24 deletions(-)
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
index 22c1e41,599614e..2e4ee54
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
@@@ -134,14 -134,14 +134,14 @@@ public class DefaultObjective extends I
public DefaultObjective(final Objective object) {
super(object);
if (object != null) {
- identifiers = copyCollection(object.getIdentifiers(), Identifier.class);
- priority = object.getPriority();
- types = copyCollection(object.getTypes(), ObjectiveType.class);
- functions = copyCollection(object.getFunctions(), InternationalString.class);
- extents = copyCollection(object.getExtents(), Extent.class);
- objectiveOccurences = copyCollection(object.getObjectiveOccurences(), Event.class);
- pass = copyCollection(object.getPass(), PlatformPass.class);
- sensingInstruments = copyCollection(object.getSensingInstruments(), Instrument.class);
+ identifiers = copyCollection(object.getIdentifiers(), Identifier.class);
+ priority = object.getPriority();
+ types = copyCollection(object.getTypes(), ObjectiveType.class);
+ functions = copyCollection(object.getFunctions(), InternationalString.class);
+ extents = copyCollection(object.getExtents(), Extent.class);
- objectiveOccurrences = copyCollection(object.getObjectiveOccurrences(), Event.class);
++ objectiveOccurrences = copyCollection(object.getObjectiveOccurences(), Event.class);
+ pass = copyCollection(object.getPass(), PlatformPass.class);
+ sensingInstruments = copyCollection(object.getSensingInstruments(), Instrument.class);
}
}
@@@ -290,23 -290,23 +290,47 @@@
* Returns the event or events associated with objective completion.
*
* @return events associated with objective completion.
++ *
++ * @since 1.0
*/
-- @Override
@XmlElement(name = "objectiveOccurence", required = true)
+ public Collection<Event> getObjectiveOccurrences() {
+ return objectiveOccurrences = nonNullCollection(objectiveOccurrences, Event.class);
+ }
+
+ /**
++ * @deprecated Renamed {@link #getObjectiveOccurrences()}.
++ *
++ * @return events associated with objective completion.
++ */
++ @Override
++ @Deprecated
+ public Collection<Event> getObjectiveOccurences() {
- return objectiveOccurences = nonNullCollection(objectiveOccurences, Event.class);
++ return getObjectiveOccurrences();
+ }
+
+ /**
* Sets the event or events associated with objective completion.
*
* @param newValues the new objective occurrences values.
++ *
++ * @since 1.0
+ */
+ public void setObjectiveOccurrences(final Collection<? extends Event> newValues) {
+ objectiveOccurrences = writeCollection(newValues, objectiveOccurrences, Event.class);
+ }
+
+ /**
++ * @deprecated Renamed {@link #setObjectiveOccurrences(Collection)}.
++ *
++ * @param newValues the new objective occurrences values.
+ */
++ @Deprecated
+ public void setObjectiveOccurences(final Collection<? extends Event> newValues) {
- objectiveOccurences = writeCollection(newValues, objectiveOccurences, Event.class);
++ setObjectiveOccurrences(newValues);
+ }
+
+ /**
* Returns the pass of the platform over the objective.
*
* @return pass of the platform.
[sis] 04/04: Merge branch 'geoapi-4.0' into geoapi-3.1,
but replacing method renaming by a comment about future evolution.
Posted by de...@apache.org.
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
commit 8164ff4a7c1cfce4c059c2f891b920c86745c873
Merge: f7fb545 bf56b15
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed May 1 18:00:45 2019 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, but replacing method renaming by a comment about future evolution.
.../org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
index e1ceea0,214b9c1..50149d7
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
@@@ -294,6 -294,6 +294,10 @@@ public class DefaultGeorectified extend
* and the grid coordinate of the cell halfway between opposite ends of the grid in the
* spatial dimensions.
*
++ * <div class="warning"><b>Upcoming API change</b><br>
++ * This method may be renamed {@code getCentrePoint()} in GeoAPI 4.0
++ * for compliance with ISO 19115:2014.</div>
++ *
* @return the center point, or {@code null}.
*/
@Override
@@@ -305,11 -305,11 +309,15 @@@
/**
* Sets the center point.
*
++ * <div class="warning"><b>Upcoming API change</b><br>
++ * This method may be renamed {@code setCentrePoint(…)} in GeoAPI 4.0
++ * for compliance with ISO 19115:2014.</div>
++ *
* @param newValue the new center point.
*/
- public void setCentrePoint(final Point newValue) {
- checkWritePermission(centrePoint);
- centrePoint = newValue;
+ public void setCenterPoint(final Point newValue) {
+ checkWritePermission(centerPoint);
+ centerPoint = newValue;
}
/**
[sis] 03/04: Merge branch 'geoapi-4.0' into geoapi-3.1,
taking only the renaming in annotations. Renaming of methods or
classes are not taken for compatibility reasons.
Posted by de...@apache.org.
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
commit f7fb5454a9892c0b6a7733c874f6d3364821f1af
Merge: 9426368 d6b8565
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed May 1 16:51:45 2019 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1, taking only the renaming in annotations.
Renaming of methods or classes are not taken for compatibility reasons.
.../org/apache/sis/internal/book/GEOAPI.lst | 2 +-
.../resources/org/apache/sis/internal/book/OGC.lst | 2 +-
...Code.java => MI_PolarisationOrientationCode.java} | 12 ++++++------
.../apache/sis/metadata/iso/content/DefaultBand.java | 20 ++++++++++++++++++++
.../sis/metadata/iso/content/package-info.java | 6 +++---
.../sis/test/xml/AnnotationConsistencyCheck.java | 16 ----------------
6 files changed, 31 insertions(+), 27 deletions(-)
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java
index 843926e,8a2f8a0..d704bea
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarisationOrientationCode.java
@@@ -37,8 -37,8 +37,8 @@@ import org.apache.sis.xml.Namespaces
* @since 0.3
* @module
*/
- public final class MI_PolarizationOrientationCode
- extends CodeListAdapter<MI_PolarizationOrientationCode, PolarizationOrientation>
+ public final class MI_PolarisationOrientationCode
- extends CodeListAdapter<MI_PolarisationOrientationCode, PolarisationOrientation>
++ extends CodeListAdapter<MI_PolarisationOrientationCode, PolarizationOrientation>
{
/**
* Empty constructor for JAXB only.
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
index cf1d470,fa1c342..f81dc80
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
@@@ -387,6 -387,6 +387,11 @@@ public class DefaultBand extends Defaul
/**
* Returns the polarization of the radiation transmitted.
*
++ * <div class="warning"><b>Upcoming API change</b><br>
++ * This method may be renamed {@code getTransmittedPolarization} and its return type replaced by
++ * {@code PolarisationOrientation} ("z" letter replaced by "s" letter) in GeoAPI 4.0
++ * for compliance with ISO 19115-2:2019.</div>
++ *
* @return polarization of the radiation transmitted, or {@code null}.
*/
@Override
@@@ -398,16 -398,16 +403,26 @@@
/**
* Sets the polarization of the radiation transmitted.
*
++ * <div class="warning"><b>Upcoming API change</b><br>
++ * This method may be renamed {@code setTransmittedPolarization} and its argument type replaced by
++ * {@code PolarisationOrientation} ("z" letter replaced by "s" letter) in GeoAPI 4.0
++ * for compliance with ISO 19115-2:2019.</div>
++ *
* @param newValue the new transmitted polarization.
*/
- public void setTransmittedPolarisation(final PolarisationOrientation newValue) {
- checkWritePermission(transmittedPolarisation);
- transmittedPolarisation = newValue;
+ public void setTransmittedPolarization(final PolarizationOrientation newValue) {
+ checkWritePermission(transmittedPolarization);
+ transmittedPolarization = newValue;
}
/**
* Returns polarization of the radiation detected.
*
++ * <div class="warning"><b>Upcoming API change</b><br>
++ * This method may be renamed {@code getDetectedPolarization} and its return type replaced by
++ * {@code PolarisationOrientation} ("z" letter replaced by "s" letter) in GeoAPI 4.0
++ * for compliance with ISO 19115-2:2019.</div>
++ *
* @return polarization of the radiation detected, or {@code null}.
*/
@Override
@@@ -419,10 -419,10 +434,15 @@@
/**
* Sets the polarization of the radiation detected.
*
++ * <div class="warning"><b>Upcoming API change</b><br>
++ * This method may be renamed {@code setDetectedPolarization} and its argument type replaced by
++ * {@code PolarisationOrientation} ("z" letter replaced by "s" letter) in GeoAPI 4.0
++ * for compliance with ISO 19115-2:2019.</div>
++ *
* @param newValue the new detected polarization.
*/
- public void setDetectedPolarisation(final PolarisationOrientation newValue) {
- checkWritePermission(detectedPolarisation);
- detectedPolarisation = newValue;
+ public void setDetectedPolarization(final PolarizationOrientation newValue) {
+ checkWritePermission(detectedPolarization);
+ detectedPolarization = newValue;
}
}
diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
index df35f3a,c3976f7..4c354e7
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
@@@ -44,7 -44,7 +44,7 @@@
* {@code ├─} {@linkplain org.opengis.metadata.content.BandDefinition Band definition}<br>
* {@code ├─} {@linkplain org.opengis.metadata.content.CoverageContentType Coverage content type}<br>
* {@code ├─} {@linkplain org.opengis.metadata.content.ImagingCondition Imaging condition}<br>
- * {@code ├─} {@linkplain org.opengis.metadata.content.PolarizationOrientation Polarization orientation}<br>
- * {@code ├─} {@linkplain org.opengis.metadata.content.PolarisationOrientation Polarisation orientation}<br>
++ * {@code ├─} {@linkplain org.opengis.metadata.content.PolarizationOrientation Polarisation orientation}<br>
* {@code └─} {@linkplain org.opengis.metadata.content.TransferFunctionType Transfer function type}<br>
* </td><td class="sep" style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.content.AbstractContentInformation Content information} «abstract»<br>
@@@ -57,7 -57,7 +57,7 @@@
* {@code └─} {@linkplain org.apache.sis.metadata.iso.content.DefaultRangeElementDescription Range element description}<br>
* {@linkplain org.apache.sis.metadata.iso.content.DefaultBand Band}<br>
* {@code ├─} {@linkplain org.opengis.metadata.content.BandDefinition Band definition} «code list»<br>
- * {@code ├─} {@linkplain org.opengis.metadata.content.PolarizationOrientation Polarization orientation} «code list»<br>
- * {@code ├─} {@linkplain org.opengis.metadata.content.PolarisationOrientation Polarisation orientation} «code list»<br>
++ * {@code ├─} {@linkplain org.opengis.metadata.content.PolarizationOrientation Polarisation orientation} «code list»<br>
* {@code └─} {@linkplain org.opengis.metadata.content.TransferFunctionType Transfer function type} «code list»<br>
* {@linkplain org.apache.sis.metadata.iso.content.DefaultImageDescription Image description}<br>
* {@code └─} {@linkplain org.opengis.metadata.content.ImagingCondition Imaging condition} «code list»<br>