diff options
author | Gary E. Miller <gem@rellim.com> | 2019-02-22 15:44:05 -0800 |
---|---|---|
committer | Gary E. Miller <gem@rellim.com> | 2019-02-22 15:44:05 -0800 |
commit | f1be39110e39e5c8d095200231a75aea3afecd57 (patch) | |
tree | 77d43f78b8235d2a9e085d80c3a2631d12505d03 /xgps | |
parent | 1db29a3fa49eca5929ba03346eac7cd49f58e86d (diff) | |
download | gpsd-f1be39110e39e5c8d095200231a75aea3afecd57.tar.gz |
deg_to_s() and calls to it: Allow negative degrees, use fabs().
Every call to deg_to_s() was preceded by a fabs(deg). So move
the fabs() into deg_to_s().
Diffstat (limited to 'xgps')
-rwxr-xr-x | xgps | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -623,7 +623,6 @@ class AISView(object): latsuff = "N" else: latsuff = "" - lat = abs(lat) lat = gps.clienthelpers.deg_to_str(self.deg_type, lat) if lon < 0: lonsuff = "W" @@ -631,7 +630,6 @@ class AISView(object): lonsuff = "E" else: lonsuff = "" - lon = abs(lon) lon = gps.clienthelpers.deg_to_str(gps.clienthelpers.deg_ddmmss, lon) return lat + latsuff + "/" + lon + lonsuff @@ -977,7 +975,7 @@ class Base(object): def update_latitude(self, data): "Update latitude" if data.mode >= gps.MODE_2D and hasattr(data, "lat"): - lat = gps.clienthelpers.deg_to_str(self.deg_type, abs(data.lat)) + lat = gps.clienthelpers.deg_to_str(self.deg_type, data.lat) if data.lat < 0: ns = 'S' else: @@ -989,7 +987,7 @@ class Base(object): def update_longitude(self, data): "Update longitude" if data.mode >= gps.MODE_2D and hasattr(data, "lon"): - lon = gps.clienthelpers.deg_to_str(self.deg_type, abs(data.lon)) + lon = gps.clienthelpers.deg_to_str(self.deg_type, data.lon) if data.lon < 0: ew = 'W' else: @@ -1029,7 +1027,7 @@ class Base(object): "Update track" if hasattr(data, "track"): return "%14s °" % ( - gps.clienthelpers.deg_to_str(self.deg_type, abs(data.track))) + gps.clienthelpers.deg_to_str(self.deg_type, data.track)) return "n/a" |