sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
Date Wed, 11 Sep 2019 11:05:57 GMT
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 b40355302ac45a510a2fd4acff6daabe9b6929e7
Merge: cbe6d78 d6817fa
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Sep 11 13:05:32 2019 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1

 .../apache/sis/console/ResourcesDownloader.java    |   2 +-
 .../java/org/apache/sis/internal/jaxb/Context.java |   2 +-
 .../jaxb/gco/InternationalStringAdapter.java       |   2 +-
 .../apache/sis/internal/jaxb/gco/PropertyType.java |   2 +-
 .../sis/internal/jaxb/gco/StringAdapter.java       |   2 +-
 .../sis/internal/jaxb/geometry/package-info.java   |   2 +-
 .../sis/internal/jaxb/gmi/LE_ProcessStep.java      |   2 +-
 .../apache/sis/internal/jaxb/gmi/LE_Source.java    |   2 +-
 .../org/apache/sis/internal/jaxb/gmi/MI_Band.java  |   2 +-
 .../internal/jaxb/gmi/MI_CoverageDescription.java  |   2 +-
 .../sis/internal/jaxb/gmi/MI_Georectified.java     |   2 +-
 .../sis/internal/jaxb/gmi/MI_Georeferenceable.java |   2 +-
 .../sis/internal/jaxb/gmi/MI_ImageDescription.java |   2 +-
 .../apache/sis/internal/jaxb/gmi/MI_Metadata.java  |   2 +-
 .../sis/internal/jaxb/metadata/CI_Address.java     |   2 +-
 .../sis/internal/jaxb/metadata/CI_Citation.java    |   2 +-
 .../sis/internal/jaxb/metadata/CI_Contact.java     |   2 +-
 .../apache/sis/internal/jaxb/metadata/CI_Date.java |   2 +-
 .../internal/jaxb/metadata/CI_OnlineResource.java  |   2 +-
 .../sis/internal/jaxb/metadata/CI_Party.java       |   2 +-
 .../internal/jaxb/metadata/CI_Responsibility.java  |   2 +-
 .../jaxb/metadata/CI_ResponsibleParty.java         |   2 +-
 .../sis/internal/jaxb/metadata/CI_Series.java      |   2 +-
 .../sis/internal/jaxb/metadata/CI_Telephone.java   |   2 +-
 .../sis/internal/jaxb/metadata/DQ_DataQuality.java |   2 +-
 .../sis/internal/jaxb/metadata/DQ_Element.java     |   2 +-
 .../jaxb/metadata/DQ_PositionalAccuracy.java       |   2 +-
 .../sis/internal/jaxb/metadata/DQ_Result.java      |   2 +-
 .../sis/internal/jaxb/metadata/EX_Extent.java      |   2 +-
 .../jaxb/metadata/EX_GeographicExtent.java         |   2 +-
 .../internal/jaxb/metadata/EX_TemporalExtent.java  |   2 +-
 .../internal/jaxb/metadata/EX_VerticalExtent.java  |   2 +-
 .../sis/internal/jaxb/metadata/LE_Algorithm.java   |   2 +-
 .../jaxb/metadata/LE_NominalResolution.java        |   2 +-
 .../jaxb/metadata/LE_ProcessStepReport.java        |   2 +-
 .../sis/internal/jaxb/metadata/LE_Processing.java  |   2 +-
 .../sis/internal/jaxb/metadata/LI_Lineage.java     |   2 +-
 .../sis/internal/jaxb/metadata/LI_ProcessStep.java |   2 +-
 .../sis/internal/jaxb/metadata/LI_Source.java      |   2 +-
 .../jaxb/metadata/MD_AggregateInformation.java     |   2 +-
 .../metadata/MD_ApplicationSchemaInformation.java  |   2 +-
 .../jaxb/metadata/MD_AssociatedResource.java       |   2 +-
 .../internal/jaxb/metadata/MD_AttributeGroup.java  |   2 +-
 .../internal/jaxb/metadata/MD_BrowseGraphic.java   |   2 +-
 .../sis/internal/jaxb/metadata/MD_Constraints.java |   2 +-
 .../jaxb/metadata/MD_ContentInformation.java       |   2 +-
 .../jaxb/metadata/MD_DataIdentification.java       |   2 +-
 .../jaxb/metadata/MD_DigitalTransferOptions.java   |   2 +-
 .../sis/internal/jaxb/metadata/MD_Dimension.java   |   2 +-
 .../internal/jaxb/metadata/MD_Distribution.java    |   2 +-
 .../sis/internal/jaxb/metadata/MD_Distributor.java |   2 +-
 .../metadata/MD_ExtendedElementInformation.java    |   2 +-
 .../internal/jaxb/metadata/MD_FeatureTypeInfo.java |   2 +-
 .../sis/internal/jaxb/metadata/MD_Format.java      |   2 +-
 .../jaxb/metadata/MD_GeometricObjects.java         |   2 +-
 .../internal/jaxb/metadata/MD_Identification.java  |   2 +-
 .../sis/internal/jaxb/metadata/MD_Identifier.java  |   2 +-
 .../internal/jaxb/metadata/MD_KeywordClass.java    |   2 +-
 .../sis/internal/jaxb/metadata/MD_Keywords.java    |   2 +-
 .../jaxb/metadata/MD_MaintenanceInformation.java   |   2 +-
 .../sis/internal/jaxb/metadata/MD_Medium.java      |   2 +-
 .../sis/internal/jaxb/metadata/MD_Metadata.java    |   2 +-
 .../metadata/MD_MetadataExtensionInformation.java  |   2 +-
 .../internal/jaxb/metadata/MD_MetadataScope.java   |   2 +-
 .../metadata/MD_PortrayalCatalogueReference.java   |   2 +-
 .../internal/jaxb/metadata/MD_RangeDimension.java  |   2 +-
 .../internal/jaxb/metadata/MD_Releasability.java   |   2 +-
 .../jaxb/metadata/MD_RepresentativeFraction.java   |   2 +-
 .../sis/internal/jaxb/metadata/MD_Resolution.java  |   2 +-
 .../sis/internal/jaxb/metadata/MD_Scope.java       |   2 +-
 .../jaxb/metadata/MD_ScopeDescription.java         |   2 +-
 .../jaxb/metadata/MD_SpatialRepresentation.java    |   2 +-
 .../jaxb/metadata/MD_StandardOrderProcess.java     |   2 +-
 .../sis/internal/jaxb/metadata/MD_Usage.java       |   2 +-
 .../jaxb/metadata/MI_AcquisitionInformation.java   |   2 +-
 .../jaxb/metadata/MI_EnvironmentalRecord.java      |   2 +-
 .../sis/internal/jaxb/metadata/MI_Event.java       |   2 +-
 .../apache/sis/internal/jaxb/metadata/MI_GCP.java  |   2 +-
 .../jaxb/metadata/MI_GeolocationInformation.java   |   2 +-
 .../sis/internal/jaxb/metadata/MI_Instrument.java  |   2 +-
 .../sis/internal/jaxb/metadata/MI_Objective.java   |   2 +-
 .../sis/internal/jaxb/metadata/MI_Operation.java   |   2 +-
 .../apache/sis/internal/jaxb/metadata/MI_Plan.java |   2 +-
 .../sis/internal/jaxb/metadata/MI_Platform.java    |   2 +-
 .../internal/jaxb/metadata/MI_PlatformPass.java    |   2 +-
 .../jaxb/metadata/MI_RangeElementDescription.java  |   2 +-
 .../internal/jaxb/metadata/MI_RequestedDate.java   |   2 +-
 .../sis/internal/jaxb/metadata/MI_Requirement.java |   2 +-
 .../sis/internal/jaxb/metadata/MX_DataFile.java    |   2 +-
 .../internal/jaxb/metadata/RS_ReferenceSystem.java |  22 +-
 .../internal/jaxb/metadata/SV_CoupledResource.java |   2 +-
 .../jaxb/metadata/SV_OperationChainMetadata.java   |   2 +-
 .../jaxb/metadata/SV_OperationMetadata.java        |   2 +-
 .../sis/internal/jaxb/metadata/SV_Parameter.java   |   2 +-
 .../sis/internal/jaxb/metadata/package-info.java   |   2 +-
 .../metadata/replace/ReferenceSystemMetadata.java  |  12 +-
 .../metadata/iso/extent/DefaultVerticalExtent.java |   2 +-
 .../sis/internal/jaxb/cat/EnumMarshallingTest.java |   2 +-
 .../sis/metadata/iso/CustomMetadataTest.java       |   2 +-
 .../org/apache/sis/test/xml/PackageVerifier.java   |   2 +-
 .../internal/jaxb/referencing/CC_Conversion.java   |   2 +-
 .../jaxb/referencing/CC_CoordinateOperation.java   |   2 +-
 .../referencing/CC_GeneralOperationParameter.java  |   2 +-
 .../jaxb/referencing/CC_GeneralParameterValue.java |   2 +-
 .../jaxb/referencing/CC_OperationMethod.java       |   2 +-
 .../jaxb/referencing/CC_OperationParameter.java    |   2 +-
 .../referencing/CC_OperationParameterGroup.java    |   2 +-
 .../internal/jaxb/referencing/CD_Ellipsoid.java    |   2 +-
 .../jaxb/referencing/CD_EngineeringDatum.java      |   2 +-
 .../jaxb/referencing/CD_GeodeticDatum.java         |   2 +-
 .../internal/jaxb/referencing/CD_ImageDatum.java   |   2 +-
 .../jaxb/referencing/CD_ParametricDatum.java       |   2 +-
 .../jaxb/referencing/CD_PrimeMeridian.java         |   2 +-
 .../jaxb/referencing/CD_TemporalDatum.java         |   2 +-
 .../jaxb/referencing/CD_VerticalDatum.java         |   2 +-
 .../sis/internal/jaxb/referencing/CS_AffineCS.java |   2 +-
 .../internal/jaxb/referencing/CS_CartesianCS.java  |   2 +-
 .../jaxb/referencing/CS_CoordinateSystem.java      |   2 +-
 .../jaxb/referencing/CS_CoordinateSystemAxis.java  |   2 +-
 .../jaxb/referencing/CS_CylindricalCS.java         |   2 +-
 .../jaxb/referencing/CS_EllipsoidalCS.java         |   2 +-
 .../sis/internal/jaxb/referencing/CS_LinearCS.java |   2 +-
 .../internal/jaxb/referencing/CS_ParametricCS.java |   2 +-
 .../sis/internal/jaxb/referencing/CS_PolarCS.java  |   2 +-
 .../internal/jaxb/referencing/CS_SphericalCS.java  |   2 +-
 .../sis/internal/jaxb/referencing/CS_TimeCS.java   |   2 +-
 .../jaxb/referencing/CS_UserDefinedCS.java         |   2 +-
 .../internal/jaxb/referencing/CS_VerticalCS.java   |   2 +-
 .../sis/internal/jaxb/referencing/SC_CRS.java      |   2 +-
 .../internal/jaxb/referencing/SC_SingleCRS.java    |   2 +-
 .../internal/jaxb/referencing/SC_VerticalCRS.java  |   2 +-
 .../internal/jaxb/referencing/package-info.java    |   2 +-
 .../sis/referencing/crs/SC_GeographicCRS.java      |   2 +-
 .../referencing/datum/DefaultPrimeMeridian.java    |   2 +-
 .../referencing/datum/DefaultEllipsoidTest.java    |   4 +-
 .../apache/sis/test/integration/MetadataTest.java  | 244 ++++++---------------
 .../sis/test/integration/MetadataVerticalTest.java | 214 ++++++++++++++++++
 .../sis/test/suite/ReferencingTestSuite.java       |   1 +
 .../org/apache/sis/test/integration/Metadata.xml   |  63 ++++--
 .../sis/storage/earthobservation/LandsatTest.txt   |   2 +-
 .../sis/internal/storage/xml/MimeTypeDetector.java |   2 +-
 141 files changed, 482 insertions(+), 346 deletions(-)

