From d82bd03c926b82dec9cc7221edfa37beec0a7178 Mon Sep 17 00:00:00 2001 From: Cody Hansen Date: Tue, 30 Jan 2024 13:50:14 -0800 Subject: [PATCH] Added Z to convertDoyToYmd to stop local timezone conversion (#1094) * Added Z to convertDoyToYmd to stop local timezone conversion * Converted to template string --- src/utilities/time.test.ts | 8 ++++---- src/utilities/time.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/utilities/time.test.ts b/src/utilities/time.test.ts index 0e49fa9278..868ef6b09b 100644 --- a/src/utilities/time.test.ts +++ b/src/utilities/time.test.ts @@ -43,10 +43,10 @@ test('convertUsToDurationString', () => { }); test('convertDoyToYmd', () => { - expect(convertDoyToYmd('2023-001T00:10:12', false)).toEqual('2023-01-01T00:10:12'); - expect(convertDoyToYmd('2023-001T00:00:00', false)).toEqual('2023-01-01T00:00:00'); - expect(convertDoyToYmd('2023-032T00:00:00', false)).toEqual('2023-02-01T00:00:00'); - expect(convertDoyToYmd('2023-048T10:32:44.123', true)).toEqual('2023-02-17T10:32:44.123'); + expect(convertDoyToYmd('2023-001T00:10:12', false)).toEqual('2023-01-01T00:10:12Z'); + expect(convertDoyToYmd('2023-001T00:00:00', false)).toEqual('2023-01-01T00:00:00Z'); + expect(convertDoyToYmd('2023-032T00:00:00', false)).toEqual('2023-02-01T00:00:00Z'); + expect(convertDoyToYmd('2023-048T10:32:44.123', true)).toEqual('2023-02-17T10:32:44.123Z'); }); test('getDaysInMonth', () => { diff --git a/src/utilities/time.ts b/src/utilities/time.ts index d858b0ca03..0248383426 100644 --- a/src/utilities/time.ts +++ b/src/utilities/time.ts @@ -85,9 +85,9 @@ export function convertDoyToYmd(doyString: string, includeMsecs = true): string padStart(`${date.getUTCDate()}`, 2, '0'), ].join('-')}T${parsedDoy.time}`; if (includeMsecs) { - return ymdString; + return `${ymdString}Z`; } - return ymdString.replace(/(\.\d+)/, ''); + return `${ymdString.replace(/(\.\d+)/, '')}Z`; } else { // doyString is already in ymd format return doyString;