Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

Fix processTemporalLayer datetime bugs

ZachTRicefe54f29b593d
diff --git a/tasks/build-options/processTemporalLayer.js b/tasks/build-options/processTemporalLayer.js
index 281927f60..66f472411 100644
--- a/tasks/build-options/processTemporalLayer.js
+++ b/tasks/build-options/processTemporalLayer.js
@@ -13,7 +13,6 @@ class ValueError extends Error {
async function processTemporalLayer (wvLayer, value) {
const dateFormat = 'YYYY-MM-DD'
- const timeFormat = 'HH:mm:ss'
const dateTimeFormat = 'YYYY-MM-DD HH:mm:ss'
try {
const ranges = toList(value)
@@ -42,21 +41,13 @@ async function processTemporalLayer (wvLayer, value) {
) {
startDate = moment.min(startDate, moment(start, dateFormat))
endDate = moment.max(endDate, moment(end, dateFormat))
- if (startDate) {
- const startDateParse = moment(start, dateFormat)
- dateRangeStart.push(
- `${startDateParse.format(dateFormat)}T${startDateParse.format(
- timeFormat
- )}Z`
- )
+ if (start) {
+ startDate = moment(start, dateFormat).format('YYYY-MM-DDTHH:mm:ss[Z]')
+ dateRangeStart.push(startDate)
}
- if (endDate) {
- const endDateParse = moment(end, dateFormat)
- dateRangeEnd.push(
- `${endDateParse.format(dateFormat)}T${endDateParse.format(
- timeFormat
- )}Z`
- )
+ if (end) {
+ endDate = moment(end, dateFormat).format('YYYY-MM-DDTHH:mm:ss[Z]')
+ dateRangeEnd.push(endDate)
}
if (interval !== 'P1D') {
endDate = moment(endDate).add(moment.duration(interval))
@@ -66,32 +57,27 @@ async function processTemporalLayer (wvLayer, value) {
rangeInterval.push(match)
} else {
// Subdaily Layers
- const startTime = start.replace('T', ' ').replace('Z', '')
- const endTime = end.replace('T', ' ').replace('Z', '')
- startDate = moment.min(startDate, moment(startTime, dateTimeFormat))
- endDate = moment.max(endDate, moment(endTime, dateTimeFormat))
+ startDate = moment(start, dateTimeFormat).format('YYYY-MM-DDTHH:mm:ss[Z]')
+ endDate = moment(end, dateTimeFormat).format('YYYY-MM-DDTHH:mm:ss[Z]')
- if (startDate) {
- const startTimeParse = moment(startTime, dateTimeFormat)
- dateRangeStart.push(startTimeParse.format(`${dateFormat}T${timeFormat}Z`))
+ if (start) {
+ dateRangeStart.push(startDate)
}
- if (endDate) {
- const endTimeParse = moment(endTime, dateTimeFormat)
- dateRangeEnd.push(endTimeParse.format(`${dateFormat}T${timeFormat}Z`))
+ if (end) {
+ dateRangeEnd.push(endDate)
}
rangeInterval.push(interval.match(/\d+/)[0])
}
- wvLayer.startDate = moment(startDate).format(`${dateFormat}T${timeFormat}Z`)
- if (!endDate.isSame(moment.min())) {
- wvLayer.endDate = moment(endDate).format(`${dateFormat}T${timeFormat}Z`)
- }
+ wvLayer.startDate = dateRangeStart[0]
+ wvLayer.endDate = dateRangeEnd[dateRangeEnd.length - 1]
+
if (dateRangeStart.length && dateRangeEnd.length) {
wvLayer.dateRanges = dateRangeStart.map((s, i) => ({
startDate: s,
endDate: dateRangeEnd[i],
- dateInterval: rangeInterval[i]
+ dateInterval: rangeInterval[i][0]
}))
}
}
diff --git a/tasks/buildOptions.sh b/tasks/buildOptions.sh
index a76fe3733..07a4cb69f 100755
--- a/tasks/buildOptions.sh
+++ b/tasks/buildOptions.sh
@@ -47,25 +47,25 @@ fi
mkdir -p "$DEST_DIR/config"
mkdir -p "$BUILD_DIR/colormaps"
-# If $FETCH_GC is set, make various API requests
-if [ "$FETCH_GC" ] ; then
- # TODO: Fix axios fetch timeouts
- # Fetch GC files and create colormaps, vectordata and vectorstyle files
- rm -rf "$OPT_DIR/$OPT_SUBDIR/gc/*"
- rm -rf "$OPT_DIR/$OPT_SUBDIR/colormaps/gc/*"
- `node $SCRIPTS_DIR/getCapabilities.js \
- --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"`
-fi
+# # If $FETCH_GC is set, make various API requests
+# if [ "$FETCH_GC" ] ; then
+# # TODO: Fix axios fetch timeouts
+# # Fetch GC files and create colormaps, vectordata and vectorstyle files
+# rm -rf "$OPT_DIR/$OPT_SUBDIR/gc/*"
+# rm -rf "$OPT_DIR/$OPT_SUBDIR/colormaps/gc/*"
+# `node $SCRIPTS_DIR/getCapabilities.js \
+# --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"`
+# fi
# Validate layers in wv.json with a JSON schema
`node $SCRIPTS_DIR/validateConfigs.js \
@@ -76,7 +76,7 @@ if [ -e "$BUILD_DIR/features.json" ] ; then
cp "$BUILD_DIR/features.json" "$BUILD_DIR/config/wv.json/_features.json"
fi
-# TODO: Fix _wmts files incorrect formatting for dateRanges.dateInterval and missing endDate
+# TODO: Fix _wmts files subdaily time formatting and sources
# Run extractConfigFromWMTS.js script with config.json
if [ -e "$BUILD_DIR/config.json" ] ; then
`node $SCRIPTS_DIR/extractConfigFromWMTS.js \