diff --cc core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
index 56e9725,a877637..f16a26a
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
@@@ -68,9 -69,10 +68,9 @@@ public final strictfp class EnumMarshal
          final String xml = marshal(id, VERSION_2014);
          assertXmlEquals(expected, xml, "xmlns:*");
          /*
-          * Unmarshall the above XML and verify that we find all the topic categories.
+          * Unmarshal the above XML and verify that we find all the topic categories.
           */
          final Collection<TopicCategory> unmarshalled = unmarshal(DefaultDataIdentification.class,
expected).getTopicCategories();
 -        assertInstanceOf("topicCategory", EnumSet.class, unmarshalled);
          assertSetEquals(topics, unmarshalled);
      }
  }
diff --cc core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
index 8123ca0,068325c..458f7e5
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
@@@ -212,13 -201,13 +201,13 @@@ public final strictfp class MetadataTes
                  citation.setCitedResponsibleParties(singleton(originator));
              }
              final DefaultDataIdentification identification = new DefaultDataIdentification(
-                     citation,                   // Citation
-                     "CTD NEDIPROD VI 120",      // Abstract
-                     Locale.ENGLISH,             // Language,
-                     TopicCategory.OCEANS);      // Topic category
+                     citation,                                                   // Citation
+                     "Description of pseudo data for testing purpose only.",     // Abstract
+                     Locale.ENGLISH,                                             // Language,
+                     TopicCategory.OCEANS);                                      // Topic
category
              {
                  @SuppressWarnings("deprecation")
 -                final DefaultResponsibility custodian = new DefaultResponsibleParty(author);
 +                final DefaultResponsibleParty custodian = new DefaultResponsibleParty((DefaultResponsibility)
author);
                  custodian.setRole(Role.CUSTODIAN);
                  identification.setPointOfContacts(singleton(custodian));
              }
