From 41d81582186b9f57e094c8e8dfe45d771ea2e2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sat, 28 Dec 2024 23:46:01 +0100 Subject: [PATCH] fix unknown spaces --- src/c3nav/routing/locator.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/c3nav/routing/locator.py b/src/c3nav/routing/locator.py index 2c07d727..436a9b0c 100644 --- a/src/c3nav/routing/locator.py +++ b/src/c3nav/routing/locator.py @@ -235,21 +235,21 @@ class Locator: if not scan_data_we_can_use: return None + router = Router.load() + # get visible spaces best_ap_id = max(scan_data_we_can_use, key=lambda item: item[1].rssi)[0] space_id = self.peers[best_ap_id].space_id - space = self.spaces[space_id] + space = router.spaces[space_id] scan_data_in_the_same_room = sorted([ (peer_id, value) for peer_id, value in scan_data_we_can_use if self.peers[peer_id].space_id == space_id ], key=lambda a: -a[1].rssi) - router = Router.load() - if len(scan_data_in_the_same_room) == 1: - point = router.spaces[space.pk].point + point = space.point return CustomLocation( - level=router.levels[router.spaces[space.pk].level_id], + level=router.levels[space.level_id], x=point.x, y=point.y, permissions=permissions, @@ -264,7 +264,7 @@ class Locator: x += float(self.peers[peer_id].xyz[0]) * (value.rssi+90) / the_sum y += float(self.peers[peer_id].xyz[1]) * (value.rssi+90) / the_sum return CustomLocation( - level=router.levels[router.spaces[space.pk].level_id], + level=router.levels[space.level_id], x=x/100, y=y/100, permissions=permissions,