ugps: Simplify and fix position computation from GPRMC sentence

Current code parses following GPRMC

  $GPRMC,071305.0,A,5207.76855,N,02104.022546,E,0.0,,270816,0.0,E,A*18

as

  position: 52.117947 21.67042

with this fix it's being parsed correctly as

  position: 52.129475 21.067041

Fixes https://github.com/lede-project/source/issues/279

Signed-off-by: Petr Štetiar <ynezz@true.cz>
Tested-by: Cezary Jackiewicz <cezary@eko.one.pl>

diff --git a/nmea.c b/nmea.c
index 31e016829f1bb4987c551391d0d8d534b910f316..1a7ac275af8e15e0b4101429428a0a4908f2f0ac 100644 (file)
--- a/nmea.c
+++ b/nmea.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
+#include <math.h>
 
 #include <string.h>
 #include <termios.h>
@@ -112,42 +113,27 @@ nmea_rmc_cb(void)
                ERROR("lat/lng have invalid string length %d<9, %d<10\n",
                       strlen(nmea_params[3].str), strlen(nmea_params[5].str));
        } else {
-               int latd, latm, lats;
-               int lngd, lngm, lngs;
-               float flats, flngs;
-               DEBUG(4, "position: %s, %s\n",
-                       nmea_params[3].str, nmea_params[5].str);
-               latm = atoi(&nmea_params[3].str[2]);
-               nmea_params[3].str[2] = '\0';
-               latd = atoi(nmea_params[3].str);
-               lats = atoi(&nmea_params[3].str[5]);
-               if (*nmea_params[4].str != 'N')
-                       latm *= -1;
-
-               lngm = atoi(&nmea_params[5].str[3]);
-               nmea_params[5].str[3] = '\0';
-               lngd = atoi(nmea_params[5].str);
-               lngs = atoi(&nmea_params[5].str[6]);
-               if (*nmea_params[6].str != 'E')
-                       lngm *= -1;
-
-               flats = lats;
-               flats *= 60;
-               flats /= 10000;
-
-               flngs = lngs;
-               flngs *= 60;
-               flngs /= 10000;
-
-#define ms_to_deg(x, y) (((x * 1000000) + y) / 60)
-
-               DEBUG(4, "position: %d°%d.%04d, %d°%d.%04d\n",
-                       latd, latm, lats, lngd, lngm, lngs);
-               DEBUG(4, "position: %d°%d'%.1f\" %d°%d'%.1f\"\n",
-                       latd, latm, flats, lngd, lngm, flngs);
-
-               snprintf(latitude, sizeof(latitude), "%d.%04d", latd, ms_to_deg(latm, lats));
-               snprintf(longitude, sizeof(longitude), "%d.%04d", lngd, ms_to_deg(lngm, lngs));
+               float minutes;
+               float degrees;
+               float lat = strtof(nmea_params[3].str, NULL);
+               float lon = strtof(nmea_params[5].str, NULL);
+
+               if (*nmea_params[4].str == 'S')
+                       lat *= -1.0;
+               if (*nmea_params[6].str == 'W')
+                       lon *= -1.0;
+
+               degrees = floor(lat / 100.0);
+               minutes = lat - (degrees * 100.0);
+               lat = degrees + minutes / 60.0;
+
+               degrees = floor(lon / 100.0);
+               minutes = lon - (degrees * 100.0);
+               lon = degrees + minutes / 60.0;
+
+               snprintf(latitude, sizeof(latitude), "%f", lat);
+               snprintf(longitude, sizeof(longitude), "%f", lon);
+
                DEBUG(3, "position: %s %s\n", latitude, longitude);
                gps_timestamp();
        }