Merge pull request #20 from NASA-IMPACT/V2Update

HLS v2.0 metadata changes.
NASA-IMPACT · May 4, 2021 · 43bf0b3 · 43bf0b3
2 parents cfbbed4 + 9a0ea3a
commit 43bf0b3
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/metadata_creator/templates/L30.json b/metadata_creator/templates/L30.json
@@ -1,7 +1,7 @@
 {
 	"L30": {
 		"ShortName": "HLSL30",
-		"DataSetId": "HLS Operational Land Imager Surface Reflectance and TOA Brightness Daily Global 30 m V1.5",
+		"DataSetId": "HLS Landsat Operational Land Imager Surface Reflectance and TOA Brightness Daily Global 30m v2.0",
 		"Visible": true,
 		"Orderable": false,
                 "DataFormat": "Cloud Optimized GeoTIFF (COG)",
@@ -146,7 +146,8 @@
 			{
 				"Name": "ACCODE",
 				"DataType": "STRING",
-				"Description": " LaSRC Version"
+				"Description": " LaSRC Version",
+                                "Values": ["LaSRC v3.0.5"]
 			},
 			{
 				"Name": "TIRS_SSM_MODEL",

diff --git a/metadata_creator/templates/L30_attribute_mapping.json b/metadata_creator/templates/L30_attribute_mapping.json
@@ -22,10 +22,10 @@
 	"MEAN_VIEW_AZIMUTH_ANGLE":"MEAN_VIEW_AZIMUTH_ANGLE",
         "MEAN_VIEW_ZENITH_ANGLE":"MEAN_VIEW_ZENITH_ANGLE",
 	"NBAR_SOLAR_ZENITH":"NBAR_SOLAR_ZENITH",
-	"ACCODE":"ACCODE",
 	"TIRS_SSM_MODEL":"TIRS_SSM_MODEL",
 	"TIRS_SSM_POSITION_STATUS":"TIRS_SSM_POSITION_STATUS",
 	"USGS_SOFTWARE":"USGS_SOFTWARE",
+        "ACCODE":"ACCODE",
         "IDENTIFIER_PRODUCT_DOI": "NOT_IN_HDF",
         "IDENTIFIER_PRODUCT_DOI_AUTHORITY": "NOT_IN_HDF"
 }
diff --git a/metadata_creator/templates/S30.json b/metadata_creator/templates/S30.json
@@ -1,7 +1,7 @@
 {
 	"S30": {
 		"ShortName": "HLSS30",
-		"DataSetId": "HLS Sentinel-2 Multi-spectral Instrument Surface Reflectance Daily Global 30 m V1.5",
+		"DataSetId": "HLS Sentinel-2 Multi-spectral Instrument Surface Reflectance Daily Global 30m v2.0",
 		"Orderable": false,
 		"Visible": true,
                 "DataFormat": "Cloud Optimized GeoTIFF (COG)",
@@ -221,7 +221,8 @@
 			{
 				"Name": "ACCODE",
 				"DataType": "STRING",
-				"Description": "LaSRC Version"
+				"Description": "LaSRC Version",
+                                "Values": ["LaSRC v3.1.0"]
 			},
 			{
 				"Name": "PROCESSING_BASELINE",

diff --git a/metadata_creator/templates/S30_attribute_mapping.json b/metadata_creator/templates/S30_attribute_mapping.json
@@ -34,7 +34,7 @@
 	"AROP_NCP":"arop_ncp",
 	"AROP_RMSE(METERS)":"arop_rmse(meters)",
 	"AROP_S2_REFIMG":"arop_s2_refimg",
-	"ACCODE":"ACCODE",
+        "ACCODE":"ACCODE",
 	"PROCESSING_BASELINE":"PROCESSING_BASELINE",
 	"IDENTIFIER_PRODUCT_DOI": "NOT_IN_HDF",
 	"IDENTIFIER_PRODUCT_DOI_AUTHORITY": "NOT_IN_HDF"

diff --git a/tests/data/HLS.L30.39TVF.2020158.165.v1.5.xml b/tests/data/HLS.L30.39TVF.2020158.165.v1.5.xml
@@ -3,7 +3,7 @@
   <InsertTime>2020-10-13T16:46:19.162114Z</InsertTime>
   <LastUpdate>2020-10-13T16:46:19.162123Z</LastUpdate>
   <Collection>
-    <DataSetId>HLS Operational Land Imager Surface Reflectance and TOA Brightness Daily Global 30 m V1.5</DataSetId>
+    <DataSetId>HLS Landsat Operational Land Imager Surface Reflectance and TOA Brightness Daily Global 30m v2.0</DataSetId>
   </Collection>
   <DataGranule>
     <DataGranuleSizeInBytes>28618741</DataGranuleSizeInBytes>
@@ -199,8 +199,7 @@
     <AdditionalAttribute>
       <Name>ACCODE</Name>
       <Values>
-        <Value>Lasrc</Value>
-        <Value>Lasrc</Value>
+        <Value>LaSRC v3.0.5</Value>
       </Values>
     </AdditionalAttribute>
     <AdditionalAttribute>
@@ -240,4 +239,4 @@
   <OnlineResources/>
   <DataFormat>Cloud Optimized GeoTIFF (COG)</DataFormat>
   <AssociatedBrowseImageUrls/>
-</Granule>
+</Granule>
diff --git a/tests/data/HLS.S30.T01LAH.2020097T222759.v1.5.xml b/tests/data/HLS.S30.T01LAH.2020097T222759.v1.5.xml
@@ -3,7 +3,7 @@
   <InsertTime>2020-10-13T16:44:23.161695Z</InsertTime>
   <LastUpdate>2020-10-13T16:44:23.161703Z</LastUpdate>
   <Collection>
-    <DataSetId>HLS Sentinel-2 Multi-spectral Instrument Surface Reflectance Daily Global 30 m V1.5</DataSetId>
+    <DataSetId>HLS Sentinel-2 Multi-spectral Instrument Surface Reflectance Daily Global 30m v2.0</DataSetId>
   </Collection>
   <DataGranule>
     <DataGranuleSizeInBytes>48399637</DataGranuleSizeInBytes>
@@ -303,7 +303,7 @@
     <AdditionalAttribute>
       <Name>ACCODE</Name>
       <Values>
-        <Value>LaSRC</Value>
+        <Value>LaSRC v3.1.0</Value>
       </Values>
     </AdditionalAttribute>
     <AdditionalAttribute>
@@ -329,4 +329,4 @@
   <OnlineResources/>
   <DataFormat>Cloud Optimized GeoTIFF (COG)</DataFormat>
   <AssociatedBrowseImageUrls/>
-</Granule>
+</Granule>
diff --git a/tests/data/HLS.S30.T48UXF.2020274T041601.v1.5.xml b/tests/data/HLS.S30.T48UXF.2020274T041601.v1.5.xml
@@ -3,7 +3,7 @@
   <InsertTime>2020-10-27T17:11:55.803680Z</InsertTime>
   <LastUpdate>2020-10-27T17:11:55.803699Z</LastUpdate>
   <Collection>
-    <DataSetId>HLS Sentinel-2 Multi-spectral Instrument Surface Reflectance Daily Global 30 m V1.5</DataSetId>
+    <DataSetId>HLS Sentinel-2 Multi-spectral Instrument Surface Reflectance Daily Global 30m v2.0</DataSetId>
   </Collection>
   <DataGranule>
     <DataGranuleSizeInBytes>1684246</DataGranuleSizeInBytes>
@@ -261,7 +261,7 @@
     <AdditionalAttribute>
       <Name>ACCODE</Name>
       <Values>
-        <Value>LaSRC</Value>
+        <Value>LaSRC v3.1.0</Value>
       </Values>
     </AdditionalAttribute>
     <AdditionalAttribute>
@@ -287,4 +287,4 @@
   <OnlineResources/>
   <DataFormat>Cloud Optimized GeoTIFF (COG)</DataFormat>
   <AssociatedBrowseImageUrls/>
-</Granule>
+</Granule>