Skip to content
Snippets Groups Projects
Commit 3821734f authored by Pep Martí Saumell's avatar Pep Martí Saumell
Browse files

getPos: removed copied variables

parent 0c0dd231
No related branches found
No related tags found
2 merge requests!4Resolve "Enable Standard Point Positioning (SPP) computation",!2Resolve "Enable Standard Point Positioning (SPP) computation"
......@@ -6,12 +6,9 @@ namespace GNSSUtils
const std::shared_ptr<GNSSUtils::Navigation> & _navigation,
sol_t & _sol)
{
// Define observations
std::vector<obsd_t> obs = _observations->getObservations();
// Define navigation
nav_t nav = _navigation->getNavigation();
uniqnav(&nav);
// Remove duplicated satellites
uniqnav(&(_navigation->getNavigation()));
// Define processing options
prcopt_t prcopt = prcopt_default;
......@@ -33,7 +30,9 @@ namespace GNSSUtils
// Define error msg
char msg[128]="";
int stat = pntpos(&(obs[0]), obs.size(), &nav, &prcopt, &_sol, NULL, NULL, msg);
int stat = pntpos(&(_observations->getObservations()[0]), _observations->getObservations().size(),
&(_navigation->getNavigation()),
&prcopt, &_sol, NULL, NULL, msg);
return stat;
}
......
......@@ -59,7 +59,7 @@ void Navigation::allocateEphemeris(int n_sat)
}
void Navigation::deleteEphemeris()
{
free(_nav.eph);
free(nav_.eph);
}
void Navigation::allocateGLONASSEphemeris(int n_sat)
......@@ -84,7 +84,7 @@ void Navigation::allocateGLONASSEphemeris(int n_sat)
}
void Navigation::deleteGLONASSEphemeris()
{
free(_nav->geph);
free(nav_.geph);
// if (_nav->geph)
// {
// free(_nav->geph);
......@@ -118,7 +118,7 @@ void Navigation::allocateSBASEphemeris(int n_sat)
}
void Navigation::deleteSBASEphemeris()
{
free(_nav->seph);
free(nav_.seph);
// if (_nav->seph)
// {
// free(_nav->seph);
......@@ -151,7 +151,7 @@ void Navigation::allocateAlmanac(int n_sat)
}
void Navigation::deleteAlmanac()
{
free(_nav->alm);
free(nav_.alm);
// if (_nav->alm)
// {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment