CMR-9355: Updating UMM-C to update description wording and adding geo+json as a mime type.

Author: eereiter

common-app-lib/src/cmr/common_app/config.clj

@@ -8,7 +8,7 @@
 (defconfig collection-umm-version
   "Defines the latest collection umm version accepted by ingest - it's the latest official version.
    This environment variable needs to be manually set when newer UMM version becomes official"
-  {:default "1.18.2"})
+  {:default "1.18.3"})
 
 (defconfig launchpad-token-enforced
   "Flag for whether or not launchpad token is enforced."

schemas/resources/schemas/collection-draft/v1.0.0/metadata.json

@@ -264,8 +264,8 @@
         "DOI" : "10.1234/DOIID",
         "Authority" : "https://doi.org/"
       },
-      "ShortName" : "Mapping Short Name 1.18.2",
-      "EntryTitle" : "Mapping Example for UMM-C 1.18.2",
+      "ShortName" : "Mapping Short Name 1.18.3",
+      "EntryTitle" : "Mapping Example for UMM-C 1.18.3",
       "PublicationReferences" : [ {
         "OnlineResource" : {
           "Linkage" : "http://www.yahoo.com",
@@ -814,9 +814,9 @@
         "LongName" : "MUSES"
       } ],
       "MetadataSpecification" : {
-        "URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.2",
+        "URL" : "https://cdn.earthdata.nasa.gov/umm/collection/v1.18.3",
         "Name" : "UMM-C",
-        "Version" : "1.18.2"
+        "Version" : "1.18.3"
       },
       "ArchiveAndDistributionInformation" : {
         "FileArchiveInformation" : [ {

umm-spec-lib/resources/json-schemas/collection/umm/v1.18.3/umm-c-json-schema.json

@@ -402,7 +402,7 @@
         },
         "required": ["LicenseText"]
       }
-      ]},
+    ]},
     "DirectoryNameType": {
       "type": "object",
       "additionalProperties": false,
@@ -1415,7 +1415,7 @@
       "enum": ["NEAR_REAL_TIME", "LOW_LATENCY", "EXPEDITED", "SCIENCE_QUALITY", "OTHER"]
     },
     "CollectionProgressEnum": {
-      "description": "This element describes the production status of the data set. There are five choices for Data Providers: PLANNED refers to data sets to be collected in the future and are thus unavailable at the present time. For Example: The Hydro spacecraft has not been launched, but information on planned data sets may be available. ACTIVE refers to data sets currently in production or data that is continuously being collected or updated. For Example: data from the AIRS instrument on Aqua is being collected continuously. COMPLETE refers to data sets in which no updates or further data collection will be made. For Example: Nimbus-7 SMMR data collection has been completed. DEPRECATED refers to data sets that have been retired, but still can be retrieved. Usually newer products exist that replace the retired data set. NOT APPLICABLE refers to data sets in which a collection progress is not applicable such as a calibration collection. There is a sixth value of NOT PROVIDED that should not be used by a data provider. It is currently being used as a value when a correct translation cannot be done with the current valid values, or when the value is not provided by the data provider.",
+      "description": "This element describes the production status of the data set. There are multiple choices for Data Providers: PLANNED refers to data sets to be collected in the future and are thus unavailable at the present time. For Example: The Hydro spacecraft has not been launched, but information on planned data sets may be available. ACTIVE refers to data sets currently in production or data that is continuously being collected or updated. For Example: data from the AIRS instrument on Aqua is being collected continuously. COMPLETE refers to data sets in which no updates or further data collection will be made. For Example: Nimbus-7 SMMR data collection has been completed. DEPRECATED refers to data sets that have been retired, but still can be retrieved. Usually newer products exist that replace the retired data set. NOT PROVIDED should not be used by a data provider. It is currently being used as a value when a correct translation cannot be done with the current valid values, or when the value is not provided by the data provider. PREPRINT: Refers to datasets which are made available prior to completion of validation and review processes to support manuscript publication processes and open science.\nPreprint datasets are provisional and should not be used for production applications. INREVIEW: Refers to datasets which are made available to support science team final review. In Review datasets are provisional and should not be used for production applications. Note that if restricted access is needed, an INREVIEW dataset may also have an Access Control List applied. SUPERSEDED: Refers to datasets which remain publicly available, but for which a newer version is available.",
       "type": "string",
       "enum": ["ACTIVE", "PLANNED", "COMPLETE", "DEPRECATED", "NOT PROVIDED", "PREPRINT", "INREVIEW", "SUPERSEDED"]
     },