@@@ -338,13 -323,13 +323,13 @@@
          {
              final DefaultMetadataExtensionInformation extensionInfo = new DefaultMetadataExtensionInformation();
              extensionInfo.setExtendedElementInformation(singleton(new DefaultExtendedElementInformation(
-                     "SDN:EDMO::",                           // Name
-                     "http://www.seadatanet.org/urnurl/",    // Definition
-                     null,                                   // Condition
-                     Datatype.CODE_LIST,                     // Data type
-                     "SeaDataNet",                           // Parent entity
-                     null,                                   // Rule
-                     null)));                                // Source
+                     "SDN:EDMO",                                                     // Name
+                     "European Directory of Marine Organisations",                   // Definition
+                     null,                                                           // Condition
+                     Datatype.CODE_LIST,                                             // Data
type
+                     "SeaDataNet",                                                   // Parent
entity
+                     "For testing only",                                             // Rule
 -                    NilReason.MISSING.createNilObject(Responsibility.class))));     // Source
++                    NilReason.MISSING.createNilObject(ResponsibleParty.class))));   // Source
              metadata.setMetadataExtensionInfo(singleton(extensionInfo));
          }
          /*
@@@ -366,13 -351,13 +351,13 @@@
  
              final DefaultDigitalTransferOptions transfer = new DefaultDigitalTransferOptions();
              transfer.setTransferSize(2.431640625);
-             final DefaultOnlineResource onlines = new DefaultOnlineResource(URI.create("http://www.ifremer.fr/data/something"));
-             onlines.setDescription(new SimpleInternationalString("CTDF02"));
+             final DefaultOnlineResource onlines = new DefaultOnlineResource(URI.create("ftp://www.ifremer.fr/data/something"));
+             onlines.setDescription(new SimpleInternationalString("Dummy download link"));
              onlines.setFunction(OnLineFunction.DOWNLOAD);
-             onlines.setProtocol("http");
+             onlines.setProtocol("ftp");
              transfer.setOnLines(singleton(onlines));
              distributionInfo.setTransferOptions(singleton(transfer));
 -            metadata.setDistributionInfo(singleton(distributionInfo));
 +            metadata.setDistributionInfo(distributionInfo);
          }
          return metadata;
      }


Mime
View raw message