From 87fa28f30f611eb37edcc73e04e5e7b39b9145b3 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Tue, 21 Jan 2020 12:13:09 -0600
Subject: [PATCH] Fix _ll shapefile location in mapfile
---
mapserver/mapfiles/g16_abi_fldk_l1b.map | 2 +-
tile_gen/README.md | 8 +++++---
tile_gen/run.sh | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/mapserver/mapfiles/g16_abi_fldk_l1b.map b/mapserver/mapfiles/g16_abi_fldk_l1b.map
index 4a6a141..e90aa7a 100644
--- a/mapserver/mapfiles/g16_abi_fldk_l1b.map
+++ b/mapserver/mapfiles/g16_abi_fldk_l1b.map
@@ -55,7 +55,7 @@ MAP
LAYER
NAME "true_color_index_ll"
TYPE TILEINDEX
- DATA "/data/tiles/g16/abi/radf_ll/true_color/true_color_LL"
+ DATA "/data/tiles/g16/abi/radf_ll/true_color_ll/true_color_ll"
END
LAYER
diff --git a/tile_gen/README.md b/tile_gen/README.md
index f8534ce..290548a 100644
--- a/tile_gen/README.md
+++ b/tile_gen/README.md
@@ -16,11 +16,13 @@ docker run -d --rm --network cspp-geo-rabbit --cpus 2 --name cspp-geo-tilegen-g1
To run the version of tile generation that remaps to EPSG:4326:
```bash
-docker run -d --rm --network cspp-geo-rabbit --cpus 6 --name cspp-geo-tilegen-g16-radf-ll -e AMQPFIND_TOPIC="data.goes.g16.abi.radf.l1b.geotiff.complete" -e TILE_ARGS="--remap --shape-file {product}_LL.shp" -v cspp-geo-abi-l1b-geotiffs:/data gitlab.ssec.wisc.edu:5555/cspp_geo/cspp-geo-web-viewer/tile_gen:latest ./run.sh
+docker run -d --rm --network cspp-geo-rabbit --cpus 6 --name cspp-geo-tilegen-g16-radf-ll -e AMQPFIND_TOPIC="data.goes.g16.abi.radf.l1b.geotiff.complete" -e G2G_PRODUCTS="true_color" -e TILE_ARGS="--remap --shape-file {product}_ll.shp" -v cspp-geo-abi-l1b-geotiffs:/data gitlab.ssec.wisc.edu:5555/cspp_geo/cspp-geo-web-viewer/tile_gen:latest ./run.sh
```
-NOTE: For full disk the above can take a really long time and fall behind.
-It may be best to limit this to one or two products for testing by adding:
+NOTE: For full disk data, remapping all products can take a really long
+time and fall behind. The above command limits processing to "true_color"
+only. To attempt to process all products remove the below portion of the
+command.
```
-e G2G_PRODUCTS="true_color"
diff --git a/tile_gen/run.sh b/tile_gen/run.sh
index a7b4933..18f1bf4 100755
--- a/tile_gen/run.sh
+++ b/tile_gen/run.sh
@@ -72,6 +72,7 @@ run_tile_gen() {
json_info="{path: ${glob_pattern}, satellite_family: ${satellite_family}, satellite_ID: ${satellite_id}, instrument: ${instrument}, data_type: ${data_type}}"
json_info="{\"path\": \"${glob_pattern}\", \"satellite_family\": \"${satellite_family}\", \"satellite_ID\": \"${satellite_id}\", \"instrument\": \"${instrument}\", \"data_type\": \"${data_type}\"}"
echo -e "[[\"$amqpsend_topic\", $json_info]]" | python3 /work/amqpfind/amqpsend.py ${AMQPSEND_ARGS}
+ echo "Done generating tiles for ${path}"
}
export -f run_tile_gen
--
GitLab