2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

don't have positioning results in levels_on_top

Browse source
This commit is contained in:
Laura Klünder 2024-12-29 01:02:56 +01:00
parent b42e0496e2
commit c7fbcaf50f
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/c3nav/routing/locator.py
View file

@ -256,10 +256,13 @@ class Locator:
the_sum = sum((value.rssi + 90) for peer_id, value in scan_data_in_the_same_room[:3]) the_sum = sum((value.rssi + 90) for peer_id, value in scan_data_in_the_same_room[:3])
level = router.levels[space.level_id]
if level.on_top_of_id:
level = router.levels[level.on_top_of_id]
if not the_sum: if not the_sum:
point = space.point point = space.point
return CustomLocation( return CustomLocation(
level=router.levels[space.level_id], level=level,
x=point.x, x=point.x,
y=point.y, y=point.y,
permissions=permissions, permissions=permissions,
@ -272,7 +275,7 @@ class Locator:
x += float(self.peers[peer_id].xyz[0]) * (value.rssi+90) / the_sum 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 y += float(self.peers[peer_id].xyz[1]) * (value.rssi+90) / the_sum
return CustomLocation( return CustomLocation(
level=router.levels[space.level_id], level=level,
x=x/100, x=x/100,
y=y/100, y=y/100,
permissions=permissions, permissions=permissions,
@ -384,11 +387,16 @@ class Locator:
restrictions = router.get_restrictions(permissions) restrictions = router.get_restrictions(permissions)
result_pos = results.x result_pos = results.x
level = router.levels[router.level_id_for_xyz(
(result_pos[0], result_pos[1], result_pos[2] - 1.3), # -1.3m cause we assume people to be above ground
restrictions
)]
if level.on_top_of_id:
level = router.levels[level.on_top_of_id]
location = CustomLocation( location = CustomLocation(
level=router.levels[router.level_id_for_xyz( level=level,
(result_pos[0], result_pos[1], result_pos[2]-1.3), # -1.3m cause we assume people to be above ground
restrictions
)],
x=result_pos[0]/100, x=result_pos[0]/100,
y=result_pos[1]/100, y=result_pos[1]/100,
permissions=permissions, permissions=permissions,