mirror of
https://github.com/acamarata/solar-spa.git
synced 2026-06-30 19:04:28 +00:00
Bug fix
This commit is contained in:
parent
4dc4b3004c
commit
e0faeadcde
3 changed files with 53 additions and 57 deletions
BIN
.DS_Store
vendored
BIN
.DS_Store
vendored
Binary file not shown.
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "solar-spa",
|
||||
"version": "1.2.2",
|
||||
"version": "1.2.3",
|
||||
"description": "NREL Solar Position Algorithm (SPA) in WebAssembly",
|
||||
"main": "solar-spa.js",
|
||||
"types": "index.d.ts",
|
||||
|
|
|
|||
108
solar-spa.js
108
solar-spa.js
|
|
@ -1,10 +1,4 @@
|
|||
const spaModule = require('./spa.js');
|
||||
|
||||
let isRuntimeInitialized = false;
|
||||
|
||||
spaModule.onRuntimeInitialized = function () {
|
||||
isRuntimeInitialized = true;
|
||||
};
|
||||
const spaModuleFactory = require('./spa.js');
|
||||
|
||||
module.exports = function spa(
|
||||
date,
|
||||
|
|
@ -16,55 +10,57 @@ module.exports = function spa(
|
|||
refraction = 0.5667
|
||||
) {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!isRuntimeInitialized) {
|
||||
reject(new Error('Emscripten runtime is not initialized.'));
|
||||
return;
|
||||
const spaModule = spaModuleFactory({
|
||||
onRuntimeInitialized: () => {
|
||||
const spa_calculate = spaModule.cwrap(
|
||||
'spa_calculate_wrapper',
|
||||
'number',
|
||||
[
|
||||
'number', 'number', 'number', 'number', 'number',
|
||||
'number', 'number', 'number', 'number', 'number',
|
||||
'number', 'number', 'number', 'number', 'number'
|
||||
]
|
||||
);
|
||||
|
||||
const spa_free_result = spaModule.cwrap(
|
||||
'spa_free_result',
|
||||
null,
|
||||
['number']
|
||||
);
|
||||
|
||||
const year = date.getFullYear();
|
||||
const month = date.getMonth() + 1;
|
||||
const day = date.getDate();
|
||||
const hour = date.getHours();
|
||||
const minute = date.getMinutes();
|
||||
const second = date.getSeconds();
|
||||
const timezone = -date.getTimezoneOffset() / 60;
|
||||
const slope = 0;
|
||||
const azm_rotation = 0;
|
||||
|
||||
const resultPtr = spa_calculate(
|
||||
year, month, day, hour, minute, second, timezone,
|
||||
latitude, longitude, elevation, pressure, temperature,
|
||||
slope, azm_rotation, refraction
|
||||
);
|
||||
|
||||
const result = {
|
||||
zenith: spaModule.getValue(resultPtr, 'double'),
|
||||
azimuth: spaModule.getValue(resultPtr + 8, 'double'),
|
||||
incidence: spaModule.getValue(resultPtr + 16, 'double'),
|
||||
sunrise: spaModule.getValue(resultPtr + 24, 'double'),
|
||||
sunset: spaModule.getValue(resultPtr + 32, 'double'),
|
||||
solar_noon: spaModule.getValue(resultPtr + 40, 'double'),
|
||||
sun_transit_alt: spaModule.getValue(resultPtr + 48, 'double'),
|
||||
};
|
||||
|
||||
spa_free_result(resultPtr);
|
||||
|
||||
resolve(result);
|
||||
},
|
||||
});
|
||||
if (spaModule.calledRun) {
|
||||
spaModule.onRuntimeInitialized();
|
||||
}
|
||||
|
||||
const spa_calculate = spaModule.cwrap(
|
||||
'spa_calculate_wrapper',
|
||||
'number',
|
||||
[
|
||||
'number', 'number', 'number', 'number', 'number',
|
||||
'number', 'number', 'number', 'number', 'number',
|
||||
'number', 'number', 'number', 'number', 'number'
|
||||
]
|
||||
);
|
||||
|
||||
const spa_free_result = spaModule.cwrap(
|
||||
'spa_free_result',
|
||||
null,
|
||||
['number']
|
||||
);
|
||||
|
||||
const year = date.getFullYear();
|
||||
const month = date.getMonth() + 1;
|
||||
const day = date.getDate();
|
||||
const hour = date.getHours();
|
||||
const minute = date.getMinutes();
|
||||
const second = date.getSeconds();
|
||||
const timezone = -date.getTimezoneOffset() / 60;
|
||||
const slope = 0;
|
||||
const azm_rotation = 0;
|
||||
|
||||
const resultPtr = spa_calculate(
|
||||
year, month, day, hour, minute, second, timezone,
|
||||
latitude, longitude, elevation, pressure, temperature,
|
||||
slope, azm_rotation, refraction
|
||||
);
|
||||
|
||||
const result = {
|
||||
zenith: spaModule.getValue(resultPtr, 'double'),
|
||||
azimuth: spaModule.getValue(resultPtr + 8, 'double'),
|
||||
incidence: spaModule.getValue(resultPtr + 16, 'double'),
|
||||
sunrise: spaModule.getValue(resultPtr + 24, 'double'),
|
||||
sunset: spaModule.getValue(resultPtr + 32, 'double'),
|
||||
solar_noon: spaModule.getValue(resultPtr + 40, 'double'),
|
||||
sun_transit_alt: spaModule.getValue(resultPtr + 48, 'double'),
|
||||
};
|
||||
|
||||
spa_free_result(resultPtr);
|
||||
|
||||
resolve(result);
|
||||
});
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue