Change environment variables for mapcache timedb to match render scripts

mapcache_timedb/updater.sh

@@ -20,12 +20,13 @@ test -d "/data"
 export AMQPFIND_ARGS=${AMQPFIND_ARGS:-"-H cspp-geo-rabbit -X satellite -u guest -p guest"}
 export AMQPFIND_TOPIC=${AMQPFIND_TOPIC:-'data.goes.*.abi.*.l1b.tiles.*.complete'}
 export G2G_PRODUCTS=${G2G_PRODUCTS:-"C01 C02 C03 C04 C05 C06 C07 C08 C09 C10 C11 C12 C13 C14 C15 C16 true_color"}
-export SATELLITES=${SATELLITES:-"g16 g17"}
-export INSTRUMENTS=${INSTRUMENTS:-"abi"}
-export SECTORS=${SECTORS:-"radf radc radm1 radm2"}
-export SEED=${SEED:-"0"}  # 0 (False) or anything else (True)
-export SEED_OVERLAYS=${SEED_OVERLAYS:-"1"}  # 0 (False) or anything else (True)
-export SEED_ARGS=${SEED_ARGS:-""}
+export MAPCACHE_PRODUCTS=${MAPCACHE_PRODUCTS:$G2G_PRODUCTS}
+export MAPCACHE_PLATFORMS=${MAPCACHE_PLATFORMS:-"g16 g17"}
+export MAPCACHE_INSTRUMENTS=${MAPCACHE_INSTRUMENTS:-"abi"}
+export MAPCACHE_SECTORS=${MAPCACHE_SECTORS:-"radf radc radm1 radm2"}
+export MAPCACHE_SEED=${MAPCACHE_SEED:-"0"}  # 0 (False) or anything else (True)
+export MAPCACHE_SEED_OVERLAYS=${MAPCACHE_SEED_OVERLAYS:-"1"}  # 0 (False) or anything else (True)
+export MAPCACHE_SEED_ARGS=${MAPCACHE_SEED_ARGS:-""}
 
 json_list_to_bash() {
     blist=$1
@@ -49,7 +50,7 @@ run_mapcache_seed() {
         TIME="-D TIME=${T}Z"  # Add Z timezone
     fi
     set -x
-    su -l www-data -s /bin/bash -c "export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH; time mapcache_seed -c $CONFIG -t $TILESET -n $NPROCS -g $GRID $TIME $SEED_ARGS"
+    su -l www-data -s /bin/bash -c "export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH; time mapcache_seed -c $CONFIG -t $TILESET -n $NPROCS -g $GRID $TIME $MAPCACHE_SEED_ARGS"
     set +x
 }
 export -f run_mapcache_seed
@@ -91,7 +92,7 @@ run_time_updater() {
     python3 /work/time_updater.py "${dbfile}" "${table_name}" ${added_times}
     echo "Done updating times for: ${dbfile}"
 
-    if [[ ${SEED} -ne 0 ]]; then
+    if [[ ${MAPCACHE_SEED} -ne 0 ]]; then
         tileset="${satellite_id}_${instrument}_${data_type}_l1b_${product}"
         grid="grid_${satellite_id}_${instrument}_${data_type}"
         for t in ${added_times}; do
@@ -112,9 +113,9 @@ init_time_updater() {
     fi
 
     # Create an empty Database for every tileset we might process
-    for sat_id in ${SATELLITES}; do
-        for inst in ${INSTRUMENTS}; do
-            for sector in ${SECTORS}; do
+    for sat_id in ${MAPCACHE_PLATFORMS}; do
+        for inst in ${MAPCACHE_INSTRUMENTS}; do
+            for sector in ${MAPCACHE_SECTORS}; do
                 dbfile="${dst_dir}/mapcache_time.sqlite"
                 for product in ${G2G_PRODUCTS}; do
                     echo "Initializing database ${dbfile} for product ${product}"
@@ -126,18 +127,18 @@ init_time_updater() {
                 done
 
                 # Preseed the overlays, graticules, and basemap layers
-                if [[ $SEED_OVERLAYS -ne 0 ]]; then
+                if [[ $MAPCACHE_SEED_OVERLAYS -ne 0 ]]; then
                     grid="grid_${sat_id}_${inst}_${sector}"
 
                     echo "Seeding basemap layer"
                     tileset="${sat_id}_${inst}_basemap"
-                    SEED_ARGS="" run_mapcache_seed $tileset $grid
+                    MAPCACHE_SEED_ARGS="" run_mapcache_seed $tileset $grid
                     echo "Seeding borders layer"
                     tileset="${sat_id}_${inst}_borders"
-                    SEED_ARGS="" run_mapcache_seed $tileset $grid
+                    MAPCACHE_SEED_ARGS="" run_mapcache_seed $tileset $grid
                     echo "Seeding graticules layer"
                     tileset="${sat_id}_${inst}_graticules"
-                    SEED_ARGS="" run_mapcache_seed $tileset $grid
+                    MAPCACHE_SEED_ARGS="" run_mapcache_seed $tileset $grid
                     echo "Done seeding ${grid}'s overlay layers"
                 fi
             done