RangeLocator needs current router instead of old one (which might fail)

This commit is contained in:
Laura Klünder 2023-12-07 00:17:55 +01:00
parent 54635da40a
commit 83dfdec90f
2 changed files with 4 additions and 6 deletions

View file

@ -178,15 +178,15 @@ class MapUpdate(models.Model):
logger.info('Rebuilding router...')
from c3nav.routing.router import Router
Router.rebuild(new_updates[-1].to_tuple)
router = Router.rebuild(new_updates[-1].to_tuple)
logger.info('Rebuilding locator...')
from c3nav.routing.locator import Locator
Locator.rebuild(new_updates[-1].to_tuple)
locator = Locator.rebuild(new_updates[-1].to_tuple)
logger.info('Rebuilding range locator...')
from c3nav.routing.rangelocator import RangeLocator
RangeLocator.rebuild(new_updates[-1].to_tuple)
range_locator = RangeLocator.rebuild(new_updates[-1].to_tuple, router)
for new_update in reversed(new_updates):
new_update.processed = True

View file

@ -23,9 +23,7 @@ class RangeLocator:
beacon_lookup: dict[str: int]
@classmethod
def rebuild(cls, update):
router = Router.load()
def rebuild(cls, update, router):
beacons = RangingBeacon.objects.all()
locator = cls(