Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMR-9262 CMR-9263 and CMR-9265 adds the variable, service, data quali… #1927

Merged
merged 1 commit into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion common-lib/src/cmr/common/config.clj
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,11 @@
:data-quality-summary ["1.0.0"]
:order-option ["1.0.0"]
:collection-draft ["1.0.0"]
:tool-draft ["1.0.0"]}
:tool-draft ["1.0.0"]
:service-draft ["1.0.0"]
:variable-draft ["1.0.0"]
:data-quality-summary-draft ["1.0.0"]
:order-option-draft ["1.0.0"]}
:parser #(json/parse-string % true)})

(defconfig approved-pipeline-documentation
Expand Down
4 changes: 3 additions & 1 deletion ingest-app/src/cmr/ingest/api/generic_documents.clj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@
{:collection-draft :umm-c
:service-draft :umm-s
:tool-draft :umm-t
:variable-draft :umm-var})
:variable-draft :umm-var
:data-quality-summary-draft :data-quality-summary
:order-option-draft :order-option})

(defn is-draft-concept?
"This function checks to see if the concept to be ingested or updated
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"MetadataSpecification": {
"URL": "https://cdn.earthdata.nasa.gov/generic/index/v0.0.1",
"Name": "Generic-Index",
"Version": "0.0.1"
},
"Generic": {
"Name": "Data Quality Summary Draft",
"Version": "1.0.0"
},
"SubConceptType": "DQD",
"IndexSetup" : {
"index": {
"number_of_shards": 3,
"number_of_replicas": 1,
"refresh_interval": "1s"
}
},
"Indexes":
[
{
"Description": "Draft Data Quality Summary Name",
"Field": ".Name",
"Name": "name",
"Mapping": "string"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"Id":"8EA5CA1F-E339-8065-26D7-53B64074D7CC",
"Name":"CER-BDS_Terra",
"Summary":"Summary",
"MetadataSpecification": {
"Name": "Data Quality Summary",
"Version": "1.0.0",
"URL": "https://cdn.earthdata.nasa.gov/generics/data-quality-summary/v1.0.0"
}
}
28 changes: 28 additions & 0 deletions schemas/resources/schemas/order-option-draft/v1.0.0/index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"MetadataSpecification": {
"URL": "https://cdn.earthdata.nasa.gov/generic/index/v0.0.1",
"Name": "Generic-Index",
"Version": "0.0.1"
},
"Generic": {
"Name": "Order Option Draft",
"Version": "1.0.0"
},
"SubConceptType": "OOD",
"IndexSetup" : {
"index": {
"number_of_shards": 3,
"number_of_replicas": 1,
"refresh_interval": "1s"
}
},
"Indexes":
[
{
"Description": "Draft Order Option Name",
"Field": ".Name",
"Name": "name",
"Mapping": "string"
}
]
}
15 changes: 15 additions & 0 deletions schemas/resources/schemas/order-option-draft/v1.0.0/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"Id": "0AF0BB4E",
"Name": "With Browse",
"Description": "",
"Form": "<form xmlns=\"http://echo.nasa.gov/v9/echoforms\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"> <model> <instance> <ecs:options xmlns:ecs=\"http://ecs.nasa.gov/options\"> <!-- ECS distribution options example --> <ecs:distribution> <ecs:mediatype> <ecs:value>FtpPull</ecs:value> </ecs:mediatype> <ecs:mediaformat> <ecs:ftppull-format> <ecs:value>FILEFORMAT</ecs:value> </ecs:ftppull-format> </ecs:mediaformat> </ecs:distribution> <ecs:do-ancillaryprocessing>true</ecs:do-ancillaryprocessing> <ecs:ancillary> <ecs:orderBrowse/> </ecs:ancillary> </ecs:options> </instance> </model> <ui> <group id=\"mediaOptionsGroup\" label=\"Media Options\" ref=\"ecs:distribution\"> <output id=\"MediaTypeOutput\" label=\"Media Type:\" relevant=\"ecs:mediatype/ecs:value ='FtpPull'\" type=\"xsd:string\" value=\"'HTTPS Pull'\"/> <output id=\"FtpPullMediaFormatOutput\" label=\"Media Format:\" relevant=\"ecs:mediaformat/ecs:ftppull-format/ecs:value='FILEFORMAT'\" type=\"xsd:string\" value=\"'File'\"/> </group> <group id=\"checkancillaryoptions\" label=\"Additional file options:\" ref=\"ecs:ancillary\" relevant=\"//ecs:do-ancillaryprocessing = 'true'\"> <input label=\"Include associated Browse file in order\" ref=\"ecs:orderBrowse\" type=\"xsd:boolean\"/> </group> </ui> </form>",
"Scope":"PROVIDER",
"SortKey": "Name",
"Deprecated": false,
"MetadataSpecification": {
"Name": "Order Option",
"Version": "1.0.0",
"URL": "https://cdn.earthdata.nasa.gov/generics/order-option/v1.0.0"
}
}

