From 0c23bad0a082c2500f73df211b698558b4848c92 Mon Sep 17 00:00:00 2001 From: tariqksoliman Date: Wed, 27 Mar 2024 15:14:04 -0700 Subject: [PATCH] #523 Chronice fix second loss --- private/api/chronice.py | 3 ++- src/essence/Tools/Shade/ShadeTool.js | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/private/api/chronice.py b/private/api/chronice.py index 473c791e..76011298 100644 --- a/private/api/chronice.py +++ b/private/api/chronice.py @@ -80,7 +80,8 @@ def chronice(body, target, fromFormat, time): def sclk2lmst(sclk, target): if target == 'msl': s = sclk.split('/')[1].split(':') - return f'SOL-{s[0]}M{s[1]}:{s[2]}:{s[3]}' + seconds = str(round(float(s[3] + '.' + s[4]))).zfill(2) + return f'SOL-{s[0]}M{s[1]}:{s[2]}:{seconds}' def lmst2sclk(lmst, target, partition = 1): if target == 'msl': s = lmst.replace(' ', ':').replace('-', ':').replace('M', ':').split(':') diff --git a/src/essence/Tools/Shade/ShadeTool.js b/src/essence/Tools/Shade/ShadeTool.js index 43cc821b..7137a340 100644 --- a/src/essence/Tools/Shade/ShadeTool.js +++ b/src/essence/Tools/Shade/ShadeTool.js @@ -55,6 +55,7 @@ let ShadeTool = { }, sunColor: '#d2db58', earthColor: '#58dbb8', + _lastConvertedMs: '000', initialize: function () { this.vars = L_.getToolVars('shade') @@ -859,7 +860,10 @@ let ShadeTool = { body: body, target: options.observer, from: 'utc', - time: TimeControl.getEndTime(), + time: TimeControl.getEndTime().replace( + '.000Z', + `.${ShadeTool._lastConvertedMs}Z` + ), }, function (s) { try { @@ -943,6 +947,7 @@ let ShadeTool = { 'black' ) } else { + ShadeTool._lastConvertedMs = s.result.split('.')[1] || '000' TimeControl.setTime( TimeControl.getStartTime(), s.result.replace(' ', 'T') + 'Z'