From 7bfbd135b514988f7d2390735002efdd528a0d36 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Tue, 17 Mar 2020 09:25:22 -0500
Subject: [PATCH] Update rabbitmq message topics to have product field
---
tile_gen/README.md | 4 ++--
tile_gen/run.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tile_gen/README.md b/tile_gen/README.md
index ac6fa4d..a4f58e4 100644
--- a/tile_gen/README.md
+++ b/tile_gen/README.md
@@ -10,13 +10,13 @@ docker push gitlab.ssec.wisc.edu:5555/cspp_geo/cspp-geo-web-viewer/tile_gen:late
## Usage
```bash
-docker run -d --rm --network cspp-geo-rabbit --cpus 2 --name cspp-geo-tilegen-g16-radf -e AMQPFIND_TOPIC="data.goes.g16.abi.radf.l1b.geotiff.complete" -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 2 --name cspp-geo-tilegen-g16-radf -e AMQPFIND_TOPIC="data.goes.g16.abi.radf.l1b.geotiff.all.complete" -v cspp-geo-abi-l1b-geotiffs:/data gitlab.ssec.wisc.edu:5555/cspp_geo/cspp-geo-web-viewer/tile_gen:latest ./run.sh
```
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 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
+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.all.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 data, remapping all products can take a really long
diff --git a/tile_gen/run.sh b/tile_gen/run.sh
index fa27094..0870e54 100755
--- a/tile_gen/run.sh
+++ b/tile_gen/run.sh
@@ -65,7 +65,7 @@ run_tile_gen() {
for product in ${G2G_PRODUCTS}; do
json_times_changed=$(python3 generate_tiles.py ${TILE_ARGS} --json-times -p ${product} -- ${out_dir} ${path})
# OUT/<product>/<product>.shp
- glob_pattern="${out_dir}/${product}/*.shp"
+ glob_pattern="${out_dir/\{product\}/${product}}/*.shp"
# Remove the /data prefix
glob_pattern="${glob_pattern/${dst_dir}\//}"
--
GitLab