28 changes: 28 additions & 0 deletions schemas/resources/schemas/service-draft/v1.0.0/index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"MetadataSpecification": {
"URL": "https://cdn.earthdata.nasa.gov/generic/index/v0.0.1",
"Name": "Generic-Index",
"Version": "0.0.1"
},
"Generic": {
"Name": "Service Draft",
"Version": "1.0.0"
},
"SubConceptType": "SD",
"IndexSetup" : {
"index": {
"number_of_shards": 3,
"number_of_replicas": 1,
"refresh_interval": "1s"
}
},
"Indexes":
[
{
"Description": "Draft Service Name",
"Field": ".Name",
"Name": "name",
"Mapping": "string"
}
]
}
261 changes: 261 additions & 0 deletions schemas/resources/schemas/service-draft/v1.0.0/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
{
"URL" : {
"Description" : "OPeNDAP Service for AIRX3STD.006",
"URLValue" : "https://acdisc.gesdisc.eosdis.nasa.gov/opendap/Aqua_AIRS_Level3/AIRX3STD.006/"
},
"Type" : "Web Feature Service",
"ServiceKeywords" : [ {
"ServiceCategory" : "DATA MANAGEMENT/DATA HANDLING",
"ServiceTopic" : "TRANSFORMATION/REPROJECTION"
} ],
"ServiceOrganizations" : [ {
"Roles" : [ "SERVICE PROVIDER" ],
"ShortName" : "NASA/GESDISC",
"LongName" : "GES DISC SERVICE HELP DESK SUPPORT GROUP"
}, {
"Roles" : [ "SERVICE PROVIDER" ],
"ShortName" : "NASA/GESDISC-2",
"LongName" : "GES DISC SERVICE HELP DESK SUPPORT GROUP 2",
"OnlineResource" : {
"Linkage" : "https://daacscenter.org",
"Name" : "HOME PAGE",
"Description" : "Test the description."
}
} ],
"LastUpdatedDate" : "2020-05-10T00:00:00Z",
"OperationMetadata" : [ {
"OperationName" : "SPATIAL_SUBSETTING",
"DistributedComputingPlatform" : [ "XML", "HTTPS" ],
"OperationDescription" : "Access the AIRS/Aqua Level 3 daily standard physical retrieval product (Without HSB) through OPeNDAP",
"InvocationName" : "GES DISC OPeNDAP Service for AIRX3STD.006",
"ConnectPoint" : {
"ResourceName" : "AIRX3STD.006",
"ResourceLinkage" : "https://acdisc.gesdisc.eosdis.nasa.gov/opendap/Aqua_AIRS_Level3/AIRX3STD.006/",
"ResourceDescription" : "AIRS/Aqua L3 Daily Standard Physical Retrieval (AIRS+AMSU) 1 degree x 1 degree V006."
},
"CoupledResource" : {
"ScopedName" : "AIRX3STD.006",
"DataResourceDOI" : "https://doi.org/10.5067/Aqua/AIRS/DATA303",
"CouplingType" : "TIGHT",
"DataResource" : {
"TemporalResolution" : 1,
"DataResourceSpatialExtent" : {
"SpatialBoundingBox" : {
"CRSIdentifier" : "EPSG:4326",
"WestBoundingCoordinate" : -180.0,
"SouthBoundingCoordinate" : -90.0,
"EastBoundingCoordinate" : 180.0,
"NorthBoundingCoordinate" : 90.0
}
},
"DataResourceSpatialType" : "BOUNDING_BOX",
"SpatialResolution" : 1,
"DataResourceTemporalType" : "TIME_STAMP",
"DataResourceIdentifier" : "Aqua_AIRS_Level3/AIRX3STD.006",
"DataResourceTemporalExtent" : {
"DataResourceTimePoints" : [ {
"TimeFormat" : "%Y%M%D",
"TimeValue" : "2009-01-08",
"Description" : "Time stamp of the granule within the collection"
} ]
},
"SpatialResolutionUnit" : "KM",
"DataResourceSourceType" : "Collection",
"TemporalResolutionUnit" : "DAY"
}
}
}, {
"OperationName" : "GetTile",
"CoupledResource" : {
"DataResource" : {
"DataResourceSpatialExtent" : {
"SpatialBoundingBox" : {
"CRSIdentifier" : "Other",
"WestBoundingCoordinate" : -180.0,
"SouthBoundingCoordinate" : -90.0,
"EastBoundingCoordinate" : 180.0,
"NorthBoundingCoordinate" : 90.0
}
}
}
}
} ],
"AccessConstraints" : "None",
"ContactGroups" : [ {
"Roles" : [ "SCIENCE CONTACT" ],
"ContactInformation" : {
"ContactMechanisms" : [ {
"Type" : "Email",
"Value" : "gsfc-help-disc at lists.nasa.gov"
}, {
"Type" : "Telephone",
"Value" : "301-614-9999"
} ],
"Addresses" : [ {
"StreetAddresses" : [ "Goddard Earth Sciences Data and Information Systems, Attn: User , NASA Goddard Space Flight Center, Code 610.2" ],
"City" : "Greenbelt",
"StateProvince" : "MD",
"Country" : "USA",
"PostalCode" : "20771"
} ]
},
"GroupName" : "Main Level Group Name 1"
}, {
"Roles" : [ "TECHNICAL CONTACT" ],
"ContactInformation" : {
"OnlineResources" : [ {
"Linkage" : "https://someurl1.org",
"Protocol" : "https",
"ApplicationProfile" : "Some Application",
"Name" : "Some Site",
"Description" : "The description of someurl1.",
"Function" : "information"
}, {
"Linkage" : "https://someurl2.org",
"Protocol" : "https",
"ApplicationProfile" : "Some Application 2",
"Name" : "Some Site 2",
"Description" : "The description of someurl2.",
"Function" : "information"
} ],
"ContactMechanisms" : [ {
"Type" : "Email",
"Value" : "gsfc-help-disc at lists.nasa.gov"
}, {
"Type" : "Telephone",
"Value" : "301-614-9999"
} ],
"Addresses" : [ {
"StreetAddresses" : [ "Goddard Earth Sciences Data and Information Systems, Attn: User , NASA Goddard Space Flight Center, Code 610.2" ],
"City" : "Greenbelt",
"StateProvince" : "MD",
"Country" : "USA",
"PostalCode" : "20771"
} ]
},
"GroupName" : "Main Level Group Name 2"
} ],
"Description" : "Access the AIRS/Aqua Level 3 daily standard physical retrieval product (Without HSB) through OPeNDAP",
"VersionDescription" : "This is a description of version 1.5.0",
"Version" : "1.5.0",
"UseConstraints" : {
"LicenseURL" : "http://www.someurl.com",
"LicenseText" : "None"
},
"Name" : "Service-1.5.1",
"ContactPersons" : [ {
"Roles" : [ "SERVICE PROVIDER" ],
"ContactInformation" : {
"OnlineResources" : [ {
"Linkage" : "https://someurl3.org",
"Protocol" : "https",
"ApplicationProfile" : "Some Application 3",
"Name" : "Some Site",
"Description" : "The description of someurl3.",
"Function" : "information"
} ],
"ContactMechanisms" : [ {
"Type" : "Email",
"Value" : "gsfc-help-disc at lists.nasa.gov"
}, {
"Type" : "Telephone",
"Value" : "301-614-9999"
} ],
"Addresses" : [ {
"StreetAddresses" : [ "Goddard Earth Sciences Data and Information Systems, Attn: User , NASA Goddard Space Flight Center, Code 610.2" ],
"City" : "Greenbelt",
"StateProvince" : "MD",
"Country" : "USA",
"PostalCode" : "20771"
} ]
},
"FirstName" : "FirstName Main Level",
"MiddleName" : " ",
"LastName" : "LastName Main Level"
}, {
"Roles" : [ "SERVICE PROVIDER" ],
"ContactInformation" : {
"ContactMechanisms" : [ {
"Type" : "Email",
"Value" : "gsfc-help-disc at lists.nasa.gov"
}, {
"Type" : "Telephone",
"Value" : "301-614-9999"
} ],
"Addresses" : [ {
"StreetAddresses" : [ "Goddard Earth Sciences Data and Information Systems, Attn: User , NASA Goddard Space Flight Center, Code 610.2" ],
"City" : "Greenbelt",
"StateProvince" : "MD",
"Country" : "USA",
"PostalCode" : "20771"
} ]
},
"FirstName" : "FirstName Service Org",
"MiddleName" : "Service Org MiddleName",
"LastName" : "LastName Service Org"
} ],
"ServiceOptions" : {
"Subset" : {
"SpatialSubset" : {
"Point" : {
"AllowMultipleValues" : true
},
"Circle" : {
"AllowMultipleValues" : false
},
"Line" : {
"MaximumNumberOfPoints" : 10,
"AllowMultipleValues" : false
},
"BoundingBox" : {
"AllowMultipleValues" : false
},
"Polygon" : {
"MaximumNumberOfPoints" : 10,
"AllowMultipleValues" : false
},
"Shapefile" : [ {
"Format" : "KML",
"MaximumFileSizeInBytes" : 5000,
"MaximumNumberOfPoints" : 10
}, {
"Format" : "ESRI",
"MaximumFileSizeInBytes" : 10000,
"MaximumNumberOfPoints" : 20
}, {
"Format" : "GeoJSON",
"MaximumFileSizeInBytes" : 20000,
"MaximumNumberOfPoints" : 40
} ]
},
"TemporalSubset" : {
"AllowMultipleValues" : false
},
"VariableSubset" : {
"AllowMultipleValues" : true
}
},
"SupportedInputProjections" : [ {
"ProjectionName" : "Geographic",
"ProjectionAuthority" : "4326"
} ],
"SupportedOutputProjections" : [ {
"ProjectionName" : "Geographic",
"ProjectionAuthority" : "ep"
} ],
"InterpolationTypes": ["Elliptical Weighted Averaging"],
"SupportedReformattings" : [ {
"SupportedInputFormat" : "HDF5",
"SupportedOutputFormats" : [ "GEOTIFFFLOAT32", "GEOTIFFINT16", "COG" ]
}, {
"SupportedInputFormat" : "WKT",
"SupportedOutputFormats" : [ "GEOTIFFFLOAT32", "GEOTIFFINT16", "Shapefile+zip" ]
} ]
},
"MetadataSpecification" : {
"URL" : "https://cdn.earthdata.nasa.gov/umm/service/v1.5.1",
"Name" : "UMM-S",
"Version" : "1.5.1"
},
"LongName" : "AIRS/Aqua L3 Daily Standard Physical Retrieval (AIRS+AMSU) 1 degree x 1 degree V006."
}
Loading