Author: desruisseaux
Date: Sun Feb 18 21:54:39 2018
New Revision: 1824710
URL: http://svn.apache.org/viewvc?rev=1824710&view=rev
Log:
Change the format of ImportNames so that the behavior of the "<type>"
pseudo-property is the default.
Add missing information in those files for allowing DefaultLineageTest to pass.
Modified:
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespaceContent.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Transformer.java
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ExportNames.lst
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ImportNames.lst
Modified:
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java?rev=1824710&r1=1824709&r2=1824710&view=diff
==============================================================================
---
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
[UTF-8] (original)
+++
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
[UTF-8] Sun Feb 18 21:54:39 2018
@@ -16,13 +16,14 @@
*/
package org.apache.sis.metadata.iso.lineage;
-import java.util.Arrays;
import javax.xml.bind.JAXBException;
+import org.opengis.metadata.lineage.Source;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.internal.jaxb.LegacyNamespaces;
import org.apache.sis.util.iso.SimpleInternationalString;
import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.XMLTestCase;
import org.junit.Test;
@@ -48,7 +49,7 @@ public final strictfp class DefaultLinea
final DefaultLineage lineage = new DefaultLineage();
final DefaultSource source = new DefaultSource();
source.setDescription(new SimpleInternationalString("Description of
source data level."));
- lineage.setSources(Arrays.asList(source));
+ lineage.getSources().add(source);
if (extension) {
source.setProcessedLevel(new DefaultIdentifier("DummyLevel"));
}
@@ -56,6 +57,14 @@ public final strictfp class DefaultLinea
}
/**
+ * Verifies the unmarshalling result.
+ */
+ private static void verify(final DefaultLineage lineage) {
+ final Source source = TestUtilities.getSingleton(lineage.getSources());
+ assertEquals("source.description", "Description of source data
level.", String.valueOf(source.getDescription()));
+ }
+
+ /**
* Tests the marshalling of a {@code "mrl:LI_Source"} element.
* If this case, the test uses only ISO 19115-1 elements (no ISO 19115-2).
* Consequently the XML name shall be {@code "mrl:LI_Source"}.
@@ -76,6 +85,8 @@ public final strictfp class DefaultLinea
" </mrl:LI_Source>\n" +
" </mrl:source>\n" +
"</mrl:LI_Lineage>", actual, "xmlns:*");
+
+ verify(unmarshal(DefaultLineage.class, actual));
}
/**
@@ -100,6 +111,8 @@ public final strictfp class DefaultLinea
" </gmd:LI_Source>\n" +
" </gmd:source>\n" +
"</gmd:LI_Lineage>", actual, "xmlns:*");
+
+ verify(unmarshal(DefaultLineage.class, actual));
}
/**
@@ -133,6 +146,8 @@ public final strictfp class DefaultLinea
" </mrl:LE_Source>\n" +
" </mrl:source>\n" +
"</mrl:LI_Lineage>", actual, "xmlns:*");
+
+ verify(unmarshal(DefaultLineage.class, actual));
}
/**
@@ -166,5 +181,7 @@ public final strictfp class DefaultLinea
" </gmi:LE_Source>\n" +
" </gmd:source>\n" +
"</gmd:LI_Lineage>", actual, "xmlns:*");
+
+ verify(unmarshal(DefaultLineage.class, actual));
}
}
Modified:
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespaceContent.java
URL:
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespaceContent.java?rev=1824710&r1=1824709&r2=1824710&view=diff
==============================================================================
---
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespaceContent.java
[UTF-8] (original)
+++
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/xml/NamespaceContent.java
[UTF-8] Sun Feb 18 21:54:39 2018
@@ -128,7 +128,7 @@ public final class NamespaceContent {
*
* http://a.namespace
* PX_AClass
- * <type>
+ * …
*
* Then list all properties below "PX_AClass". Note that the
namespace may change because properties
* may be declared in different namespaces, but the class name
stay the same. If the same properties
@@ -136,7 +136,6 @@ public final class NamespaceContent {
*/
final String topLevelTypeName = root.name();
String classNS = namespace(classe, root.namespace());
- add(classNS, topLevelTypeName, Transformer.TYPE_KEY);
for (;; classNS = namespace(classe, root.namespace())) {
for (final Method method : classe.getDeclaredMethods()) {
if (!method.isBridge()) {
@@ -169,9 +168,6 @@ public final class NamespaceContent {
singleton = xe;
}
}
- if (singleton != null) {
- add(namespace(classe, singleton.namespace()),
singleton.name(), Transformer.TYPE_KEY);
- }
}
}
Modified:
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Transformer.java
URL:
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Transformer.java?rev=1824710&r1=1824709&r2=1824710&view=diff
==============================================================================
---
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Transformer.java
[UTF-8] (original)
+++
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Transformer.java
[UTF-8] Sun Feb 18 21:54:39 2018
@@ -96,23 +96,22 @@ abstract class Transformer {
private static final char RENAME_SEPARATOR = '/';
/**
- * A sentinel value in files loaded by {@link #load(String, int)} meaning
that the identifier stands for the type
- * name instead than for a property name. This sentinel value is used in
{@value TransformingReader#FILENAME} and
- * {@value TransformingWriter#FILENAME} resource files. For example in the
following:
+ * A flag after type name in files loaded by {@link #load(String, int)},
meaning that the type itself
+ * is in a different namespace than the properties listed below the type.
For example in the following:
*
* {@preformat text
- * http://standards.iso.org/iso/19115/-3/cit/1.0
- * CI_Citation
- * <type>
- * title
- * alternateTitle
+ * http://standards.iso.org/iso/19115/-3/mri/1.0
+ * SV_ServiceIdentification !other namespace
+ * citation
+ * abstract
* }
*
- * The {@code <type>} sentinel value is substituted by {@code
CI_Citation}, which means that the {@code Citation}
- * class itself is in the {@code cit} namespace. This needs to be
specified explicitely because the properties in
- * a class are not necessarily in the same namespace than the enclosing
class.
+ * {@code SV_ServiceIdentification} type is defined in the {@code
"http://standards.iso.org/iso/19115/-3/srv/2.0"}
+ * namespace, but the {@code citation} and {@code abstract} properties
inherited from {@code Identification} are
+ * defined in the {@code http://standards.iso.org/iso/19115/-3/mri/1.0}
namespace. If the {@value} flag is not
+ * present, then the type is assumed in the same namespace than the
properties (this is the most common case).
*/
- static final String TYPE_KEY = "<type>";
+ static final char NO_NAMESPACE = '!';
/**
* The external XML format version to (un)marshal from.
@@ -220,7 +219,6 @@ abstract class Transformer {
{
Map<String,String> attributes = null; // All
attributes for a given type.
String namespace = null; // Value to
store in 'attributes' map.
- String type = null; // Class or
code list containing attributes.
String line;
while ((line = in.readLine()) != null) {
final int length = line.length();
@@ -232,12 +230,20 @@ abstract class Transformer {
if (!isNamespace(element)) break;
// Report illegal format.
namespace = element.intern();
attributes = null;
- type = null;
continue;
}
case 1: {
// New type in above namespace URI.
- type = element.intern();
- attributes = m.computeIfAbsent(type, (k) -> new
HashMap<>());
+ if (namespace == null) break;
// Report illegal format.
+ final int s = element.indexOf(NO_NAMESPACE);
+ if (s >= 0) {
+ element = element.substring(0, s).trim();
+ }
+ element = element.intern();
+ attributes = m.computeIfAbsent(element, (k) -> new
HashMap<>());
+ if (s < 0) {
+ // Record namespace for this type only if '!'
is not present.
+ if (attributes.put(element, namespace) !=
null) break;
+ }
continue;
}
case 2: {
// New attribute in above type.
@@ -246,15 +252,15 @@ abstract class Transformer {
if (s >= 0) {
final String old = element.substring(0,
s).trim().intern();
element =
element.substring(s+1).trim().intern();
- attributes.put(old, element);
+ if (attributes.put(old, element) != null)
break; // Report an error if duplicated values.
} else {
- element = element.equals(TYPE_KEY) ? type :
element.intern();
+ element = element.intern();
}
- attributes.put(element, namespace);
+ if (attributes.put(element, namespace) != null)
break; // Report an error if duplicated values.
continue;
}
}
- throw new InvalidPropertiesFormatException(Errors.format(
// See FILE javadoc.
+ throw new InvalidPropertiesFormatException(Errors.format(
// See method javadoc.
Errors.Keys.ErrorInFileAtLine_2, filename,
in.getLineNumber()));
}
}
Modified:
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ExportNames.lst
URL:
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ExportNames.lst?rev=1824710&r1=1824709&r2=1824710&view=diff
==============================================================================
---
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ExportNames.lst
[UTF-8] (original)
+++
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ExportNames.lst
[UTF-8] Sun Feb 18 21:54:39 2018
@@ -7,6 +7,8 @@
http://www.isotc211.org/2005/gmd
MD_Georectified
centrePoint/centerPoint
+ MI_Georectified !other namespace
+ centrePoint/centerPoint
DQ_QuantitativeResult
valueRecordType/valueType
http://www.isotc211.org/2005/srv
@@ -99,22 +101,23 @@ http://standards.iso.org/iso/19115/-2/gm
maxAltitude
meterologicalConditions
MI_OperationTypeCode
- MI_Band|MD_Band
+ MI_Band
bandBoundaryDefinition
nominalSpatialResolution
transferFunctionType
transmittedPolarisation
detectedPolarisation
- MI_CoverageDescription|MD_CoverageDescription
+ MI_CoverageDescription
rangeElementDescription
- MI_ImageDescription|MD_ImageDescription
+ MI_ImageDescription
rangeElementDescription
MI_RangeElementDescription
name
definition
rangeElement
MI_BandDefinition
- MI_PolarisationOrientationCode
+ MI_PolarisationOrientationCode !renamed
+ MI_PolarisationOrientationCode/MI_PolarizationOrientationCode
MI_TransferFunctionTypeCode
LE_Algorithm
citation
@@ -126,10 +129,10 @@ http://standards.iso.org/iso/19115/-2/gm
documentation
runTimeParameters
algorithm
- LE_Source|LI_Source
+ LE_Source
processedLevel
resolution
- LE_ProcessStep|LI_ProcessStep
+ LE_ProcessStep
processingInformation
output
report
@@ -147,11 +150,11 @@ http://standards.iso.org/iso/19115/-2/gm
LE_NominalResolution
scanningResolution
groundResolution
- MI_Metadata|MD_Metadata
+ MI_Metadata
acquisitionInformation
- MI_Georeferenceable|MD_Georeferenceable
+ MI_Georeferenceable
geolocationInformation
- MI_Georectified|MD_Georectified
+ MI_Georectified
checkPoint
MI_GCP
geographicCoordinates
Modified:
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ImportNames.lst
URL:
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ImportNames.lst?rev=1824710&r1=1824709&r2=1824710&view=diff
==============================================================================
---
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ImportNames.lst
[UTF-8] (original)
+++
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/ImportNames.lst
[UTF-8] Sun Feb 18 21:54:39 2018
@@ -7,11 +7,9 @@
#
http://standards.iso.org/iso/19115/-3/cit/1.0
AbstractCI_Party
- <type>
contactInfo
name
CI_Address
- <type>
administrativeArea
city
country
@@ -19,7 +17,6 @@ http://standards.iso.org/iso/19115/-3/ci
electronicMailAddress
postalCode
CI_Citation
- <type>
ISBN
ISSN
alternateTitle
@@ -35,7 +32,6 @@ http://standards.iso.org/iso/19115/-3/ci
series
title
CI_Contact
- <type>
address
contactInstructions
contactType
@@ -43,20 +39,15 @@ http://standards.iso.org/iso/19115/-3/ci
onlineResource
phone
CI_Date
- <type>
date
dateType
CI_DateTypeCode
- <type>
CI_Individual
- <type>
contactInfo
name
positionName
CI_OnLineFunctionCode
- <type>
CI_OnlineResource
- <type>
applicationProfile
description
function
@@ -65,118 +56,82 @@ http://standards.iso.org/iso/19115/-3/ci
protocol
protocolRequest
CI_Organisation
- <type>
contactInfo
individual
logo
name
CI_PresentationFormCode
- <type>
CI_Responsibility
- <type>
extent
party
role
- CI_ResponsibleParty
+ CI_ResponsibleParty !other namespace
extent
party
role
CI_RoleCode
- <type>
CI_Series
- <type>
issueIdentification
name
page
CI_Telephone
- <type>
number
numberType
CI_TelephoneTypeCode
- <type>
http://standards.iso.org/iso/19115/-3/gco/1.0
Boolean
- <type>
CharacterString
- <type>
Date
- <type>
DateTime
- <type>
Decimal
- <type>
Distance
- <type>
Integer
- <type>
LocalName
- <type>
Measure
- <type>
Real
- <type>
Record
- <type>
RecordType
- <type>
ScopedName
- <type>
http://standards.iso.org/iso/19115/-3/gcx/1.0
Anchor
- <type>
FileName
- <type>
MimeFileType
- <type>
http://standards.iso.org/iso/19115/-3/gex/1.0
AbstractEX_GeographicExtent
- <type>
extentTypeCode
EX_BoundingPolygon
- <type>
extentTypeCode
polygon
EX_Extent
- <type>
description
geographicElement
temporalElement
verticalElement
EX_GeographicBoundingBox
- <type>
eastBoundLongitude
extentTypeCode
northBoundLatitude
southBoundLatitude
westBoundLongitude
EX_GeographicDescription
- <type>
extentTypeCode
geographicIdentifier
EX_SpatialTemporalExtent
- <type>
extent
spatialExtent
verticalExtent
EX_TemporalExtent
- <type>
extent
EX_VerticalExtent
- <type>
maximumValue
minimumValue
verticalCRS
http://standards.iso.org/iso/19115/-3/lan/1.0
CountryCode
- <type>
LanguageCode
- <type>
LocalisedCharacterString
- <type>
MD_CharacterSetCode
- <type>
PT_Locale
- <type>
characterEncoding
country
language
@@ -184,7 +139,6 @@ http://standards.iso.org/iso/19115/-3/la
<type>
http://standards.iso.org/iso/19115/-3/mac/1.0
MI_AcquisitionInformation
- <type>
acquisitionPlan
acquisitionRequirement
environmentalConditions
@@ -193,15 +147,12 @@ http://standards.iso.org/iso/19115/-3/ma
operation
platform
MI_ContextCode
- <type>
MI_EnvironmentalRecord
- <type>
averageAirTemperature
maxAltitude
maxRelativeHumidity
meterologicalConditions
MI_Event
- <type>
context
expectedObjective
identifier
@@ -211,16 +162,13 @@ http://standards.iso.org/iso/19115/-3/ma
time
trigger
MI_GeometryTypeCode
- <type>
MI_Instrument
- <type>
citation
description
identifier
mountedOn
type
MI_Objective
- <type>
extent
function
identifier
@@ -230,9 +178,7 @@ http://standards.iso.org/iso/19115/-3/ma
sensingInstrument
type
MI_ObjectiveTypeCode
- <type>
MI_Operation
- <type>
childOperation
citation
description
@@ -245,34 +191,27 @@ http://standards.iso.org/iso/19115/-3/ma
status
type
MI_OperationTypeCode
- <type>
MI_Plan
- <type>
citation
operation
satisfiedRequirement
status
type
MI_Platform
- <type>
citation
description
identifier
instrument
sponsor
MI_PlatformPass
- <type>
extent
identifier
relatedEvent
MI_PriorityCode
- <type>
MI_RequestedDate
- <type>
latestAcceptableDate
requestedDateOfCollection
MI_Requirement
- <type>
citation
expiryDate
identifier
@@ -282,12 +221,9 @@ http://standards.iso.org/iso/19115/-3/ma
requestor
satisifiedPlan
MI_SequenceCode
- <type>
MI_TriggerCode
- <type>
http://standards.iso.org/iso/19115/-3/mas/1.0
MD_ApplicationSchemaInformation
- <type>
constraintLanguage
graphicsFile
name
@@ -297,30 +233,24 @@ http://standards.iso.org/iso/19115/-3/ma
softwareDevelopmentFileFormat
http://standards.iso.org/iso/19115/-3/mcc/1.0
MD_BrowseGraphic
- <type>
fileDescription
fileName
fileType
imageConstraints
linkage
MD_Identifier
- <type>
authority
code
codeSpace
description
version
MD_ProgressCode
- <type>
MD_Scope
- <type>
extent
level
levelDescription
MD_ScopeCode
- <type>
MD_ScopeDescription
- <type>
attributeInstances
attributes
dataset
@@ -328,12 +258,9 @@ http://standards.iso.org/iso/19115/-3/mc
features
other
MD_SpatialRepresentationTypeCode
- <type>
http://standards.iso.org/iso/19115/-3/mco/1.0
MD_ClassificationCode
- <type>
MD_Constraints
- <type>
constraintApplicationScope
graphic
reference
@@ -341,7 +268,6 @@ http://standards.iso.org/iso/19115/-3/mc
responsibleParty
useLimitation
MD_LegalConstraints
- <type>
accessConstraints
constraintApplicationScope
graphic
@@ -352,14 +278,11 @@ http://standards.iso.org/iso/19115/-3/mc
useConstraints
useLimitation
MD_Releasability
- <type>
addressee
disseminationConstraints
statement
MD_RestrictionCode
- <type>
MD_SecurityConstraints
- <type>
classification
classificationSystem
constraintApplicationScope
@@ -372,7 +295,6 @@ http://standards.iso.org/iso/19115/-3/mc
userNote
http://standards.iso.org/iso/19115/-3/mdb/1.0
MD_Metadata
- <type>
acquisitionInformation
alternativeMetadataReference
applicationSchemaInfo
@@ -398,10 +320,9 @@ http://standards.iso.org/iso/19115/-3/md
resourceLineage
spatialRepresentationInfo
MD_MetadataScope
- <type>
name
resourceScope
- MI_Metadata
+ MI_Metadata !other namespace
acquisitionInformation
alternativeMetadataReference
applicationSchemaInfo
@@ -428,16 +349,13 @@ http://standards.iso.org/iso/19115/-3/md
spatialRepresentationInfo
http://standards.iso.org/iso/19115/-3/mdt/1.0
MX_DataFile
- <type>
featureTypes
fileDescription
fileName
fileType
http://standards.iso.org/iso/19115/-3/mex/1.0
MD_DatatypeCode
- <type>
MD_ExtendedElementInformation
- <type>
condition
dataType
definition
@@ -450,14 +368,11 @@ http://standards.iso.org/iso/19115/-3/me
rule
source
MD_MetadataExtensionInformation
- <type>
extendedElementInformation
extensionOnLineResource
http://standards.iso.org/iso/19115/-3/mmi/1.0
MD_MaintenanceFrequencyCode
- <type>
MD_MaintenanceInformation
- <type>
contact
maintenanceAndUpdateFrequency
maintenanceDate
@@ -466,17 +381,13 @@ http://standards.iso.org/iso/19115/-3/mm
userDefinedMaintenanceFrequency
http://standards.iso.org/iso/19115/-3/mpc/1.0
MD_PortrayalCatalogueReference
- <type>
portrayalCatalogueCitation
http://standards.iso.org/iso/19115/-3/mrc/1.0
AbstractMD_ContentInformation
- <type>
MD_AttributeGroup
- <type>
attribute
contentType
MD_Band
- <type>
bandBoundaryDefinition
bitsPerValue
boundMax
@@ -502,26 +413,21 @@ http://standards.iso.org/iso/19115/-3/mr
transmittedPolarisation
units
MD_CoverageContentTypeCode
- <type>
MD_CoverageDescription
- <type>
attributeDescription
attributeGroup
processingLevelCode
rangeElementDescription
MD_FeatureCatalogueDescription
- <type>
complianceCode
featureCatalogueCitation
featureTypes
includedWithDataset
locale
MD_FeatureTypeInfo
- <type>
featureInstanceCount
featureTypeName
MD_ImageDescription
- <type>
attributeDescription
attributeGroup
cameraCalibrationInformationAvailability
@@ -538,14 +444,11 @@ http://standards.iso.org/iso/19115/-3/mr
rangeElementDescription
triangulationIndicator
MD_ImagingConditionCode
- <type>
MD_RangeDimension
- <type>
description
name
sequenceIdentifier
MD_SampleDimension
- <type>
bitsPerValue
description
maxValue
@@ -586,7 +489,6 @@ http://standards.iso.org/iso/19115/-3/mr
transmittedPolarisation
units
MI_BandDefinition
- <type>
MI_CoverageDescription
attributeDescription
attributeGroup
@@ -609,15 +511,12 @@ http://standards.iso.org/iso/19115/-3/mr
rangeElementDescription
triangulationIndicator
MI_RangeElementDescription
- <type>
definition
name
rangeElement
MI_TransferFunctionTypeCode
- <type>
http://standards.iso.org/iso/19115/-3/mrd/1.0
MD_DigitalTransferOptions
- <type>
distributionFormat
offLine
onLine
@@ -625,26 +524,22 @@ http://standards.iso.org/iso/19115/-3/mr
transferSize
unitsOfDistribution
MD_Distribution
- <type>
description
distributionFormat
distributor
transferOptions
MD_Distributor
- <type>
distributionOrderProcess
distributorContact
distributorFormat
distributorTransferOptions
MD_Format
- <type>
amendmentNumber
fileDecompressionTechnique
formatDistributor
formatSpecificationCitation
medium
MD_Medium
- <type>
density
densityUnits
identifier
@@ -653,9 +548,7 @@ http://standards.iso.org/iso/19115/-3/mr
name
volumes
MD_MediumFormatCode
- <type>
MD_StandardOrderProcess
- <type>
fees
orderOptions
orderOptionsType
@@ -664,7 +557,6 @@ http://standards.iso.org/iso/19115/-3/mr
turnaround
http://standards.iso.org/iso/19115/-3/mri/1.0
AbstractMD_Identification
- <type>
abstract
additionalDocumentation
associatedResource
@@ -686,22 +578,18 @@ http://standards.iso.org/iso/19115/-3/mr
temporalResolution
topicCategory
DS_AssociationTypeCode
- <type>
DS_InitiativeTypeCode
- <type>
- MD_AggregateInformation
+ MD_AggregateInformation !other namespace
associationType
initiativeType
metadataReference
name
MD_AssociatedResource
- <type>
associationType
initiativeType
metadataReference
name
MD_DataIdentification
- <type>
abstract
additionalDocumentation
associatedResource
@@ -727,29 +615,23 @@ http://standards.iso.org/iso/19115/-3/mr
temporalResolution
topicCategory
MD_KeywordClass
- <type>
className
conceptIdentifier
ontology
MD_KeywordTypeCode
- <type>
MD_Keywords
- <type>
keyword
keywordClass
thesaurusName
type
MD_RepresentativeFraction
- <type>
denominator
MD_Resolution
- <type>
distance
equivalentScale
levelOfDetail
vertical
MD_Usage
- <type>
additionalDocumentation
identifiedIssues
response
@@ -757,7 +639,7 @@ http://standards.iso.org/iso/19115/-3/mr
usageDateTime
userContactInfo
userDeterminedLimitations
- SV_ServiceIdentification
+ SV_ServiceIdentification !other namespace
abstract
additionalDocumentation
associatedResource
@@ -780,11 +662,9 @@ http://standards.iso.org/iso/19115/-3/mr
topicCategory
http://standards.iso.org/iso/19115/-3/mrl/1.0
LE_Algorithm
- <type>
citation
description
LE_NominalResolution
- <type>
groundResolution
scanningResolution
LE_ProcessStep
@@ -799,12 +679,10 @@ http://standards.iso.org/iso/19115/-3/mr
source
stepDateTime
LE_ProcessStepReport
- <type>
description
fileType
name
LE_Processing
- <type>
algorithm
documentation
identifier
@@ -820,14 +698,12 @@ http://standards.iso.org/iso/19115/-3/mr
sourceSpatialResolution
sourceStep
LI_Lineage
- <type>
additionalDocumentation
processStep
scope
source
statement
LI_ProcessStep
- <type>
description
output
processingInformation
@@ -839,7 +715,6 @@ http://standards.iso.org/iso/19115/-3/mr
source
stepDateTime
LI_Source
- <type>
description
scope
sourceCitation
@@ -849,33 +724,24 @@ http://standards.iso.org/iso/19115/-3/mr
sourceStep
http://standards.iso.org/iso/19115/-3/mrs/1.0
MD_ReferenceSystem
- <type>
referenceSystemIdentifier
http://standards.iso.org/iso/19115/-3/msr/1.0
AbstractMD_SpatialRepresentation
- <type>
AbstractMI_GeolocationInformation
- <type>
qualityInfo
MD_CellGeometryCode
- <type>
MD_Dimension
- <type>
dimensionDescription
dimensionName
dimensionSize
dimensionTitle
resolution
MD_DimensionNameTypeCode
- <type>
MD_GeometricObjectTypeCode
- <type>
MD_GeometricObjects
- <type>
geometricObjectCount
geometricObjectType
MD_Georectified
- <type>
axisDimensionProperties
cellGeometry
centrePoint
@@ -889,7 +755,6 @@ http://standards.iso.org/iso/19115/-3/ms
transformationDimensionMapping
transformationParameterAvailability
MD_Georeferenceable
- <type>
axisDimensionProperties
cellGeometry
controlPointAvailability
@@ -901,22 +766,17 @@ http://standards.iso.org/iso/19115/-3/ms
parameterCitation
transformationParameterAvailability
MD_GridSpatialRepresentation
- <type>
axisDimensionProperties
cellGeometry
numberOfDimensions
transformationParameterAvailability
MD_TopologyLevelCode
- <type>
MD_VectorSpatialRepresentation
- <type>
geometricObjects
topologyLevel
MI_GCP
- <type>
accuracyReport
MI_GCPCollection
- <type>
collectionIdentification
collectionName
coordinateReferenceSystem
@@ -948,22 +808,17 @@ http://standards.iso.org/iso/19115/-3/ms
transformationParameterAvailability
http://standards.iso.org/iso/19115/-3/srv/2.0
DCPList
- <type>
SV_CoupledResource
- <type>
operation
resource
resourceReference
scopedName
SV_CouplingType
- <type>
SV_OperationChainMetadata
- <type>
description
name
operation
SV_OperationMetadata
- <type>
connectPoint
dependsOn
DCP/distributedComputingPlatform
@@ -972,15 +827,12 @@ http://standards.iso.org/iso/19115/-3/sr
operationName
parameters/parameter
SV_Parameter
- <type>
description
direction
repeatability
valueType
SV_ParameterDirection
- <type>
SV_ServiceIdentification
- <type>
accessProperties
containsChain
containsOperations
@@ -993,149 +845,120 @@ http://standards.iso.org/iso/19115/-3/sr
serviceType
serviceTypeVersion
http://standards.iso.org/iso/19157/-2/dqc/1.0
- AbstractDQ_Completeness
+ AbstractDQ_Completeness !other namespace
dateTime
- AbstractDQ_Element
+ AbstractDQ_Element !other namespace
dateTime
- AbstractDQ_LogicalConsistency
+ AbstractDQ_LogicalConsistency !other namespace
dateTime
- AbstractDQ_PositionalAccuracy
+ AbstractDQ_PositionalAccuracy !other namespace
dateTime
- AbstractDQ_TemporalAccuracy
+ AbstractDQ_TemporalAccuracy !other namespace
dateTime
- AbstractDQ_ThematicAccuracy
+ AbstractDQ_ThematicAccuracy !other namespace
dateTime
- DQ_AbsoluteExternalPositionalAccuracy
+ DQ_AbsoluteExternalPositionalAccuracy !other namespace
dateTime
- DQ_AccuracyOfATimeMeasurement
+ DQ_AccuracyOfATimeMeasurement !other namespace
dateTime
- DQ_CompletenessCommission
+ DQ_CompletenessCommission !other namespace
dateTime
- DQ_CompletenessOmission
+ DQ_CompletenessOmission !other namespace
dateTime
- DQ_ConceptualConsistency
+ DQ_ConceptualConsistency !other namespace
dateTime
- DQ_DomainConsistency
+ DQ_DomainConsistency !other namespace
dateTime
- DQ_FormatConsistency
+ DQ_FormatConsistency !other namespace
dateTime
- DQ_GriddedDataPositionalAccuracy
+ DQ_GriddedDataPositionalAccuracy !other namespace
dateTime
- DQ_NonQuantitativeAttributeAccuracy
+ DQ_NonQuantitativeAttributeAccuracy !other namespace
dateTime
- DQ_QuantitativeAttributeAccuracy
+ DQ_QuantitativeAttributeAccuracy !other namespace
dateTime
- DQ_RelativeInternalPositionalAccuracy
+ DQ_RelativeInternalPositionalAccuracy !other namespace
dateTime
- DQ_TemporalConsistency
+ DQ_TemporalConsistency !other namespace
dateTime
- DQ_TemporalValidity
+ DQ_TemporalValidity !other namespace
dateTime
- DQ_ThematicClassificationCorrectness
+ DQ_ThematicClassificationCorrectness !other namespace
dateTime
- DQ_TopologicalConsistency
+ DQ_TopologicalConsistency !other namespace
dateTime
- QE_Usability
+ QE_Usability !other namespace
dateTime
http://standards.iso.org/iso/19157/-2/mdq/1.0
AbstractDQ_Completeness
- <type>
result
AbstractDQ_Element
- <type>
result
AbstractDQ_LogicalConsistency
- <type>
result
AbstractDQ_PositionalAccuracy
- <type>
result
AbstractDQ_Result
- <type>
- AbstractDQ_TemporalAccuracy
+ AbstractDQ_TemporalAccuracy !other namespace
result
AbstractDQ_ThematicAccuracy
- <type>
result
DQ_AbsoluteExternalPositionalAccuracy
- <type>
result
DQ_AccuracyOfATimeMeasurement
- <type>
result
DQ_CompletenessCommission
- <type>
result
DQ_CompletenessOmission
- <type>
result
DQ_ConceptualConsistency
- <type>
result
DQ_ConformanceResult
- <type>
explanation
specification
DQ_DataQuality
- <type>
report
scope
DQ_DomainConsistency
- <type>
result
DQ_EvaluationMethodTypeCode
- <type>
DQ_FormatConsistency
- <type>
result
DQ_GriddedDataPositionalAccuracy
- <type>
result
- DQ_NonQuantitativeAttributeAccuracy
+ DQ_NonQuantitativeAttributeAccuracy !other namespace
result
DQ_QuantitativeAttributeAccuracy
- <type>
result
DQ_QuantitativeResult
- <type>
value
valueType/valueRecordType
valueUnit
DQ_RelativeInternalPositionalAccuracy
- <type>
result
DQ_TemporalConsistency
- <type>
result
DQ_TemporalValidity
- <type>
result
DQ_ThematicClassificationCorrectness
- <type>
result
DQ_TopologicalConsistency
- <type>
result
QE_CoverageResult
- <type>
resultContentDescription
resultFile
resultFormat
resultSpatialRepresentation
spatialRepresentationType
- QE_Usability
+ QE_Usability !other namespace
result
http://www.isotc211.org/2005/gts
TM_Duration
- <type>
TM_PeriodDuration
- <type>
http://www.opengis.net/gml/3.2
TimeInstant
- <type>
timePosition
TimePeriod
- <type>
begin
beginPosition
end
