Skip to content

Commit d35cbad

Browse files
committed
Hopefully clear old bearings properly!y
1 parent 933b022 commit d35cbad

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

chasemapper/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
# Now using Semantic Versioning (https://semver.org/) MAJOR.MINOR.PATCH
1010

11-
__version__ = "1.5.7"
11+
__version__ = "1.5.8"

chasemapper/bearings.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,11 @@ def add_bearing(self, bearing):
218218
# We now have our bearing - now we need to store it
219219
self.bearing_lock.acquire()
220220

221-
self.bearings["%.4f" % _arrival_time] = _new_bearing
221+
# Try and ensure the key is going to be consistent between client and server
222+
_new_key = "%.2f" % _arrival_time
223+
_new_bearing["key"] = _new_key
224+
225+
self.bearings[_new_key] = _new_bearing
222226

223227
if _source not in self.bearing_sources:
224228
self.bearing_sources.append(_source)

static/js/bearings.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ function addBearing(timestamp, bearing, live){
122122
delete bearing.raw_doa;
123123
}
124124

125+
//console.log(timestamp);
126+
125127
bearing_store[timestamp] = bearing;
126128

127129
if (timeSeqEnabled){
@@ -193,6 +195,7 @@ function removeBearings(timestamps){
193195
if(bearing_store.hasOwnProperty(item)){
194196
bearing_store[item].line.remove();
195197
delete bearing_store[item];
198+
console.log(item);
196199
}
197200
});
198201

@@ -276,7 +279,7 @@ function initialiseBearings(){
276279
function bearingUpdate(data){
277280
// Remove any bearings that have been requested.
278281
removeBearings(data.remove);
279-
addBearing(data.add.timestamp, data.add, true);
282+
addBearing(data.add.key, data.add, true);
280283
}
281284

282285

0 commit comments

Comments
 (0)