Fixed conflicts

2020-02-03 13:33:39 -05:00 · 2020-02-03 13:33:39 -05:00 · faf90757e3
commit faf90757e3
--- a/scripts/postprocess.sh
+++ b/scripts/postprocess.sh
@ -37,7 +37,7 @@ else
 fi

 # Generate Tiles
-g2t_options="--processes $(nproc) -z 12-21 -n -w none"
+g2t_options="--processes $(nproc) -z 5-21 -n -w none"
 orthophoto_path="odm_orthophoto/odm_orthophoto.tif"

 if [ -e "$orthophoto_path" ]; then
--- a/tests/odm_options.json
+++ b/tests/odm_options.json
--- a/tests/processing_results/odm_dem/dsm.tif
+++ b/tests/processing_results/odm_dem/dsm.tif
--- a/tests/processing_results/odm_dem/dtm.tif
+++ b/tests/processing_results/odm_dem/dtm.tif