Fix consistency in tile generation file naming

mapserver/mapfiles/goes16_abi_fldk_l1b.map → mapserver/mapfiles/g16_abi_fldk_l1b.map

@@ -23,7 +23,7 @@ MAP
   LAYER
     NAME "true_color_index"
     TYPE TILEINDEX
-    DATA "/data/tiles/goes/g16/abi/true_color/true_color"
+    DATA "/data/tiles/g16/abi/radf/true_color/true_color"
   END
 
   LAYER
@@ -33,6 +33,64 @@ MAP
     TILEINDEX "true_color_index"
     # Comment below to default to transparency
     # OFFSITE 0 0 0
+    PROJECTION
+      "auto"
+    END
+    METADATA
+      "wms_title" "GOES-16 ABI True Color"
+      "wms_extent" "-180 -90 180 90"
+      "wms_timeextent" "2017-01-01/2020-12-31"
+      "wms_timeformat" "YYYY-MM-DDTHH:MM:SS"
+      "wms_timeitem" "time" # time is a metadata item
+      "wms_timedefault" "2019-12-12T19:20:18"
+      "wms_enable_request" "*"
+    END
+    FILTER (`[time]` = `2019-12-12T19:20:18`)
+  END # goes raster layer ends here
+
+  ######################
+  # True Color Lat/Lon #
+  ######################
+
+  LAYER
+    NAME "true_color_index_ll"
+    TYPE TILEINDEX
+    DATA "/data/tiles/g16/abi/radf_ll/true_color/true_color_LL"
+  END
+
+  LAYER
+    NAME    "true_color_ll"
+    TYPE    RASTER
+    TILEITEM "location"
+    TILEINDEX "true_color_index_ll"
+    # Comment below to default to transparency
+    # OFFSITE 0 0 0
+    PROJECTION
+      "init=epsg:4326"
+    END
+    METADATA
+      "wms_title" "GOES-16 ABI True Color"
+      "wms_extent" "-180 -90 180 90"
+      "wms_timeextent" "2017-01-01/2020-12-31"
+      "wms_timeformat" "YYYY-MM-DDTHH:MM:SS"
+      "wms_timeitem" "time" # time is a metadata item
+      "wms_timedefault" "2019-12-12T19:20:18"
+      "wms_enable_request" "*"
+    END
+    FILTER (`[time]` = `2019-12-12T19:20:18`)
+  END # goes raster layer ends here
+
+  ###################
+  # True Color Fake #
+  ###################
+
+  LAYER
+    NAME    "true_color_test"
+    TYPE    RASTER
+    TILEITEM "location"
+    TILEINDEX "true_color_index"
+    # Comment below to default to transparency
+    # OFFSITE 0 0 0
     METADATA
       "wms_title" "GOES-16 ABI True Color"
       "wms_extent" "-180 -90 180 90"

tile_gen/generate_tiles.py

@@ -62,7 +62,7 @@ def main():
     parser = argparse.ArgumentParser(description="Take input geotiffs and generate mapserver compatible tiles.")
     parser.add_argument('--remap', action='store_true',
                         help="Remap input geotiffs to EPSG:4326")
-    parser.add_argument('--remap-suffix', default='_LL.tif',
+    parser.add_argument('--remap-suffix', default='_ll.tif',
                         help="Replace 'tif' with provided suffix when geotiffs are remapped.")
     parser.add_argument('-p', '--products', nargs="*",
                         help="Product names to group together in each "

tile_gen/run.sh

@@ -53,10 +53,14 @@ run_tile_gen() {
     if [[ ${TILE_ARGS} == *"--remap"* ]]; then
         echo "Adding '_ll' prefix to tile output directory because of remapping"
         out_dir="${out_dir}_ll"
+        mkdir -p ${out_dir}
+        # add string formatting portion to separate add 'product' sub-directory
+        out_dir="${out_dir}/{product}_ll"
+    else
+        mkdir -p ${out_dir}
+        # add string formatting portion to separate add 'product' sub-directory
+        out_dir="${out_dir}/{product}"
     fi
-    mkdir -p ${out_dir}
-    # add string formatting portion to separate add 'product' sub-directory
-    out_dir="${out_dir}/{product}"
     echo "Generating tiles in directory: ${out_dir}"
     python3 generate_tiles.py ${TILE_ARGS} -p ${G2G_PRODUCTS} -- ${out_dir} ${path}
     # OUT/<product>/<product>.shp