From ce9da8d00314a0cec83e8452b24c17a76300ef0f Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Mon, 29 Jan 2024 22:29:43 -0500 Subject: [PATCH] More fixes. --- owrx/markers.py | 8 +++++--- owrx/source/__init__.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/owrx/markers.py b/owrx/markers.py index d4c9e3df..396a6a42 100644 --- a/owrx/markers.py +++ b/owrx/markers.py @@ -175,7 +175,7 @@ class Markers(object): # Update station markers that have transmissions for key in tx.keys(): r = tx[key] - map.updateLocation(r.getId(), r, r.getMode(), permanent) + map.updateLocation(r.getId(), r, r.getMode(), timestamp=permanent) self.txmarkers[key] = r # Done with the schedule @@ -200,7 +200,7 @@ class Markers(object): # Update receiver markers that are online for key in rx.keys(): r = rx[key] - map.updateLocation(r.getId(), r, r.getMode(), permanent) + map.updateLocation(r.getId(), r, r.getMode(), timestamp=permanent) self.rxmarkers[key] = r # Done updating receivers norx = None @@ -244,8 +244,10 @@ class Markers(object): # Update given markers on the map def updateMap(self, markers): + # Create a timestamp far into the future, for permanent markers + permanent = datetime.utcnow() + timedelta(weeks=500) for r in markers.values(): - Map.getSharedInstance().updateLocation(r.getId(), r, r.getMode(), permanent) + Map.getSharedInstance().updateLocation(r.getId(), r, r.getMode(), timestamp=permanent) # Scrape online databases, updating cache file def updateCache(self): diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py index f15b7f41..15bd36b1 100644 --- a/owrx/source/__init__.py +++ b/owrx/source/__init__.py @@ -15,7 +15,7 @@ from owrx.property.filter import ByLambda from owrx.form.input import Input, TextInput, NumberInput, CheckboxInput, ModesInput, ExponentialInput, DropdownInput, Option from owrx.form.input.converter import Converter, OptionalConverter, IntConverter from owrx.form.input.device import GainInput, SchedulerInput, WaterfallLevelsInput -from owrx.form.input.validator import RequiredValidator, Range, RangeListValidator +from owrx.form.input.validator import RequiredValidator, Range, RangeValidator, RangeListValidator from owrx.form.section import OptionalSection from owrx.feature import FeatureDetector from owrx.log import LogPipe, HistoryHandler