Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

Update mergeConfig to handle multiple processes and sub dirs

ZachTRice9d6475126818
diff --git a/tasks/build/mergeConfig.js b/tasks/build/mergeConfig.js
index ebb0a789c..8ec596d76 100644
--- a/tasks/build/mergeConfig.js
+++ b/tasks/build/mergeConfig.js
@@ -25,28 +25,35 @@ if (!argv.inputDir && !argv.outputFile) {
throw new Error('Invalid number of arguments')
}
-const inputDir = argv.inputDir
-const outputFile = argv.outputFile
-
const conf = {}
let fileCount = 0
async function main () {
- const files = fs.readdirSync(inputDir)
+ const inputDir = argv.inputDir
+ const outputFile = argv.outputFile
+ await mergeFiles(inputDir)
+
+ fs.writeFileSync(outputFile, JSON.stringify(conf, null, 2), 'utf-8')
+
+ console.warn(`${prog}: ${fileCount} file(s) merged into ${path.basename(outputFile)}`)
+}
+
+async function mergeFiles (inputDir) {
+ const files = await fs.readdirSync(inputDir)
for (const file of files) {
try {
- if (!file.endsWith('.json')) return
- fileCount += 1
- const data = JSON.parse(fs.readFileSync(path.join(inputDir, file), 'utf-8'))
- await dictMerge(conf, data)
+ if (file.endsWith('.json')) {
+ fileCount += 1
+ const data = JSON.parse(fs.readFileSync(path.join(inputDir, file), 'utf-8'))
+ await dictMerge(conf, data)
+ } else if (fs.existsSync(path.join(inputDir, file)) && fs.lstatSync(path.join(inputDir, file)).isDirectory()) {
+ subDir = path.join(inputDir, file)
+ await mergeFiles(subDir)
+ }
} catch (error) {
throw new Error(`ERROR: ${path.join(inputDir, file)}: ${error.message}`)
}
}
-
- fs.writeFileSync(outputFile, JSON.stringify(conf, null, 2), 'utf-8')
-
- console.warn(`${prog}: ${fileCount} file(s) merged into ${path.basename(outputFile)}`)
}
main().catch((err) => {
diff --git a/tasks/buildOptions.sh b/tasks/buildOptions.sh
index c6dc01047..3564cb37a 100755
--- a/tasks/buildOptions.sh
+++ b/tasks/buildOptions.sh
@@ -57,14 +57,14 @@ mkdir -p "$BUILD_DIR/colormaps"
# --config "$OPT_DIR/$OPT_SUBDIR/config.json" \
# --getcapabilities "$OPT_DIR/$OPT_SUBDIR/gc"`
-# # TODO: Optimize performance of this script
-# # Get metadata for files in layerOrder.json and combine this data into 1 file
-# rm -rf "$OPT_DIR/$OPT_SUBDIR/layer-metadata"
-# mkdir -p "$OPT_DIR/$OPT_SUBDIR/layer-metadata"
-# `node $SCRIPTS_DIR/getVisMetadata.js \
-# --features "$BUILD_DIR/features.json" \
-# --layerOrder "$BUILD_DIR/config/wv.json/layerOrder.json" \
-# --layerMetadata "$OPT_DIR/$OPT_SUBDIR/layer-metadata/all.json"`
+ # TODO: Optimize performance of this script
+ # Get metadata for files in layerOrder.json and combine this data into 1 file
+ # rm -rf "$OPT_DIR/$OPT_SUBDIR/layer-metadata"
+ # mkdir -p "$OPT_DIR/$OPT_SUBDIR/layer-metadata"
+ # `node $SCRIPTS_DIR/getVisMetadata.js \
+ # --features "$BUILD_DIR/features.json" \
+ # --layerOrder "$BUILD_DIR/config/wv.json/layerOrder.json" \
+ # --layerMetadata "$OPT_DIR/$OPT_SUBDIR/layer-metadata/all.json"`
# fi
# Validate layers in wv.json with a JSON schema
@@ -79,6 +79,7 @@ fi
# TODO: Fix sometimes the following error is thrown:
# TypeError: Converting circular structure to JSON
# extractConfigFromWMTS.js:85:11
+# this is coming from an issue in getCapabilities.js
# Run extractConfigFromWMTS.js script with config.json
if [ -e "$BUILD_DIR/config.json" ] ; then
`node $SCRIPTS_DIR/extractConfigFromWMTS.js \
@@ -128,14 +129,15 @@ if [ -e "$OPT_DIR/$OPT_SUBDIR/layer-metadata/all.json" ] ; then
cp "$OPT_DIR/$OPT_SUBDIR/layer-metadata/all.json" "$BUILD_DIR/config/wv.json/layer-metadata.json"
fi
-# Run mergeConfig.js on all directories in /config
+# Run mergeConfig.js on each directory in /config containing .json files
+# This creates on palettes-custom.json and wv.json
configs=$(ls "$BUILD_DIR/config")
for config in $configs; do
case $config in
*.json)
- `node $SCRIPTS_DIR/mergeConfig.js \
- --inputDir "$BUILD_DIR/config/$config" \
- --outputFile "$DEST_DIR/config/$config"`
+ bash -c "node $SCRIPTS_DIR/mergeConfig.js \
+ --inputDir '$BUILD_DIR/config/$config' \
+ --outputFile '$DEST_DIR/config/$config'"
;;
*)
cp -r "$BUILD_DIR/config/$config" "$DEST_DIR/config/$config"