Merge pull request #61 from NASA-IMPACT/dev

Merge dev into master in preparation for new release.

Dockerfile

@@ -63,7 +63,7 @@ RUN pip3 install git+https://github.com/NASA-IMPACT/[email protected]
 RUN pip3 install wheel
 RUN pip3 install git+https://github.com/NASA-IMPACT/[email protected]
 RUN pip3 install libxml2-python3
-RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v1.7
+RUN pip3 install git+https://github.com/NASA-IMPACT/hls-hdf_to_cog@v2.1
 RUN pip3 install git+https://github.com/NASA-IMPACT/[email protected]
 RUN pip3 install git+https://github.com/NASA-IMPACT/[email protected]
 RUN pip3 install git+https://github.com/NASA-IMPACT/[email protected]

scripts/landsat-tile.sh

@@ -49,7 +49,7 @@ set_output_names () {
   nbar_angle="${workingdir}/L8ANGLE.${nbarbasename}.hdf"
   angleoutputfinal="${workingdir}/${outputname}.ANGLE.hdf"
   nbar_cfactor="${workingdir}/CFACTOR.${nbarbasename}.hdf"
-  griddedoutput="${workingdir}/GRIDDED.${outputbasename}.hdf"
+  griddedoutput="${workingdir}/gridded.hdf"
   output_metadata="${workingdir}/${outputname}.cmr.xml"
   output_stac_metadata="${workingdir}/${outputname}_stac.json"
   output_thumbnail="${workingdir}/${outputname}.jpg"
@@ -101,6 +101,7 @@ done
 ls "$workingdir"
 if [[ -f "$nbar_input" ]] && [[ -f "$nbar_angle" ]] ; then
   echo "Running NBAR"
+  # Copy intermediate gridded output for debugging analysis.
   cp "$nbar_input" "$griddedoutput"
   derive_l8nbar "$nbar_input" "$nbar_angle" "$nbar_cfactor"
 
@@ -153,11 +154,12 @@ if [[ -f "$nbar_input" ]] && [[ -f "$nbar_angle" ]] ; then
     # Copy manifest to S3 to signal completion.
     aws s3 cp "$manifest" "${bucket_key}/${manifest_name}" --profile gccprofile
   else
+    echo "Create gridded debug COG"
+    hdf_to_cog "$griddedoutput" --output-dir "$workingdir" --product L30 --debug-mode
     # Copy all intermediate files to debug bucket.
     echo "Copy files to debug bucket"
-    timestamp=$(date +'%Y_%m_%d_%H_%M')
-    debug_bucket_key=s3://${debug_bucket}/${outputname}_${timestamp}
-    aws s3 cp "$workingdir" "$debug_bucket_key" --recursive --quiet
+    debug_bucket_key=s3://${debug_bucket}/${outputname}
+    aws s3 cp "$workingdir" "$debug_bucket_key" --recursive --quiet --acl public-read
   fi
 
   # Generate GIBS browse subtiles
@@ -192,9 +194,8 @@ if [[ -f "$nbar_input" ]] && [[ -f "$nbar_angle" ]] ; then
             --profile gccprofile
         else
           # Copy all intermediate files to debug bucket.
-          timestamp=$(date +'%Y_%m_%d_%H_%M')
-          debug_bucket_key=s3://${debug_bucket}/${outputname}_${timestamp}
-          aws s3 cp "$gibs_id_dir" "$debug_bucket_key" --recursive --quiet
+          debug_bucket_key=s3://${debug_bucket}/${outputname}
+          aws s3 cp "$gibs_id_dir" "$debug_bucket_key" --recursive --quiet --acl public-read
         fi
       fi
   done