@@ -1468,7 +1468,7 @@
       "enum": ["KB", "MB", "GB", "TB", "PB", "NA"]
     },
     "DistributionMediaType": {
-      "description": "This element defines the media by which the end user can obtain the distributable item. Examples of media include: CD-ROM, 9 track tape, diskettes, hard drives, online, transparencies, hardcopy, etc.",
+      "description": "This element defines the media by which the end user can obtain the distributable item. Each media type is listed separately. Examples of media include HTTPS, Earthdata Cloud, etc.",
       "type": "string",
       "minLength": 1,
       "maxLength": 80
@@ -1593,7 +1593,7 @@
             "$ref": "#/definitions/ArchiveDistributionFormatDescriptionType"
           },
           "Media": {
-            "description": "This element defines the media by which the end user can obtain the distributable item. Each media type is listed separately. Examples of media include: CD-ROM, 9 track tape, diskettes, hard drives, online, transparencies, hardcopy, etc.",
+            "description": "This element defines the media by which the end user can obtain the distributable item. Each media type is listed separately. Examples of media include HTTPS, Earthdata Cloud, etc.",
             "type": "array",
             "items": {
               "$ref": "#/definitions/DistributionMediaType"
@@ -1656,7 +1656,7 @@
             "$ref": "#/definitions/ArchiveDistributionFormatDescriptionType"
           },
           "Media": {
-            "description": "This element defines the media by which the end user can obtain the distributable item. Each media type is listed separately. Examples of media include: CD-ROM, 9 track tape, diskettes, hard drives, online, transparencies, hardcopy, etc.",
+            "description": "This element defines the media by which the end user can obtain the distributable item. Each media type is listed separately. Examples of media include HTTPS, Earthdata Cloud, etc.",
             "type": "array",
             "items": {
               "$ref": "#/definitions/DistributionMediaType"
@@ -1905,7 +1905,7 @@
         "URL": {
           "description": "This element represents the URL where the schema lives. The schema can be downloaded.",
           "type": "string",
-          "enum": ["https://cdn.earthdata.nasa.gov/umm/collection/v1.18.2"]
+          "enum": ["https://cdn.earthdata.nasa.gov/umm/collection/v1.18.3"]
         },
         "Name": {
           "description": "This element represents the name of the schema.",
@@ -1915,7 +1915,7 @@
         "Version": {
           "description": "This element represents the version of the schema.",
           "type": "string",
-          "enum": ["1.18.2"]
+          "enum": ["1.18.3"]
         }
       },
       "required": ["URL", "Name", "Version"]

umm-spec-lib/resources/json-schemas/collection/umm/v1.18.3/umm-cmn-json-schema.json

@@ -565,7 +565,7 @@
       "description": "Provides a DOI of the previous version of this collection. This allows users to find historical data for this collection. Note: The values should start with the directory indicator which in ESDIS' case is 10.  If the DOI was registered through ESDIS, the beginning of the string should be 10.5067. The DOI URL is not stored here; it should be stored as a RelatedURL. The DOI organization that is responsible for creating the DOI is described in the Authority element. For ESDIS records the value of https://doi.org/ should be used. For those that want to specify that a DOI is not applicable or unknown for their record, use the second option.",
       "properties": {
         "Version": {
-          "description": "This element stores the DOI (Digital Object Identifier) that identifies the prevoius version of this collection.  Note: The values should start with the directory indicator which in ESDIS' case is 10.  If the DOI was registered through ESDIS, the beginning of the string should be 10.5067. The DOI URL is not stored here; it should be stored as a RelatedURL.",
+          "description": "The version number if one exists.",
           "$ref": "#/definitions/VersionType"
         },
         "Description": {
@@ -1084,7 +1084,7 @@
     "TemporalResolutionType": {
       "oneOf": [{
         "type": "object",
-        "title": "Contant or Varies Resolution",
+        "title": "Constant or Varies Resolution",
         "additionalProperties": false,
         "description": "Describes the amount of time between measurements.",
         "properties": {
@@ -1307,7 +1307,7 @@
                "application/vnd.google-earth.kml+xml", "image/gif", "image/tiff", "image/bmp", "text/csv",
                "text/xml", "application/pdf", "application/x-hdf", "application/xhdf5",
                "application/octet-stream", "application/vnd.google-earth.kmz", "image/jpeg", "image/png",
-               "image/vnd.collada+xml", "application/x-vnd.iso.19139-2+xml", "text/html", "text/plain", "Not provided"]
+               "image/vnd.collada+xml", "application/x-vnd.iso.19139-2+xml", "text/html", "text/plain", "application/geo+json", "Not provided"]
     },
     "GetServiceTypeFormatEnum": {
       "type": "string",

umm-spec-lib/src/cmr/umm_spec/migration/version/collection.clj

@@ -794,3 +794,24 @@
                                 (update :CollectionProgress migrate-collection-progress-down))
                             coll))))
 
+(defmethod interface/migrate-umm-version [:collection "1.18.2" "1.18.3"]
+  [_context collection & _]
+  ;; Migrating up version 1.18.2 to 1.18.3
+  (-> collection
+      (m-spec/update-version :collection "1.18.3")))
+
+(defn down-grade-geo-json-mime-type
+  "Replace MimeType geo+json with json as geo+json doesn't exist in the lower versions.
+  Otherwise leave the MimeType as is."
+  [service ]
+  (if (= "application/geo+json" (:MimeType service))
+    (assoc service :MimeType "application/json")
+    service))
+
+(defmethod interface/migrate-umm-version [:collection "1.18.3" "1.18.2"]
+  [_context collection & _]
+  ;; Migrating down version 1.18.3 to 1.18.2
+  ;; Modify RelatedUrls GetService MimeType from geo+json to json
+  (-> collection
+      (m-spec/update-version :collection "1.18.2")
+      (util/update-in-all [:RelatedUrls :GetService] #(down-grade-geo-json-mime-type %))))

umm-spec-lib/src/cmr/umm_spec/versioning.clj

@@ -13,7 +13,7 @@
                 "1.15" "1.15.1" "1.15.2" "1.15.3" "1.15.4" "1.15.5"
                 "1.16" "1.16.1" "1.16.2" "1.16.3" "1.16.4" "1.16.5" "1.16.6" "1.16.7"
                 "1.17.0" "1.17.1" "1.17.2" "1.17.3"
-                "1.18.0" "1.18.1" "1.18.2"]
+                "1.18.0" "1.18.1" "1.18.2" "1.18.3"]
    :granule ["1.4" "1.5" "1.6" "1.6.1" "1.6.2" "1.6.3" "1.6.4" "1.6.5" "1.6.6"]
    :variable ["1.0" "1.1" "1.2" "1.3" "1.4" "1.5" "1.6" "1.7" "1.8" "1.8.1" "1.8.2" "1.9.0"]
    :service ["1.0" "1.1" "1.2" "1.3" "1.3.1" "1.3.2" "1.3.3" "1.3.4" "1.4" "1.4.1" "1.5.0" "1.5.1" "1.5.2" "1.5.3"]