HorlogeSkynet/GINPA
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Corrige formule de conversion

Browse Source
This commit is contained in:
Yann Caumartin 2017-08-01 22:48:21 +02:00
parent 9556b71ca5
commit 222c95cbad
1 changed files with 17 additions and 3 deletions

20
Modele/conversion.c

@ -12,7 +12,7 @@ void conversionCoordonneesPixels(sfVector2f *const destinationPix, const Coordon
{
const double ratio = getRatio(echelle);
double diff;
if ((sourceGPS->lon < 0 && pointCentral->lon < 0) || (sourceGPS->lon > 0 && pointCentral->lon > 0))
if (fabs(sourceGPS->lon - pointCentral->lon) < 180)
{
diff = sourceGPS->lon - pointCentral->lon;
}
@ -20,11 +20,25 @@ void conversionCoordonneesPixels(sfVector2f *const destinationPix, const Coordon
{
if (pointCentral->lon<0)
{
diff = 360 + fabs(pointCentral->lon) - fabs(sourceGPS->lon);
if(sourceGPS->lon > 0)
{
diff = sourceGPS->lon - 360 - pointCentral->lon;
}
else
{
diff = sourceGPS->lon - pointCentral->lon;
}
}
else
{
diff = 360 - fabs(pointCentral->lon) - fabs(sourceGPS->lon);
if(sourceGPS->lon < 0)
{
diff = 360 + sourceGPS->lon - pointCentral->lon;
}
else
{
diff = pointCentral->lon - sourceGPS->lon;
}
}
}