sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1820227 - in /sis/branches/ISO-19115-3/core: sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/ sis-utility/src/main/resources/org/apache/sis/xml/
Date Thu, 04 Jan 2018 21:50:35 GMT
Author: desruisseaux
Date: Thu Jan  4 21:50:35 2018
New Revision: 1820227

URL: http://svn.apache.org/viewvc?rev=1820227&view=rev
Log:
Adaptation of commit 7bc46154dfe9f5b51a0d530c0054ecf9e93faf57 from Image Matter
(update some classes in spatial package)

The project at this revision can be built but is known to have test failures.
Tests will pass only after we completed the port of all ISO 19115-3 work.

Modified:
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
    sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
    sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java?rev=1820227&r1=1820226&r2=1820227&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
[UTF-8] Thu Jan  4 21:50:35 2018
@@ -42,12 +42,13 @@ import org.apache.sis.xml.Namespaces;
  *
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @author  Cullen Rombach (Image Matters)
+ * @version 1.0
  * @since   0.3
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
-@XmlType(name = "AbstractMI_GeolocationInformation_Type")
+@XmlType(name = "AbstractMI_GeolocationInformation_Type", namespace = Namespaces.GMI)
 @XmlRootElement(name = "MI_GeolocationInformation", namespace = Namespaces.GMI)
 @XmlSeeAlso(DefaultGCPCollection.class)
 public class AbstractGeolocationInformation extends ISOMetadata implements GeolocationInformation
{
@@ -120,7 +121,7 @@ public class AbstractGeolocationInformat
      * @return an overall assessment of quality of geolocation information.
      */
     @Override
-    @XmlElement(name = "qualityInfo", namespace = Namespaces.GMI)
+    @XmlElement(name = "qualityInfo")
     public Collection<DataQuality> getQualityInfo() {
         return qualityInfo = nonNullCollection(qualityInfo, DataQuality.class);
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java?rev=1820227&r1=1820226&r2=1820227&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
[UTF-8] Thu Jan  4 21:50:35 2018
@@ -24,6 +24,7 @@ import org.opengis.util.InternationalStr
 import org.opengis.metadata.spatial.Dimension;
 import org.opengis.metadata.spatial.DimensionNameType;
 import org.apache.sis.internal.jaxb.gco.GO_Measure;
+import org.apache.sis.internal.jaxb.gco.InternationalStringAdapter;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.metadata.TitleProperty;
 import org.apache.sis.measure.ValueRange;
@@ -53,7 +54,8 @@ import static org.apache.sis.internal.me
  * @author  Touraïvane (IRD)
  * @author  Cédric Briançon (Geomatys)
  * @author  Rémi Maréchal (Geomatys)
- * @version 0.5
+ * @author  Cullen Rombach (Image Matters)
+ * @version 1.0
  * @since   0.3
  * @module
  */
@@ -63,8 +65,8 @@ import static org.apache.sis.internal.me
     "dimensionName",
     "dimensionSize",
     "resolution",
-/// "dimensionTitle",
-/// "dimensionDescription"
+    "dimensionTitle",
+    "dimensionDescription"
 })
 @XmlRootElement(name = "MD_Dimension")
 public class DefaultDimension extends ISOMetadata implements Dimension {
@@ -254,7 +256,8 @@ public class DefaultDimension extends IS
      * @since 0.5
      */
     @Override
-/// @XmlElement(name = "dimensionTitle")
+    @XmlElement(name = "dimensionTitle")
+    @XmlJavaTypeAdapter(InternationalStringAdapter.Since2014.class)
     public InternationalString getDimensionTitle() {
         return dimensionTitle;
     }
@@ -279,7 +282,8 @@ public class DefaultDimension extends IS
      * @since 0.5
      */
     @Override
-/// @XmlElement(name = "dimensionDescription")
+    @XmlElement(name = "dimensionDescription")
+    @XmlJavaTypeAdapter(InternationalStringAdapter.Since2014.class)
     public InternationalString getDimensionDescription() {
         return dimensionDescription;
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java?rev=1820227&r1=1820226&r2=1820227&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
[UTF-8] Thu Jan  4 21:50:35 2018
@@ -47,7 +47,7 @@ import org.apache.sis.xml.Namespaces;
  *
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @version 1.0
  *
  * @see DefaultGCPCollection
  *
@@ -55,7 +55,7 @@ import org.apache.sis.xml.Namespaces;
  * @module
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
-@XmlType(name = "MI_GCP_Type", propOrder = {
+@XmlType(name = "MI_GCP_Type", namespace = Namespaces.GMI, propOrder = {
     //"geographicCoordinates",
     "accuracyReports"
 })
@@ -153,7 +153,7 @@ public class DefaultGCP extends ISOMetad
      * @return accuracy of a ground control point.
      */
     @Override
-    @XmlElement(name = "accuracyReport", namespace = Namespaces.GMI)
+    @XmlElement(name = "accuracyReport")
     public Collection<Element> getAccuracyReports() {
         return accuracyReports = nonNullCollection(accuracyReports, Element.class);
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java?rev=1820227&r1=1820226&r2=1820227&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
[UTF-8] Thu Jan  4 21:50:35 2018
@@ -50,7 +50,7 @@ import org.apache.sis.xml.Namespaces;
  *
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @version 1.0
  *
  * @see DefaultGCP
  *
@@ -59,7 +59,7 @@ import org.apache.sis.xml.Namespaces;
  */
 @SuppressWarnings("CloneableClassWithoutClone")                 // ModifiableMetadata needs
shallow clones.
 @TitleProperty(name = "collectionName")
-@XmlType(name = "MI_GCPCollection_Type", propOrder = {
+@XmlType(name = "MI_GCPCollection_Type", namespace = Namespaces.GMI, propOrder = {
     "collectionIdentification",
     "collectionName",
     "coordinateReferenceSystem",
@@ -148,7 +148,7 @@ public class DefaultGCPCollection extend
      * @return the identifier, or {@code null}.
      */
     @Override
-    @XmlElement(name = "collectionIdentification", namespace = Namespaces.GMI, required =
true)
+    @XmlElement(name = "collectionIdentification", required = true)
     public Integer getCollectionIdentification() {
         return collectionIdentification;
     }
@@ -169,7 +169,7 @@ public class DefaultGCPCollection extend
      * @return name of the GCP collection, or {@code null}.
      */
     @Override
-    @XmlElement(name = "collectionName", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "collectionName", required = true)
     public InternationalString getCollectionName() {
         return collectionName;
     }
@@ -190,7 +190,7 @@ public class DefaultGCPCollection extend
      * @return coordinate reference system in which the ground control points are defined,
or {@code null}.
      */
     @Override
-    @XmlElement(name = "coordinateReferenceSystem", namespace = Namespaces.GMI, required
= true)
+    @XmlElement(name = "coordinateReferenceSystem", required = true)
     public ReferenceSystem getCoordinateReferenceSystem() {
         return coordinateReferenceSystem;
     }
@@ -211,7 +211,7 @@ public class DefaultGCPCollection extend
      * @return ground control point(s).
      */
     @Override
-    @XmlElement(name = "gcp", namespace = Namespaces.GMI, required = true)
+    @XmlElement(name = "gcp", required = true)
     public Collection<GCP> getGCPs() {
         return GCPs = nonNullCollection(GCPs, GCP.class);
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java?rev=1820227&r1=1820226&r2=1820227&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
[UTF-8] Thu Jan  4 21:50:35 2018
@@ -60,7 +60,8 @@ import org.apache.sis.xml.Namespaces;
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @author  Touraïvane (IRD)
  * @author  Cédric Briançon (Geomatys)
- * @version 0.3
+ * @author  Cullen Rombach (Image Matters)
+ * @version 1.0
  * @since   0.3
  * @module
  */
@@ -69,6 +70,7 @@ import org.apache.sis.xml.Namespaces;
     "controlPointAvailable",
     "orientationParameterAvailable",
     "orientationParameterDescription",
+    "georeferencedParameters",
     "parameterCitations",
     "geolocationInformation"
 })
@@ -247,7 +249,7 @@ public class DefaultGeoreferenceable ext
      * @return terms which support grid data georeferencing, or {@code null}.
      */
     @Override
-/// @XmlElement(name = "georeferencedParameters", required = true)
+    @XmlElement(name = "georeferencedParameters", required = true)
     public Record getGeoreferencedParameters() {
         return georeferencedParameters;
     }

Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java?rev=1820227&r1=1820226&r2=1820227&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
[UTF-8] Thu Jan  4 21:50:35 2018
@@ -115,6 +115,7 @@
 
     // Java types, primitive types and basic OGC types handling
     @XmlJavaTypeAdapter(InternationalStringAdapter.class),
+    @XmlJavaTypeAdapter(GO_Record.class),
     @XmlJavaTypeAdapter(GO_Integer.class), @XmlJavaTypeAdapter(type=int.class,     value=GO_Integer.class),
     @XmlJavaTypeAdapter(GO_Boolean.class), @XmlJavaTypeAdapter(type=boolean.class, value=GO_Boolean.class)
 })

Modified: sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt
URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt?rev=1820227&r1=1820226&r2=1820227&view=diff
==============================================================================
--- sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt
[UTF-8] (original)
+++ sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/NamespaceContent.txt
[UTF-8] Thu Jan  4 21:50:35 2018
@@ -507,7 +507,11 @@ http://standards.iso.org/iso/19115/-3/mm
     levelDescription
   MD_ScopeDescription
     <type>
+    attributeInstances
+    attributes
     dataset
+    featureInstances
+    features
     other
 http://standards.iso.org/iso/19115/-3/mrc/1.0
   MD_AttributeGroup
@@ -887,8 +891,10 @@ http://standards.iso.org/iso/19115/-3/mr
 http://standards.iso.org/iso/19115/-3/msr/1.0
   MD_Dimension
     <type>
+    dimensionDescription
     dimensionName
     dimensionSize
+    dimensionTitle
     resolution
   MD_DimensionNameTypeCode
     <type>
@@ -914,6 +920,7 @@ http://standards.iso.org/iso/19115/-3/ms
     axisDimensionProperties
     cellGeometry
     controlPointAvailability
+    georeferencedParameters
     numberOfDimensions
     orientationParameterAvailability
     orientationParameterDescription
@@ -951,6 +958,7 @@ http://standards.iso.org/iso/19115/-3/ms
     cellGeometry
     controlPointAvailability
     geolocationInformation
+    georeferencedParameters
     numberOfDimensions
     orientationParameterAvailability
     orientationParameterDescription
@@ -1160,6 +1168,7 @@ http://standards.iso.org/iso/19157/-2/dq
   DQ_QuantitativeResult
     <type>
     errorStatistic
+    value
     valueType
     valueUnit
   DQ_RelativeInternalPositionalAccuracy



Mime
View raw message