Index: geoapi/src/main/java/org/opengis/metadata/distribution/DataFile.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/distribution/DataFile.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/distribution/DataFile.java	(révision 0)
@@ -0,0 +1,47 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.distribution;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.LocalName;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Description of a transfer data file.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MX_DataFile", specification=ISO_19139)
+public interface DataFile {
+    /**
+     * Provides the list of feature types concerned by the transfer data file. Depending on
+     * the transfer choices, a data file may contain data related to one or many feature types.
+     * This attribute may be omitted when the dataset is composed of a single file and/or the
+     * data does not relate to a feature catalogue.
+     *
+     * @return List of features types concerned by the transfer data file.
+     */
+    @UML(identifier="featureType", obligation=OPTIONAL, specification=ISO_19139)
+    Collection<? extends LocalName> getFeatureTypes();
+
+    /**
+     * Defines the format of the transfer data file.
+     *
+     * @return Format of the transfer data file.
+     */
+    @UML(identifier="fileFormat", obligation=MANDATORY, specification=ISO_19139)
+    Format getFileFormat();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/distribution/DataFile.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/RequestedDate.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/RequestedDate.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/RequestedDate.java	(révision 0)
@@ -0,0 +1,43 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Date;
+
+import org.opengis.annotation.UML;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Range of date validity.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_RequestedDate", specification=ISO_19115_2)
+public interface RequestedDate {
+    /**
+     * Preferred date and time of collection.
+     *
+     * @return Preferred date and time.
+     */
+    @UML(identifier="requestedDateOfCollection", obligation=MANDATORY, specification=ISO_19115_2)
+    Date getRequestedDateOfCollection();
+
+    /**
+     * Latest date and time collection must be completed.
+     *
+     * @return Latest date and time.
+     */
+    @UML(identifier="latestAcceptableDate", obligation=MANDATORY, specification=ISO_19115_2)
+    Date getLatestAcceptableDate();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/RequestedDate.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Operation.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Operation.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Operation.java	(révision 0)
@@ -0,0 +1,120 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.metadata.Identifier;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.metadata.identification.Progress;
+import org.opengis.util.InternationalString;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Designations for the operation used to acquire the dataset.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_Operation", specification=ISO_19115_2)
+public interface Operation {
+    /**
+     * Description of the mission on which the platform observations are made and the
+     * objectives of that mission.
+     *
+     * @return Description of the mission.
+     */
+    @UML(identifier="description", obligation=OPTIONAL, specification=ISO_19115_2)
+    InternationalString getDescription();
+
+    /**
+     * Identification of the mission.
+     *
+     * @return Identification of the mission.
+     */
+    @UML(identifier="citation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Citation getCitation();
+
+    /**
+     * Unique identification of the operation.
+     *
+     * @return Unique identification of the operation.
+     */
+    @UML(identifier="identifier", obligation=MANDATORY, specification=ISO_19115_2)
+    Identifier getIdentifier();
+
+    /**
+     * Status of the data acquisition.
+     *
+     * @return Status of the data acquisition.
+     */
+    @UML(identifier="status", obligation=MANDATORY, specification=ISO_19115_2)
+    Progress getStatus();
+
+    /**
+     * Collection technique for the operation.
+     *
+     * @return Collection technique for the operation.
+     */
+    @UML(identifier="type", obligation=OPTIONAL, specification=ISO_19115_2)
+    OperationType getType();
+
+    /**
+     * Sub-missions that make up part of a larger mission.
+     *
+     * @return Sub-missions.
+     */
+    @UML(identifier="childOperation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Operation> getChildOperations();
+
+    /**
+     * Object(s) or area(s) of interest to be sensed.
+     *
+     * @return Object(s) or area(s) of interest.
+     */
+    @UML(identifier="objective", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Objective> getObjectives();
+
+    /**
+     * Heritage of the operation.
+     *
+     * @return Heritage of the operation.
+     */
+    @UML(identifier="parentOperation", obligation=MANDATORY, specification=ISO_19115_2)
+    Operation getParentOperation();
+
+    /**
+     * Plan satisfied by the operation.
+     *
+     * @return Plan satisfied by the operation.
+     */
+    @UML(identifier="plan", obligation=OPTIONAL, specification=ISO_19115_2)
+    Plan getPlan();
+
+    /**
+     * Platform (or platforms) used in the operation.
+     *
+     * @return Platforms used in the operation.
+     */
+    @UML(identifier="platform", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Platform> getPlatforms();
+
+    /**
+     * Record of an event occurring during an operation.
+     *
+     * @return Record of an event occurring during an operation.
+     */
+    @UML(identifier="significantEvent", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Event> getSignificantEvents();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Operation.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Requirement.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Requirement.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Requirement.java	(révision 0)
@@ -0,0 +1,95 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Collection;
+
+import java.util.Date;
+import org.opengis.annotation.UML;
+import org.opengis.metadata.Identifier;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.metadata.citation.ResponsibleParty;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Requirement to be satisfied by the planned data acquisition.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_Requirement", specification=ISO_19115_2)
+public interface Requirement {
+    /**
+     * Identification of reference or guidance material for the requirement.
+     *
+     * @return Identification of reference or guidance material.
+     */
+    @UML(identifier="citation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Citation getCitation();
+
+    /**
+     * Unique name, or code, for the requirement.
+     *
+     * @return Unique name or code.
+     */
+    @UML(identifier="identifier", obligation=MANDATORY, specification=ISO_19115_2)
+    Identifier getIdentifier();
+
+    /**
+     * Origin of requirement.
+     *
+     * @return Origin of requirement.
+     */
+    @UML(identifier="requestor", obligation=MANDATORY, specification=ISO_19115_2)
+    Collection<? extends ResponsibleParty> getRequestors();
+
+    /**
+     * Person(s), or body(ies), to receive results of requirement.
+     *
+     * @return Person(s), or body(ies), to receive results.
+     */
+    @UML(identifier="recipient", obligation=MANDATORY, specification=ISO_19115_2)
+    Collection<? extends ResponsibleParty> getRecipients();
+
+    /**
+     * Relative ordered importance, or urgency, of the requirement.
+     *
+     * @return Relative ordered importance, or urgency.
+     */
+    @UML(identifier="priority", obligation=MANDATORY, specification=ISO_19115_2)
+    Priority getPriority();
+
+    /**
+     * Required or preferred acquisition date and time.
+     *
+     * @return Required or preferred acquisition date and time.
+     */
+    @UML(identifier="requestedDate", obligation=MANDATORY, specification=ISO_19115_2)
+    RequestedDate getRequestedDate();
+
+    /**
+     * Date and time after which collection is no longer valid.
+     *
+     * @return Date and time after which collection is no longer valid.
+     */
+    @UML(identifier="expiryDate", obligation=MANDATORY, specification=ISO_19115_2)
+    Date getExpiryDate();
+
+    /**
+     * Plan that identifies solution to satisfy the requirement.
+     *
+     * @return Plan that identifies solution to satisfy the requirement.
+     */
+    @UML(identifier="satisfiedPlan", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Plan> getSatisifedPlans();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Requirement.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/OperationType.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/OperationType.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/OperationType.java	(révision 0)
@@ -0,0 +1,99 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Code indicating whether the data contained in this packet is real (originates from live-fly
+ * or other non-simulated operational sources), simulated (originates from target simulator sources),
+ * or synthesized (a mix of real and simulated data).
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_OperationTypeCode", specification=ISO_19115_2)
+public final class OperationType extends CodeList<OperationType> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = -4952647967684867284L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<OperationType> VALUES = new ArrayList<OperationType>(3);
+
+    /**
+     * Originates from live-fly or other non-simulated operational source.
+     */
+    @UML(identifier="real", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final OperationType REAL = new OperationType("REAL");
+
+    /**
+     * Originates from target simulator sources.
+     */
+    @UML(identifier="simulated", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final OperationType SIMULATED = new OperationType("SIMULATED");
+
+    /**
+     * Mix of real and simulated data.
+     */
+    @UML(identifier="synthesized", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final OperationType SYNTHESIZED = new OperationType("SYNTHESIZED");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private OperationType(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code OperationType}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static OperationType[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new OperationType[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public OperationType[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the operation type that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static OperationType valueOf(String code) {
+        return valueOf(OperationType.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/OperationType.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Trigger.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Trigger.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Trigger.java	(révision 0)
@@ -0,0 +1,97 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Mechanism of activation.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_TriggerCode", specification=ISO_19115_2)
+public final class Trigger extends CodeList<Trigger> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = 649620597963351153L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<Trigger> VALUES = new ArrayList<Trigger>(3);
+
+    /**
+     * Event due to external stimuli.
+     */
+    @UML(identifier="automatic", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Trigger AUTOMATIC = new Trigger("AUTOMATIC");
+
+    /**
+     * Event manually instigated.
+     */
+    @UML(identifier="manual", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Trigger MANUAL = new Trigger("MANUAL");
+
+    /**
+     * Event instigated by planned internal stimuli.
+     */
+    @UML(identifier="preProgrammed", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Trigger PRE_PROGRAMMED = new Trigger("PRE_PROGRAMMED");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private Trigger(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code Trigger}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static Trigger[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new Trigger[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public Trigger[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the trigger that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static Trigger valueOf(String code) {
+        return valueOf(Trigger.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Trigger.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Instrument.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Instrument.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Instrument.java	(révision 0)
@@ -0,0 +1,70 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.metadata.Identifier;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.util.InternationalString;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Designations for the measuring instruments.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_Instrument", specification=ISO_19115_2)
+public interface Instrument {
+    /**
+     * Complete citation of the instrument.
+     *
+     * @return Complete citation of the instrument.
+     */
+    @UML(identifier="citation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Citation> getCitations();
+
+    /**
+     * Unique identification of the instrument.
+     *
+     * @return Unique identification of the instrument.
+     */
+    @UML(identifier="identifier", obligation=MANDATORY, specification=ISO_19115_2)
+    Identifier getIdentifier();
+
+    /**
+     * Name of the type of instrument. Examples: framing, line-scan, push-broom, pan-frame.
+     *
+     * @return Type of instrument.
+     */
+    @UML(identifier="type", obligation=MANDATORY, specification=ISO_19115_2)
+    InternationalString getType();
+
+    /**
+     * Textual description of the instrument.
+     *
+     * @return Textual description.
+     */
+    @UML(identifier="description", obligation=OPTIONAL, specification=ISO_19115_2)
+    InternationalString getDecription();
+
+    /**
+     * Platform on which the instrument is mounted.
+     *
+     * @return Platform on which the instrument is mounted.
+     */
+    @UML(identifier="mountedOn", obligation=OPTIONAL, specification=ISO_19115_2)
+    Platform getMountedOn();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Instrument.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Sequence.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Sequence.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Sequence.java	(révision 0)
@@ -0,0 +1,97 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Temporal relation of activation.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_SequenceCode", specification=ISO_19115_2)
+public final class Sequence extends CodeList<Sequence> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = -3995216796996596661L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<Sequence> VALUES = new ArrayList<Sequence>(3);
+
+    /**
+     * Beginning of a collection.
+     */
+    @UML(identifier="start", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Sequence START = new Sequence("START");
+
+    /**
+     * End of a collection.
+     */
+    @UML(identifier="end", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Sequence END = new Sequence("END");
+
+    /**
+     * Collection without a significant duration
+     */
+    @UML(identifier="instantaneous", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Sequence INSTANTANEOUS = new Sequence("INSTANTANEOUS");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private Sequence(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code Sequence}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static Sequence[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new Sequence[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public Sequence[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the sequence that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static Sequence valueOf(String code) {
+        return valueOf(Sequence.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Sequence.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Objective.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Objective.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Objective.java	(révision 0)
@@ -0,0 +1,96 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.metadata.Identifier;
+import org.opengis.metadata.extent.Extent;
+import org.opengis.util.InternationalString;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Describes the characteristics, spatial and temporal extent of the intended object to be
+ * observed.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_Objective", specification=ISO_19115_2)
+public interface Objective {
+    /**
+     * Code used to identify the objective.
+     *
+     * @return Identify the objective.
+     */
+    @UML(identifier="identifier", obligation=MANDATORY, specification=ISO_19115_2)
+    Collection<? extends Identifier> getIdentifiers();
+
+    /**
+     * Priority applied to the target.
+     *
+     * @return Priority applied.
+     */
+    @UML(identifier="priority", obligation=OPTIONAL, specification=ISO_19115_2)
+    InternationalString getPriority();
+
+    /**
+     * Collection technique for the objective.
+     *
+     * @return Collection technique for the objective.
+     */
+    @UML(identifier="type", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends ObjectiveType> getTypes();
+
+    /**
+     * Role or purpose performed by or activity performed at the objective.
+     *
+     * @return Role or purpose performed by or activity performed at the objective.
+     */
+    @UML(identifier="function", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends InternationalString> getFunctions();
+
+    /**
+     * Extent information including the bounding box, bounding polygon, vertical and
+     * temporal extent of the objective.
+     *
+     * @return Extent information.
+     */
+    @UML(identifier="extent", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Extent> getExtents();
+
+    /**
+     * Event or events associated with objective completion.
+     *
+     * @return Events associated with objective completion.
+     */
+    @UML(identifier="objectiveOccurence", obligation=MANDATORY, specification=ISO_19115_2)
+    Collection<? extends Event> getObjectiveOccurences();
+
+    /**
+     * Pass of the platform over the objective.
+     *
+     * @return Pass of the platform.
+     */
+    @UML(identifier="pass", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends PlatformPass> getPass();
+
+    /**
+     * Instrument which senses the objective data.
+     *
+     * @return Instrument which senses the objective data.
+     */
+    @UML(identifier="sensingInstrument", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Instrument> getSensingInstruments();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Objective.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/PlatformPass.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/PlatformPass.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/PlatformPass.java	(révision 0)
@@ -0,0 +1,53 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.geometry.Geometry;
+import org.opengis.metadata.Identifier;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Identification of collection coverage.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_PlatformPass", specification=ISO_19115_2)
+public interface PlatformPass {
+    /**
+     * Unique name of the pass.
+     *
+     * @return Unique name of the pass.
+     */
+    @UML(identifier="identifier", obligation=MANDATORY, specification=ISO_19115_2)
+    Identifier getIdentifier();
+
+    /**
+     * Area covered by the pass.
+     *
+     * @return Area covered by the pass.
+     */
+    @UML(identifier="extent", obligation=OPTIONAL, specification=ISO_19115_2)
+    Geometry getExtent();
+
+    /**
+     * Occurrence of one or more events for a pass.
+     *
+     * @return Occurrence of one or more events for a pass.
+     */
+    @UML(identifier="relatedEvent", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Event> getRelatedEvents();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/PlatformPass.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/ObjectiveType.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/ObjectiveType.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/ObjectiveType.java	(révision 0)
@@ -0,0 +1,97 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Temporal persistence of collection objective.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_ObjectiveTypeCode", specification=ISO_19115_2)
+public final class ObjectiveType extends CodeList<ObjectiveType> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = -4952647967684867284L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<ObjectiveType> VALUES = new ArrayList<ObjectiveType>(3);
+
+    /**
+     * Single instance of collection.
+     */
+    @UML(identifier="instantaneousCollection", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final ObjectiveType INSTANTANEOUS_COLLECTION = new ObjectiveType("INSTANTANEOUS_COLLECTION");
+
+    /**
+     * Multiple instances of collection.
+     */
+    @UML(identifier="persistentView", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final ObjectiveType PERSISTENT_VIEW = new ObjectiveType("PERSISTENT_VIEW");
+
+    /**
+     * Collection over specified domain.
+     */
+    @UML(identifier="survey", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final ObjectiveType SURVEY = new ObjectiveType("SURVEY");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private ObjectiveType(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code ObjectiveType}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static ObjectiveType[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new ObjectiveType[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public ObjectiveType[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the objective type that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static ObjectiveType valueOf(String code) {
+        return valueOf(ObjectiveType.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/ObjectiveType.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/EnvironmentalRecord.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/EnvironmentalRecord.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/EnvironmentalRecord.java	(révision 0)
@@ -0,0 +1,58 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.InternationalString;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Information about the environmental conditions during the acquisition.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_EnvironmentalRecord", specification=ISO_19115_2)
+public interface EnvironmentalRecord {
+    /**
+     * Average air temperature along the flight pass during the photo flight.
+     *
+     * @return Average air temperature along the flight pass during the photo flight.
+     */
+    @UML(identifier="averageAirTemperature", obligation=MANDATORY, specification=ISO_19115_2)
+    Double getAverageAirTemperature();
+
+    /**
+     * Maximum relative humidity along the flight pass during the photo flight.
+     *
+     * @return Maximum relative humidity along the flight pass during the photo flight.
+     */
+    @UML(identifier="maxRelativeHumidity", obligation=MANDATORY, specification=ISO_19115_2)
+    Double getMaxRelativeHumidity();
+
+    /**
+     * Maximum altitude during the photo flight.
+     *
+     * @return Maximum altitude during the photo flight.
+     */
+    @UML(identifier="maxAltitude", obligation=MANDATORY, specification=ISO_19115_2)
+    Double getMaxAltitude();
+
+    /**
+     * Meteorological conditions in the photo flight area, in particular clouds, snow and wind.
+     *
+     * @return Meteorological conditions in the photo flight area.
+     */
+    @UML(identifier="meteorologicalConditions", obligation=MANDATORY, specification=ISO_19115_2)
+    InternationalString getMeteorologicalConditions();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/EnvironmentalRecord.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Event.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Event.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Event.java	(révision 0)
@@ -0,0 +1,93 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Collection;
+import java.util.Date;
+
+import org.opengis.annotation.UML;
+import org.opengis.metadata.Identifier;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Identification of a significant collection point within an operation.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_Event", specification=ISO_19115_2)
+public interface Event {
+    /**
+     * Event name or number.
+     *
+     * @return Event name or number.
+     */
+    @UML(identifier="identifier", obligation=MANDATORY, specification=ISO_19115_2)
+    Identifier getIdentifier();
+
+    /**
+     * Initiator of the event.
+     *
+     * @return Initiator of the event.
+     */
+    @UML(identifier="trigger", obligation=MANDATORY, specification=ISO_19115_2)
+    Trigger getTrigger();
+
+    /**
+     * Meaning of the event.
+     *
+     * @return Meaning of the event.
+     */
+    @UML(identifier="context", obligation=MANDATORY, specification=ISO_19115_2)
+    Context getContext();
+
+    /**
+     * Relative time ordering of the event.
+     *
+     * @return Relative time ordering.
+     */
+    @UML(identifier="sequence", obligation=MANDATORY, specification=ISO_19115_2)
+    Sequence getSequence();
+
+    /**
+     * Time the event occurred.
+     *
+     * @return Time the event occurred
+     */
+    @UML(identifier="time", obligation=MANDATORY, specification=ISO_19115_2)
+    Date getTime();
+
+    /**
+     * Objective or objectives satisfied by an event.
+     *
+     * @return Objectives satisfied by an event.
+     */
+    @UML(identifier="expectedObjective", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Objective> getExpectedObjectives();
+
+    /**
+     * Pass during which an event occurs.
+     *
+     * @return Pass during which an event occurs.
+     */
+    @UML(identifier="relatedPass", obligation=OPTIONAL, specification=ISO_19115_2)
+    PlatformPass getRelatedPass();
+
+    /**
+     * Instrument or instruments for which the event is meaningful.
+     *
+     * @return Instruments for which the event is meaningful.
+     */
+    @UML(identifier="relatedSensor", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Instrument> getRelatedSensors();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Event.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Priority.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Priority.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Priority.java	(révision 0)
@@ -0,0 +1,103 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Ordered list of priorities.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_PriorityCode", specification=ISO_19115_2)
+public final class Priority extends CodeList<Priority> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = -3504801926504645861L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<Priority> VALUES = new ArrayList<Priority>(4);
+
+    /**
+     * Decisive importance.
+     */
+    @UML(identifier="critical", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Priority CRITICAL = new Priority("CRITICAL");
+
+    /**
+     * Requires resources to be made available.
+     */
+    @UML(identifier="highImportance", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Priority HIGH_IMPORTANCE = new Priority("HIGH_IMPORTANCE");
+
+    /**
+     * Normal operation priority.
+     */
+    @UML(identifier="mediumImportance", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Priority MEDIUM_IMPORTANCE = new Priority("MEDIUM_IMPORTANCE");
+
+    /**
+     * To be completed when resources are available
+     */
+    @UML(identifier="lowImportance", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Priority LOW_IMPORTANCE = new Priority("LOW_IMPORTANCE");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private Priority(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code Priority}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static Priority[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new Priority[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public Priority[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the priority that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static Priority valueOf(String code) {
+        return valueOf(Priority.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Priority.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Context.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Context.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Context.java	(révision 0)
@@ -0,0 +1,97 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Designation of criterion for defining the context of the scanning process event.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_ContextCode", specification=ISO_19115_2)
+public final class Context extends CodeList<Context> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = 1723020399396010030L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<Context> VALUES = new ArrayList<Context>(3);
+
+    /**
+     * Event related to a specific collection.
+     */
+    @UML(identifier="acquisition", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Context ACQUISITION = new Context("ACQUISITION");
+
+    /**
+     * Event related to a sequence of collections.
+     */
+    @UML(identifier="pass", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Context PASS = new Context("PASS");
+
+    /**
+     * Event related to a navigational manoeuvre.
+     */
+    @UML(identifier="wayPoint", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final Context WAY_POINT = new Context("WAY_POINT");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private Context(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code Context}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static Context[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new Context[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public Context[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the context that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static Context valueOf(String code) {
+        return valueOf(Context.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Context.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Platform.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Platform.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Platform.java	(révision 0)
@@ -0,0 +1,71 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.metadata.Identifier;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.util.InternationalString;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Designation of the platform used to acquire the dataset.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_Platform", specification=ISO_19115_2)
+public interface Platform {
+    /**
+     * Source where information about the platform is described.
+     *
+     * @return Source where information about the platform is described.
+     */
+    @UML(identifier="citation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Citation getCitation();
+
+    /**
+     * Unique identification of the platform.
+     *
+     * @return Unique identification of the platform.
+     */
+    @UML(identifier="identifier", obligation=MANDATORY, specification=ISO_19115_2)
+    Identifier getIdentifier();
+
+    /**
+     * Narrative description of the platform supporting the instrument.
+     *
+     * @return Narrative description of the platform.
+     */
+    @UML(identifier="description", obligation=MANDATORY, specification=ISO_19115_2)
+    InternationalString getDescription();
+
+    /**
+     * Organization responsible for building, launch, or operation of the platform.
+     *
+     * @return Organization responsible for building, launch, or operation of the platform.
+     */
+    @UML(identifier="sponsor", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends ResponsibleParty> getSponsors();
+
+    /**
+     * Instrument(s) mounted on a platform.
+     *
+     * @return Instrument(s) mounted on a platform.
+     */
+    @UML(identifier="instrument", obligation=MANDATORY, specification=ISO_19115_2)
+    Collection<? extends Instrument> getInstruments();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Platform.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/Plan.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/Plan.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/Plan.java	(révision 0)
@@ -0,0 +1,69 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.metadata.identification.Progress;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Designations for the planning information related to meeting the data acquisition requirements.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_Plan", specification=ISO_19115_2)
+public interface Plan {
+    /**
+     * Manner of sampling geometry that the planner expects for collection of objective data.
+     *
+     * @return Manner of sampling geometry.
+     */
+    @UML(identifier="type", obligation=OPTIONAL, specification=ISO_19115_2)
+    GeometryType getType();
+
+    /**
+     * Current status of the plan (pending, completed, etc.)
+     *
+     * @return Current status of the plan.
+     */
+    @UML(identifier="status", obligation=MANDATORY, specification=ISO_19115_2)
+    Progress getStatus();
+
+    /**
+     * Identification of authority requesting target collection.
+     *
+     * @return Identification of authority requesting target collection.
+     */
+    @UML(identifier="citation", obligation=MANDATORY, specification=ISO_19115_2)
+    Citation getCitation();
+
+    /**
+     * Identification of the activity or activities that satisfy a plan.
+     *
+     * @return Identification of the activity or activities.
+     */
+    @UML(identifier="operation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Operation> getOperations();
+
+    /**
+     * Requirement satisfied by the plan.
+     *
+     * @return Requirement satisfied by the plan.
+     */
+    @UML(identifier="satisfiedRequirement", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Requirement> getSatisfiedRequirements();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/Plan.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/GeometryType.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/GeometryType.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/GeometryType.java	(révision 0)
@@ -0,0 +1,103 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Geometric description of the collection.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_GeometryTypeCode", specification=ISO_19115_2)
+public final class GeometryType extends CodeList<GeometryType> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = -8326145457020825352L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<GeometryType> VALUES = new ArrayList<GeometryType>(4);
+
+    /**
+     * Single geographic point of interest.
+     */
+    @UML(identifier="point", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final GeometryType POINT = new GeometryType("POINT");
+
+    /**
+     * Extended collection in a single vector.
+     */
+    @UML(identifier="linear", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final GeometryType LINEAR = new GeometryType("LINEAR");
+
+    /**
+     * Collection of a geographic area defined by a polygon (coverage).
+     */
+    @UML(identifier="areal", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final GeometryType AREAL = new GeometryType("AREAL");
+
+    /**
+     * Series of linear collections grouped by way points.
+     */
+    @UML(identifier="strip", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final GeometryType STRIP = new GeometryType("STRIP");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private GeometryType(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code GeometryType}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static GeometryType[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new GeometryType[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public GeometryType[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the geometry type that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static GeometryType valueOf(String code) {
+        return valueOf(GeometryType.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/GeometryType.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/acquisition/AcquisitionInformation.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/acquisition/AcquisitionInformation.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/acquisition/AcquisitionInformation.java	(révision 0)
@@ -0,0 +1,84 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.acquisition;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Designations for the measuring instruments, the platform carrying them, and the mission to
+ * which the data contributes.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_AcquisitionInformation", specification=ISO_19115_2)
+public interface AcquisitionInformation {
+    /**
+     * Identifies the plan as implemented by the acquisition.
+     *
+     * @return Plan as implemented by the acquisition.
+     */
+    @UML(identifier="acquisitionPlan", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Plan> getAcquisitionPlans();
+
+    /**
+     * Identifies the requirement the data acquisition intends to satisfy.
+     *
+     * @return Requirement the data acquisition intends to satisfy.
+     */
+    @UML(identifier="acquisitionRequirement", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Requirement> getAcquisitionRequirements();
+
+    /**
+     * A record of the environmental circumstances during the data acquisition.
+     *
+     * @return Record of the environmental circumstances.
+     */
+    @UML(identifier="environmentalConditions", obligation=OPTIONAL, specification=ISO_19115_2)
+    EnvironmentalRecord getEnvironmentalConditions();
+
+    /**
+     * General information about the instrument used in data acquisition.
+     *
+     * @return Instrument used in data acquisition.
+     */
+    @UML(identifier="instrument", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Instrument> getInstruments();
+
+    /**
+     * Identification of the area or object to be sensed.
+     *
+     * @return Area or object to be sensed.
+     */
+    @UML(identifier="objective", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Objective> getObjectives();
+
+    /**
+     * General information about an identifiable activity which provided the data.
+     *
+     * @return Identifiable activity which provided the data.
+     */
+    @UML(identifier="operation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Operation> getOperations();
+
+    /**
+     * General information about the platform from which the data were taken.
+     *
+     * @return Platform from which the data were taken.
+     */
+    @UML(identifier="platform", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Platform> getPlatforms();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/acquisition/AcquisitionInformation.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/quality/Usability.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/quality/Usability.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/quality/Usability.java	(révision 0)
@@ -0,0 +1,25 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.quality;
+
+import org.opengis.annotation.UML;
+
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Degree of adherence of a dataset to a specific set of user requirements.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="QE_Usability", specification=ISO_19115_2)
+public interface Usability extends Element {
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/quality/Usability.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/quality/CoverageResult.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/quality/CoverageResult.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/quality/CoverageResult.java	(révision 0)
@@ -0,0 +1,71 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.quality;
+
+import org.opengis.metadata.distribution.DataFile;
+import org.opengis.annotation.UML;
+import org.opengis.metadata.content.CoverageDescription;
+import org.opengis.metadata.distribution.Format;
+import org.opengis.metadata.spatial.SpatialRepresentation;
+import org.opengis.metadata.spatial.SpatialRepresentationType;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Result of a data quality measure organising the measured values as a coverage.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="QE_CoverageResult", specification=ISO_19115_2)
+public interface CoverageResult extends Result {
+    /**
+     * Method used to spatially represent the coverage result.
+     *
+     * @return Spatial representation of the coverage result.
+     */
+    @UML(identifier="spatialRepresentationType", obligation=MANDATORY, specification=ISO_19115_2)
+    SpatialRepresentationType getSpatialRepresentationType();
+
+    /**
+     * Provides the digital representation of data quality measures composing the coverage result.
+     *
+     * @return Digital representation of data quality measures composing the coverage result.
+     */
+    @UML(identifier="resultSpatialRepresentation", obligation=MANDATORY, specification=ISO_19115_2)
+    SpatialRepresentation getResultSpatialRepresentation();
+
+    /**
+     * Provides the description of the content of the result coverage, i.e. semantic definition
+     * of the data quality measures.
+     *
+     * @return Description of the content of the result coverage.
+     */
+    @UML(identifier="resultContentDescription", obligation=MANDATORY, specification=ISO_19115_2)
+    CoverageDescription getResultContentDescription();
+
+    /**
+     * Provides information about the format of the result coverage data.
+     *
+     * @return Format of the result coverage data.
+     */
+    @UML(identifier="resultFormat", obligation=MANDATORY, specification=ISO_19115_2)
+    Format getResultFormat();
+
+    /**
+     * Provides information about the data file containing the result coverage data.
+     *
+     * @return Data file containing the result coverage data.
+     */
+    @UML(identifier="resultFile", obligation=MANDATORY, specification=ISO_19139)
+    DataFile getResultFile();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/quality/CoverageResult.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/spatial/GCP.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/spatial/GCP.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/spatial/GCP.java	(révision 0)
@@ -0,0 +1,45 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.spatial;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.geometry.DirectPosition;
+import org.opengis.metadata.quality.Element;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Information on ground control point.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_GCP", specification=ISO_19115_2)
+public interface GCP {
+    /**
+     * Geographic or map position of the control point, in either two or three dimensions.
+     *
+     * @return Geographic or map position of the control point.
+     */
+    @UML(identifier="geographicCoordinates", obligation=MANDATORY, specification=ISO_19115_2)
+    DirectPosition getGeographicCoordinates();
+
+    /**
+     * Accuracy of a ground control point.
+     *
+     * @return Accuracy of a ground control point.
+     */
+    @UML(identifier="accuracyReport", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Element> getAccuracyReports();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/spatial/GCP.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/spatial/GeolocationInformation.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/spatial/GeolocationInformation.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/spatial/GeolocationInformation.java	(révision 0)
@@ -0,0 +1,36 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.spatial;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.metadata.quality.DataQuality;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Information used to determine geographic location corresponding to image location.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_GeolocationInformation", specification=ISO_19115_2)
+public interface GeolocationInformation {
+    /**
+     * Provides an overall assessment of quality of geolocation information.
+     *
+     * @return An overall assessment of quality of geolocation information.
+     */
+    @UML(identifier="qualityInfo", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends DataQuality> getQualityInfo();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/spatial/GeolocationInformation.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/spatial/Georeferenceable.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/spatial/Georeferenceable.java	(révision 1408)
+++ geoapi/src/main/java/org/opengis/metadata/spatial/Georeferenceable.java	(copie de travail)
@@ -73,4 +73,13 @@
      */
     @UML(identifier="parameterCitation", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends Citation> getParameterCitation();
+
+    /**
+     * Information that can be used to geolocate the data.
+     *
+     * @return A geolocalisation of the data.
+     */
+    @UML(identifier="geolocationInformation", obligation=MANDATORY, specification=ISO_19115_2)
+    Collection<? extends GeolocationInformation> getGeolocationInformation();
+
 }
Index: geoapi/src/main/java/org/opengis/metadata/spatial/GCPCollection.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/spatial/GCPCollection.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/spatial/GCPCollection.java	(révision 0)
@@ -0,0 +1,61 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.spatial;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.referencing.ReferenceSystem;
+import org.opengis.util.InternationalString;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Information about a control point collection.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_GCPCollection", specification=ISO_19115_2)
+public interface GCPCollection extends GeolocationInformation {
+    /**
+     * Identifier of the GCP collection.
+     *
+     * @return The identifier.
+     */
+    @UML(identifier="collectionIdentification", obligation=MANDATORY, specification=ISO_19115_2)
+    Integer getCollectionIdentification();
+
+    /**
+     * Name of the GCP collection.
+     *
+     * @return Name of the GCP collection.
+     */
+    @UML(identifier="collectionName", obligation=MANDATORY, specification=ISO_19115_2)
+    InternationalString getCollectionName();
+
+    /**
+     * Coordinate system in which the ground control points are defined.
+     *
+     * @return Coordinate system in which the ground control points are defined.
+     */
+    @UML(identifier="coordinateReferenceSystem", obligation=MANDATORY, specification=ISO_19115_2)
+    ReferenceSystem getCoordinateReferenceSystem();
+
+    /**
+     * Ground control point(s) used in the collection.
+     *
+     * @return Ground control point(s).
+     */
+    @UML(identifier="gcp", obligation=MANDATORY, specification=ISO_19115_2)
+    Collection<? extends GCP> getGCPs();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/spatial/GCPCollection.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/spatial/Georectified.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/spatial/Georectified.java	(révision 1408)
+++ geoapi/src/main/java/org/opengis/metadata/spatial/Georectified.java	(copie de travail)
@@ -94,4 +94,12 @@
      */
     @UML(identifier="transformationDimensionMapping", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends InternationalString> getTransformationDimensionMapping();
+
+    /**
+     * Geographic references used to validate georectification of the data.
+     *
+     * @return Geographic references used to validate georectification.
+     */
+    @UML(identifier="checkPoint", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends GCP> getCheckPoints();
 }
Index: geoapi/src/main/java/org/opengis/metadata/MetaData.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/MetaData.java	(révision 1408)
+++ geoapi/src/main/java/org/opengis/metadata/MetaData.java	(copie de travail)
@@ -13,6 +13,8 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.Locale;
+
+import org.opengis.metadata.acquisition.AcquisitionInformation;
 import org.opengis.metadata.quality.DataQuality;
 import org.opengis.metadata.maintenance.ScopeCode;
 import org.opengis.metadata.constraint.Constraints;
@@ -245,4 +247,12 @@
      */
     @UML(identifier="metadataMaintenance", obligation=OPTIONAL, specification=ISO_19115)
     MaintenanceInformation getMetadataMaintenance();
+
+    /**
+     * Provides information about the acquisition of the data.
+     *
+     * @return The acquisition of data.
+     */
+    @UML(identifier="acquisitionInformation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends AcquisitionInformation> getAcquisitionInformation();
 }
Index: geoapi/src/main/java/org/opengis/metadata/lineage/Source.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/lineage/Source.java	(révision 1408)
+++ geoapi/src/main/java/org/opengis/metadata/lineage/Source.java	(copie de travail)
@@ -17,6 +17,7 @@
 import org.opengis.referencing.ReferenceSystem;
 import org.opengis.util.InternationalString;
 import org.opengis.annotation.UML;
+import org.opengis.metadata.Identifier;
 
 import static org.opengis.annotation.Obligation.*;
 import static org.opengis.annotation.Specification.*;
@@ -79,4 +80,21 @@
      */
     @UML(identifier="sourceStep", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends ProcessStep> getSourceSteps();
+
+    /**
+     * Processing level of the source data.
+     *
+     * @return Processing level of the source data.
+     */
+    @UML(identifier="processedLevel", obligation=OPTIONAL, specification=ISO_19115_2)
+    Identifier getProcessedLevel();
+
+    /**
+     * Distance between consistent parts (centre, left side, right side) of two adjacent
+     * pixels.
+     *
+     * @return Distance between consistent parts of two adjacent pixels.
+     */
+    @UML(identifier="resolution", obligation=OPTIONAL, specification=ISO_19115_2)
+    NominalResolution getResolution();
 }
Index: geoapi/src/main/java/org/opengis/metadata/lineage/NominalResolution.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/lineage/NominalResolution.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/lineage/NominalResolution.java	(révision 0)
@@ -0,0 +1,47 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.lineage;
+
+import org.opengis.annotation.UML;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Distance between consistent parts of (centre, left side, right side) adjacent pixels.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="LE_NominalResolution", specification=ISO_19115_2)
+public interface NominalResolution {
+    /**
+     * Distance between consistent parts of (centre, left side, right side) adjacent pixels
+     * in the scan plane.
+     *
+     * @return Distance between consistent parts of adjacent pixels in the scan plane.
+     *
+     * @unitof Distance
+     */
+    @UML(identifier="scanningResolution", obligation=MANDATORY, specification=ISO_19115_2)
+    Double getScanningResolution();
+
+    /**
+     * Distance between consistent parts of (centre, left side, right side) adjacent pixels
+     * in the object space.
+     *
+     * @return Distance between consistent parts of adjacent pixels in the object space.
+     *
+     * @unitof Distance
+     */
+    @UML(identifier="groundResolution", obligation=MANDATORY, specification=ISO_19115_2)
+    Double getGroundResolution();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/lineage/NominalResolution.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/lineage/Algorithm.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/lineage/Algorithm.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/lineage/Algorithm.java	(révision 0)
@@ -0,0 +1,44 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.lineage;
+
+import org.opengis.annotation.UML;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.util.InternationalString;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Details of the methodology by which geographic information was derived from the instrument
+ * readings.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="LE_Algorithm", specification=ISO_19115_2)
+public interface Algorithm {
+    /**
+     * Information identifying the algorithm and version or date.
+     *
+     * @return Algorithm and version or date.
+     */
+    @UML(identifier="citation", obligation=MANDATORY, specification=ISO_19115_2)
+    Citation getCitation();
+
+    /**
+     * Information describing the algorithm used to generate the data.
+     *
+     * @return Algorithm used to generate the data.
+     */
+    @UML(identifier="description", obligation=MANDATORY, specification=ISO_19115_2)
+    InternationalString getDescription();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/lineage/Algorithm.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/lineage/ProcessStepReport.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/lineage/ProcessStepReport.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/lineage/ProcessStepReport.java	(révision 0)
@@ -0,0 +1,50 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.lineage;
+
+import org.opengis.annotation.UML;
+
+import org.opengis.util.InternationalString;
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Report of what occurred during the process step.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="LE_ProcessStepReport", specification=ISO_19115_2)
+public interface ProcessStepReport {
+    /**
+     * Name of the processing report.
+     *
+     * @return Name of the processing report.
+     */
+    @UML(identifier="name", obligation=MANDATORY, specification=ISO_19115_2)
+    InternationalString getName();
+
+    /**
+     * Textual description of what occurred during the process step.
+     *
+     * @return What occurred during the process step.
+     */
+    @UML(identifier="description", obligation=OPTIONAL, specification=ISO_19115_2)
+    InternationalString getDescription();
+
+    /**
+     * Type of file that contains the processing report.
+     *
+     * @return Type of file that contains the processing report.
+     */
+    @UML(identifier="fileType", obligation=OPTIONAL, specification=ISO_19115_2)
+    InternationalString getFileType();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/lineage/ProcessStepReport.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/lineage/ProcessStep.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/lineage/ProcessStep.java	(révision 1408)
+++ geoapi/src/main/java/org/opengis/metadata/lineage/ProcessStep.java	(copie de travail)
@@ -70,4 +70,31 @@
      */
     @UML(identifier="source", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends Source> getSources();
+
+    /**
+     * Description of the product generated as a result of the process step.
+     *
+     * @return Product generated as a result of the process step.
+     */
+    @UML(identifier="output", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Source> getOutputs();
+
+    /**
+     * Comprehensive information about the procedure by which the algorithm was applied
+     * to derive geographic data from the raw instrument measurements, such as datasets,
+     * software used, and the processing environment.
+     *
+     * @return Procedure by which the algorithm was applied to derive geographic data
+     *         from the raw instrument measurements
+     */
+    @UML(identifier="processingInformation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Processing getProcessingInformation();
+
+    /**
+     * Report generated by the process step.
+     *
+     * @return Report generated by the process step.
+     */
+    @UML(identifier="report", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends ProcessStepReport> getReports();
 }
Index: geoapi/src/main/java/org/opengis/metadata/lineage/Processing.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/lineage/Processing.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/lineage/Processing.java	(révision 0)
@@ -0,0 +1,81 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.lineage;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.metadata.Identifier;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.util.InternationalString;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Comprehensive information about the procedure(s), process(es) and algorithm(s) applied
+ * in the process step.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="LE_Processing", specification=ISO_19115_2)
+public interface Processing {
+    /**
+     * Information to identify the processing package that produced the data.
+     *
+     * @return Identifier of the processing package that produced the data.
+     */
+    @UML(identifier="identifier", obligation=MANDATORY, specification=ISO_19115_2)
+    Identifier getIdentifier();
+
+    /**
+     * Reference to document describing processing software.
+     *
+     * @return Document describing processing software.
+     */
+    @UML(identifier="softwareReference", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Citation> getSoftwareReferences();
+
+    /**
+     * Additional details about the processing procedures.
+     *
+     * @return Processing procedures.
+     */
+    @UML(identifier="procedureDescription", obligation=OPTIONAL, specification=ISO_19115_2)
+    InternationalString getProcedureDescription();
+
+    /**
+     * Reference to documentation describing the processing.
+     *
+     * @return Documentation describing the processing.
+     */
+    @UML(identifier="documentation", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Citation> getDocumentations();
+
+    /**
+     * Parameters to control the processing operations, entered at run time.
+     *
+     * @return Parameters to control the processing operations.
+     */
+    @UML(identifier="runTimeParameter", obligation=OPTIONAL, specification=ISO_19115_2)
+    InternationalString getRunTimeParameter();
+
+    /**
+     * Details of the methodology by which geographic information was derived from the
+     * instrument readings.
+     *
+     * @return Methodology by which geographic information was derived from the
+     * instrument readings.
+     */
+    @UML(identifier="algorithm", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends Algorithm> getAlgorithms();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/lineage/Processing.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/content/CoverageDescription.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/content/CoverageDescription.java	(révision 1408)
+++ geoapi/src/main/java/org/opengis/metadata/content/CoverageDescription.java	(copie de travail)
@@ -53,4 +53,12 @@
      */
     @UML(identifier="dimension", obligation=OPTIONAL, specification=ISO_19115)
     Collection<? extends RangeDimension> getDimensions();
+
+    /**
+     * Provides the description of the specific range elements of a coverage.
+     *
+     * @return Description of the specific range elements.
+     */
+    @UML(identifier="rangeElementDescription", obligation=OPTIONAL, specification=ISO_19115_2)
+    Collection<? extends RangeElementDescription> getRangeElementDescriptions();
 }
Index: geoapi/src/main/java/org/opengis/metadata/content/Band.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/content/Band.java	(révision 1408)
+++ geoapi/src/main/java/org/opengis/metadata/content/Band.java	(copie de travail)
@@ -103,4 +103,47 @@
      */
     @UML(identifier="offset", obligation=OPTIONAL, specification=ISO_19115)
     Double getOffset();
+
+    /**
+     * Designation of criterion for defining maximum and minimum wavelengths for a spectral band.
+     *
+     * @return Criterion for defining maximum and minimum wavelengths.
+     */
+    @UML(identifier="bandBoundaryDefinition", obligation=OPTIONAL, specification=ISO_19115_2)
+    BandDefinition getBandBoundaryDefinition();
+
+    /**
+     * Smallest distance between which separate points can be distinguished, as specified in
+     * instrument design.
+     *
+     * @return Smallest distance between which separate points can be distinguished.
+     *
+     * @unitOf Distance
+     */
+    @UML(identifier="nominalSpatialResolution", obligation=OPTIONAL, specification=ISO_19115_2)
+    Double getNominalSpatialResolution();
+
+    /**
+     * Type of transfer function to be used when scaling a physical value for a given element.
+     *
+     * @return Type of transfer function.
+     */
+    @UML(identifier="transferFunctionType", obligation=OPTIONAL, specification=ISO_19115_2)
+    TransferFunctionType getTransferFunctionType();
+
+    /**
+     * Polarization of the radiation transmitted.
+     *
+     * @return Polarization of the radiation transmitted.
+     */
+    @UML(identifier="transmittedPolarization", obligation=OPTIONAL, specification=ISO_19115_2)
+    PolarizationOrientation getTransmittedPolarization();
+
+    /**
+     * Polarization of the radiation detected.
+     *
+     * @return Polarization of the radiation detected.
+     */
+    @UML(identifier="detectedPolarization", obligation=OPTIONAL, specification=ISO_19115_2)
+    PolarizationOrientation getDetectedPolarization();
 }
Index: geoapi/src/main/java/org/opengis/metadata/content/PolarizationOrientation.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/content/PolarizationOrientation.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/content/PolarizationOrientation.java	(révision 0)
@@ -0,0 +1,115 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.content;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Polarization of the antenna relative to the waveform.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_PolarizationOrientationCode", specification=ISO_19115_2)
+public final class PolarizationOrientation extends CodeList<PolarizationOrientation> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = -8653877364510456891L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<PolarizationOrientation> VALUES = new ArrayList<PolarizationOrientation>(6);
+
+    /**
+     * Polarization of the sensor oriented in the horizontal plane in relation to swath direction.
+     */
+    @UML(identifier="horizontal", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final PolarizationOrientation HORIZONTAL = new PolarizationOrientation("HORIZONTAL");
+
+    /**
+     * Polarization of the sensor oriented in the vertical plane in relation to swath direction.
+     */
+    @UML(identifier="vertical", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final PolarizationOrientation VERTICAL = new PolarizationOrientation("VERTICAL");
+
+    /**
+     * Polarization of the sensor oriented in the left circular plane in relation to swath direction.
+     */
+    @UML(identifier="leftCircular", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final PolarizationOrientation LEFT_CIRCULAR = new PolarizationOrientation("LEFT_CIRCULAR");
+
+    /**
+     * Polarization of the sensor oriented in the right circular plane in relation to swath direction.
+     */
+    @UML(identifier="rightCircular", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final PolarizationOrientation RIGHT_CIRCULAR = new PolarizationOrientation("RIGHT_CIRCULAR");
+
+    /**
+     * Polarization of the sensor oriented in the angle between +90 ° and 0 ° parallel to swath direction.
+     */
+    @UML(identifier="theta", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final PolarizationOrientation THETA = new PolarizationOrientation("THETA");
+
+    /**
+     * Polarization of the sensor oriented in the +90 ° and 0 ° perpendicular to swath direction.
+     */
+    @UML(identifier="phi", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final PolarizationOrientation PHI = new PolarizationOrientation("PHI");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private PolarizationOrientation(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code PolarizationOrientation}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static PolarizationOrientation[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new PolarizationOrientation[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public PolarizationOrientation[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the transfer function type that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static PolarizationOrientation valueOf(String code) {
+        return valueOf(PolarizationOrientation.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/content/PolarizationOrientation.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/content/RangeElementDescription.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/content/RangeElementDescription.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/content/RangeElementDescription.java	(révision 0)
@@ -0,0 +1,53 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.content;
+
+import java.util.Collection;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.InternationalString;
+import org.opengis.util.Record;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Description of specific range elements.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_RangeElementDescription", specification=ISO_19115_2)
+public interface RangeElementDescription {
+    /**
+     * Designation associated with a set of range elements.
+     *
+     * @return Designation associated with a set of range elements.
+     */
+    @UML(identifier="name", obligation=MANDATORY, specification=ISO_19115_2)
+    InternationalString getName();
+
+    /**
+     * Description of a set of specific range elements.
+     *
+     * @return Description of a set of specific range elements.
+     */
+    @UML(identifier="definition", obligation=MANDATORY, specification=ISO_19115_2)
+    InternationalString getDefinition();
+
+    /**
+     * Specific range elements, i.e. range elements associated with a name and their definition.
+     *
+     * @return Specific range elements.
+     */
+    @UML(identifier="rangeElement", obligation=MANDATORY, specification=ISO_19115_2)
+    Collection<? extends Record> getRangeElements();
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/content/RangeElementDescription.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/content/TransferFunctionType.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/content/TransferFunctionType.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/content/TransferFunctionType.java	(révision 0)
@@ -0,0 +1,97 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.content;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Transform function to be used when scaling a physical value for a given element.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_TransferFunctionTypeCode", specification=ISO_19115_2)
+public final class TransferFunctionType extends CodeList<TransferFunctionType> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = -8238532116096874717L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<TransferFunctionType> VALUES = new ArrayList<TransferFunctionType>(3);
+
+    /**
+     * Function used for transformation is first order polynomial.
+     */
+    @UML(identifier="linear", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final TransferFunctionType LINEAR = new TransferFunctionType("LINEAR");
+
+    /**
+     * Function used for transformation is logarithmic
+     */
+    @UML(identifier="logarithmic", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final TransferFunctionType LOGARITHMIC = new TransferFunctionType("LOGARITHMIC");
+
+    /**
+     * Function used for transformation is exponential.
+     */
+    @UML(identifier="exponential", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final TransferFunctionType EXPONENTIAL = new TransferFunctionType("EXPONENTIAL");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private TransferFunctionType(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code TransferFunctionType}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static TransferFunctionType[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new TransferFunctionType[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public TransferFunctionType[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the transfer function type that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static TransferFunctionType valueOf(String code) {
+        return valueOf(TransferFunctionType.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/content/TransferFunctionType.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/metadata/content/BandDefinition.java
===================================================================
--- geoapi/src/main/java/org/opengis/metadata/content/BandDefinition.java	(révision 0)
+++ geoapi/src/main/java/org/opengis/metadata/content/BandDefinition.java	(révision 0)
@@ -0,0 +1,117 @@
+/*$************************************************************************************************
+ **
+ ** $Id$
+ **
+ ** $URL$
+ **
+ ** Copyright (C) 2004-2005 Open GIS Consortium, Inc.
+ ** All Rights Reserved. http://www.opengis.org/legal/
+ **
+ *************************************************************************************************/
+package org.opengis.metadata.content;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.opengis.annotation.UML;
+import org.opengis.util.CodeList;
+
+import static org.opengis.annotation.Obligation.*;
+import static org.opengis.annotation.Specification.*;
+
+
+/**
+ * Designation of criterion for defining maximum and minimum wavelengths for a spectral band.
+ *
+ * @author Cédric Briançon (Geomatys)
+ */
+@UML(identifier="MI_BandDefinition", specification=ISO_19115_2)
+public final class BandDefinition extends CodeList<BandDefinition> {
+    /**
+     * Serial number for compatibility with different versions.
+     */
+    private static final long serialVersionUID = -6673852201803408346L;
+
+    /**
+     * List of all enumerations of this type.
+     * Must be declared before any enum declaration.
+     */
+    private static final List<BandDefinition> VALUES = new ArrayList<BandDefinition>(5);
+
+    /**
+     * Width of a distribution equal to the distance between the outer two points on the
+     * distribution having power level half of that at the peak.
+     *
+     * @todo the same as the documentation for {@link #HALF_MAXIMUM}.
+     */
+    @UML(identifier="3dB", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final BandDefinition THREE_DB = new BandDefinition("THREE_DB");
+
+    /**
+     * Width of a distribution equal to the distance between the outer two points on the
+     * distribution having power level half of that at the peak.
+     *
+     * @todo the same as the documentation for {@link #THREE_DB}.
+     */
+    @UML(identifier="halfMaximum", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final BandDefinition HALF_MAXIMUM = new BandDefinition("HALF_MAXIMUM");
+
+    /**
+     * Full spectral width of a spectral power density measured at 50% of its peak height.
+     */
+    @UML(identifier="fiftyPercent", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final BandDefinition FIFTY_PERCENT = new BandDefinition("FIFTY_PERCENT");
+
+    /**
+     * Width of a distribution equal to the distance between the outer two points on the
+     * distribution having power level 1/e that of the peak.
+     */
+    @UML(identifier="oneOverE", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final BandDefinition ONE_OVER_E = new BandDefinition("ONE_OVER_E");
+
+    /**
+     * Width of a band with full sensitivity or absorption at every wavelength that detects
+     * or absorbs the same amount of energy as the band described.
+     */
+    @UML(identifier="equivalentWidth", obligation=CONDITIONAL, specification=ISO_19115_2)
+    public static final BandDefinition EQUIVALENT_WIDTH = new BandDefinition("EQUIVALENT_WIDTH");
+
+    /**
+     * Constructs an enum with the given name. The new enum is
+     * automatically added to the list returned by {@link #values}.
+     *
+     * @param name The enum name. This name must not be in use by an other enum of this type.
+     */
+    private BandDefinition(final String name) {
+        super(name, VALUES);
+    }
+
+    /**
+     * Returns the list of {@code BandDefinition}s.
+     *
+     * @return The list of codes declared in the current JVM.
+     */
+    public static BandDefinition[] values() {
+        synchronized (VALUES) {
+            return VALUES.toArray(new BandDefinition[VALUES.size()]);
+        }
+    }
+
+    /**
+     * Returns the list of enumerations of the same kind than this enum.
+     */
+    public BandDefinition[] family() {
+        return values();
+    }
+
+    /**
+     * Returns the band definition that matches the given string, or returns a
+     * new one if none match it.
+     *
+     * @param code The name of the code to fetch or to create.
+     * @return A code matching the given name.
+     */
+    public static BandDefinition valueOf(String code) {
+        return valueOf(BandDefinition.class, code);
+    }
+}

Modification de propriétés sur geoapi/src/main/java/org/opengis/metadata/content/BandDefinition.java
___________________________________________________________________
Ajouté : svn:mime-type
   + text/plain
Ajouté : svn:keywords
   + Id URL
Ajouté : svn:eol-style
   + native

Index: geoapi/src/main/java/org/opengis/annotation/Specification.java
===================================================================
--- geoapi/src/main/java/org/opengis/annotation/Specification.java	(révision 1408)
+++ geoapi/src/main/java/org/opengis/annotation/Specification.java	(copie de travail)
@@ -56,6 +56,14 @@
     ISO_19115,
 
     /**
+     * ISO 19115-2, Metadata part 2: extensions for imagery and gridded data.
+     * This is the specification for package {@link org.opengis.metadata} and sub-packages.
+     *
+     * @todo add a link to the standard.
+     */
+    ISO_19115_2,
+
+    /**
      * ISO 19117, Portrayal.
      * This is an abstract specification for portraying features.
      *
@@ -80,6 +88,14 @@
     ISO_19128,
 
     /**
+     * ISO 19139, Metadata. XML schema implementation.
+     * This is the specification for package {@link org.opengis.metadata} and sub-packages.
+     *
+     * @todo add a link to the standard.
+     */
+    ISO_19139,
+
+    /**
      * GO-1 Application Objects.
      * This is the specification for package {@link org.opengis.go} and sub-packages.
      *

