From c4b613b648fbc0683361e1434593a182eb633ec7 Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Thu, 10 Feb 2022 17:53:59 +1030 Subject: [PATCH] Add bearing entry on main page --- chasemapper/__init__.py | 2 +- chasemapper/gps.py | 7 +++++-- static/css/chasemapper.css | 8 ++++++++ static/js/bearings.js | 15 +++++++++++++++ templates/index.html | 5 +++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/chasemapper/__init__.py b/chasemapper/__init__.py index e050226..6747341 100644 --- a/chasemapper/__init__.py +++ b/chasemapper/__init__.py @@ -8,4 +8,4 @@ # Now using Semantic Versioning (https://semver.org/) MAJOR.MINOR.PATCH -__version__ = "1.3.5" +__version__ = "1.3.6" diff --git a/chasemapper/gps.py b/chasemapper/gps.py index d8d135a..8466494 100644 --- a/chasemapper/gps.py +++ b/chasemapper/gps.py @@ -171,8 +171,11 @@ class SerialGPS(object): # '12319.943281' if not dm or dm == "0": return 0.0 - - d, m = re.match(r"^(\d+)(\d\d\.\d+)$", dm).groups() + try: + d, m = re.match(r"^(\d+)(\d\d\.\d+)$", dm).groups() + except: + return 0.0 + return float(d) + float(m) / 60 def parse_nmea(self, data): diff --git a/static/css/chasemapper.css b/static/css/chasemapper.css index e4f5cfb..bc2311c 100644 --- a/static/css/chasemapper.css +++ b/static/css/chasemapper.css @@ -56,6 +56,14 @@ html, body, #map { width: 10em; } +.paramEntryLeft { + display: inline-block; + margin-left: auto; + text-align: left; + padding-right: 0.2em; + width: 10em; +} + .predictorModelValue { display: inline-block; margin-left: auto; diff --git a/static/js/bearings.js b/static/js/bearings.js index 5c6e926..6327c21 100644 --- a/static/js/bearings.js +++ b/static/js/bearings.js @@ -459,3 +459,18 @@ function calculateBearingOpacity(bearing_timestamp){ } + +function manualBearing(){ + current_bearing = parseFloat($('#bearingManualEntry').val()); + + _bearing_info = { + 'type': 'BEARING', + 'bearing_type': 'absolute', + 'source': 'EasyBearing', + 'latitude': chase_car_position.latest_data[0], + 'longitude': chase_car_position.latest_data[1], + 'bearing': current_bearing + }; + + socket.emit('add_manual_bearing', _bearing_info); +} diff --git a/templates/index.html b/templates/index.html index d4e75d5..7e7bf40 100644 --- a/templates/index.html +++ b/templates/index.html @@ -981,6 +981,11 @@
+

Manual Bearing Entry

+
+

+
+