Split eph into epx and epy internally...

...but still report eph by re-mixing them in the JSON dumper. This was
worth doing because all regression tests still pass, showing that
visible behavior for old-protocol users gas not changed.

1 files changed, 9 insertions, 2 deletions

diff --git a/xgps.c b/xgps.c
index 3924b41d..f4b4ddab 100644
--- a/xgps.c
+++ b/xgps.c
@@ -53,6 +53,12 @@
 #include "gps.h"
 #include "gpsdclient.h"
 
+/*
+ * FIXME: use here is a minor bug, should report epx and epy separately.
+ * How to mix together epx and epy to get a horizontal circular error.
+ */
+#define EMIX(x, y)	(((x) > (y)) ? (x) : (y))
+
 /* This code used to live in display.c */
 
 #define RM		20
@@ -950,9 +956,10 @@ update_panel(struct gps_data_t *gpsdata, char *message,
 		XmTextFieldSetString(text_6, s);
 	} else
 		XmTextFieldSetString(text_6, "n/a");
-	if (isnan(gpsdata->fix.eph)==0) {
+	/* FIXME: Someday report epx and epy */
+	if (isnan(gpsdata->fix.epx)==0) {
 		(void)snprintf(s, sizeof(s), "%f %s",
-		    gpsdata->fix.eph * altunits->factor,
+		    EMIX(gpsdata->fix.epx, gpsdata->fix.epy) * altunits->factor,
 		    altunits->legend);
 		XmTextFieldSetString(text_7, s);
 	} else