Split epe into eph and sep.

Try to do it with forward and backward compatibility, which is
challenging with current miscojson.

Sometimes epe was used to 2D estimated erro.  Sometimes for 3D error.
So make it explicit eph is 2D, and sep is 3D.

1 files changed, 100 insertions, 54 deletions

diff --git a/man/gpsd_json.xml b/man/gpsd_json.xml
index 1c868b61..98fcdc96 100644
--- a/man/gpsd_json.xml
+++ b/man/gpsd_json.xml
@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-clause
 <!ENTITY gpsdsock	 "/var/run/gpsd.sock">
 ]>
 <refentry id='gpsd_json.5'>
-<refentryinfo><date>17 Jun 2018</date></refentryinfo>
+<refentryinfo><date>23 Mar 2019</date></refentryinfo>
 <refmeta>
 <refentrytitle>gpsd_json</refentrytitle>
 <manvolnum>5</manvolnum>
@@ -135,98 +135,134 @@ Others may be reported or not depending on the fix quality.</para>
         is not 2 or 3.</entry>
 </row>
 <row>
-	<entry>ept</entry>
+	<entry>alt</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Estimated timestamp error (%f, seconds, 95% confidence).
-        Present if time is present.</entry>
+        <entry>Altitude in meters. Present if mode is 3.</entry>
 </row>
 <row>
-	<entry>lat</entry>
+	<entry>climb</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Latitude in degrees: +/- signifies North/South.  Present
-        when mode is 2 or 3.</entry>
+        <entry>Climb (positive) or sink (negative) rate, meters per
+	second.</entry>
 </row>
 <row>
-	<entry>lon</entry>
+	<entry>epc</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Longitude in degrees: +/- signifies East/West. Present
-        when mode is 2 or 3.</entry>
+        <entry>Estimated climb error in meters per second. Present
+        if consecutive 3D fixes.
+        Assumed to be 95% confidence, but many GPS do not specify.
+        </entry>
 </row>
 <row>
-	<entry>alt</entry>
+	<entry>epd</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Altitude in meters. Present if mode is 3.</entry>
+        <entry>Estimated track (direction) error in degrees. Present if
+        sonsecutive 2D fixes.
+        Assumed to be 95% confidence, but many GPS do not specify.
+        </entry>
+</row>
+<row>
+	<entry>eph</entry>
+	<entry>No</entry>
+	<entry>numeric</entry>
+        <entry>Estimated horizontal Position (2D) Error in meters.
+        Also known as Estimated Position Error (epe). Present
+        if mode is 2D or 3D and DOPs can be calculated from the satellite
+        view. Assumed to be 95% confidence, but many GPS do not specify.
+        </entry>
+</row>
+<row>
+	<entry>ept</entry>
+	<entry>No</entry>
+	<entry>numeric</entry>
+        <entry>Estimated timestamp error (%f, seconds, 95% confidence).
+        Present if time is present.</entry>
+</row>
+<row>
+	<entry>epv</entry>
+	<entry>No</entry>
+	<entry>numeric</entry>
+        <entry>Estimated vertical error in meters. Present
+        if mode is 3 and DOPs can be calculated from the satellite
+        view. Assumed to be 95% confidence, but many GPS do not specify.
+        </entry>
 </row>
 <row>
 	<entry>epx</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Longitude error estimate in meters, 95% confidence. Present
-        if mode is 2 or 3 and DOPs can be calculated from the satellite
-        view.</entry>
+        <entry>Longitude error estimate in meters. Present
+        if mode is 2D or 3D and DOPs can be calculated from the satellite
+        view. Assumed to be 95% confidence, but many GPS do not specify.
+        </entry>
 </row>
 <row>
 	<entry>epy</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Latitude error estimate in meters, 95% confidence. Present
+        <entry>Latitude error estimate in meters. Present
         if mode is 2 or 3 and DOPs can be calculated from the satellite
-        view.</entry>
+        view. Assumed to be 95% confidence, but many GPS do not specify.
+        </entry>
 </row>
 <row>
 	<entry>epv</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Estimated vertical error in meters, 95% confidence. Present
+        <entry>Estimated vertical error in meters. Present
         if mode is 3 and DOPs can be calculated from the satellite
-        view.</entry>
+        view. Assumed to be 95% confidence, but many GPS do not specify.
+        </entry>
 </row>
 <row>
-	<entry>track</entry>
+	<entry>eps</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Course over ground, degrees from true north.</entry>
+        <entry>Estimated speed error in meters per second.  Present
+        for consecutive 2D or 3D fixes.
+        Assumed to be 95% confidence, but many GPS do not specify.
+        </entry>
 </row>
 <row>
