diff --git a/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js b/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js index badb7b12e293fc19b61ee4e1942135221f250ab6..49799afe457a1b27599f6df47a5803e4674f8feb 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/utils/unit.converter.js @@ -133,9 +133,18 @@ const UnitConverter = { prpInput = prpInput * (isNegative ? -1 : 1); const degrees = prpInput * 180 / Math.PI; if (isDegree) { - const dd = Math.floor(prpInput * 180 / Math.PI); - const mm = Math.floor((degrees - dd) * 60); - const ss = round((degrees - dd - (mm / 60)) * 3600, 4); + let dd = Math.floor(prpInput * 180 / Math.PI); + let mm = Math.floor((degrees - dd) * 60); + let ss = round((degrees - dd - (mm / 60)) * 3600, 4); + if(ss>59) { + mm = mm+1; + ss = 0; + } + if(mm > 59) { + dd = dd+1; + mm = 0 + } + return (isNegative ? '-' : '') + (dd < 10 ? `0${dd}` : `${dd}`) + 'd' + (mm < 10 ? `0${mm}` : `${mm}`) + 'm' + (ss < 10 ? `0${ss}` : `${ss}`) + 's'; } else { const hh = Math.floor(degrees / 15); @@ -260,7 +269,8 @@ const UnitConverter = { const minute = minuteSplit[0]; const second = minuteSplit[1].replace('s', ''); if (isDegree) { - radian = this.convertToRadians((degreeHour * 1 + minute / 60 + second / 3600)); + radian = this.convertToRadians((degreeHour * 1 + minute / 60 + (second) / 3600)); + console.log(angle, radian) radian = isNegativeAngle ? radian * -1 : radian; } else { radian = this.convertToRadians((degreeHour * 15 + minute / 4 + second / 240));