-	<entry>magtrack</entry>
+	<entry>lat</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Course over ground, degrees magnetic.</entry>
+        <entry>Latitude in degrees: +/- signifies North/South.  Present
+        when mode is 2 or 3.</entry>
 </row>
 <row>
-	<entry>speed</entry>
-	<entry>No</entry>
-	<entry>numeric</entry>
-        <entry>Speed over ground, meters per second.</entry>
+	<entry>leapseconds</entry>
+	<entry>integer</entry>
+        <entry><para>Current leap seconds.</para></entry>
 </row>
 <row>
-	<entry>climb</entry>
+	<entry>lon</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Climb (positive) or sink (negative) rate, meters per
-	second.</entry>
+        <entry>Longitude in degrees: +/- signifies East/West. Present
+        when mode is 2 or 3.</entry>
 </row>
 <row>
-	<entry>epd</entry>
+	<entry>track</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Direction error estimate in degrees, 95% confidence.</entry>
+        <entry>Course over ground, degrees from true north.</entry>
 </row>
 <row>
-	<entry>eps</entry>
+	<entry>magtrack</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Speed error estinmate in meters/sec, 95% confidence.</entry>
+        <entry>Course over ground, degrees magnetic.</entry>
 </row>
 <row>
-	<entry>epc</entry>
+	<entry>speed</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Climb/sink error estimate in meters/sec, 95% confidence.</entry>
+        <entry>Speed over ground, meters per second.</entry>
 </row>
 <row>
 	<entry>ecefx</entry>
@@ -276,6 +312,15 @@ Others may be reported or not depending on the fix quality.</para>
 	<entry>numeric</entry>
         <entry>ECEF velocity error in meters/second.</entry>
 </row>
+<row>
+	<entry>sep</entry>
+	<entry>No</entry>
+	<entry>numeric</entry>
+        <entry>Estimated Spherical (3D) Position Error in meters.
+         Present if mode is 3D and DOPs can be calculated from the satellite
+        view. Assumed to be 95% confidence, but many GPS do not specify.
+        </entry>
+</row>
 
 </tbody>
 </tgroup>
@@ -335,26 +380,27 @@ yet, only the "class" field will reliably be present.</para>
 	fractional part of up to .001sec precision.</entry>
 </row>
 <row>
-	<entry>xdop</entry>
+	<entry>gdop</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Longitudinal dilution of precision, a dimensionless
-	factor which should be multiplied by a base UERE to get an
-	error estimate.</entry>
+        <entry>Geometric (hyperspherical) dilution of precision, a
+        combination of PDOP and TDOP.  A dimensionless factor which
+        should be multiplied by a base UERE
+        to get an error estimate.</entry>
 </row>
 <row>
-	<entry>ydop</entry>
+	<entry>hdop</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Latitudinal dilution of precision, a dimensionless
-	factor which should be multiplied by a base UERE to get an
-	error estimate.</entry>
+        <entry>Horizontal dilution of precision, a dimensionless
+	factor which should be multiplied by a base UERE to get a
+	circular error estimate.</entry>
 </row>
 <row>
-	<entry>vdop</entry>
+	<entry>pdop</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Altitude dilution of precision, a dimensionless
+        <entry>Position (spherical/3D)  dilution of precision, a dimensionless
 	factor which should be multiplied by a base UERE to get an
 	error estimate.</entry>
 </row>
@@ -367,26 +413,26 @@ yet, only the "class" field will reliably be present.</para>
 	error estimate.</entry>
 </row>
 <row>
-	<entry>hdop</entry>
+	<entry>vdop</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Horizontal dilution of precision, a dimensionless
-	factor which should be multiplied by a base UERE to get a
-	circular error estimate.</entry>
+        <entry>Vertical (altitude) dilution of precision, a dimensionless
+	factor which should be multiplied by a base UERE to get an
+	error estimate.</entry>
 </row>
 <row>
-	<entry>pdop</entry>
+	<entry>xdop</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Spherical dilution of precision, a dimensionless
+        <entry>Longitudinal dilution of precision, a dimensionless
 	factor which should be multiplied by a base UERE to get an
 	error estimate.</entry>
 </row>
 <row>
-	<entry>gdop</entry>
+	<entry>ydop</entry>
 	<entry>No</entry>
 	<entry>numeric</entry>
-        <entry>Hyperspherical dilution of precision, a dimensionless
+        <entry>Latitudinal dilution of precision, a dimensionless
 	factor which should be multiplied by a base UERE to get an
 	error estimate.</entry>
 </row>