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

merge RangeLocator into Locator and modernize code

Browse source
This commit is contained in:
Laura Klünder 2023-12-07 02:15:32 +01:00
parent ae65a68830
commit 34af60782c
14 changed files with 373 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/c3nav/mesh/consumers.py
View file

@ -21,7 +21,7 @@ from c3nav.mesh.messages import (MESH_BROADCAST_ADDRESS, MESH_NONE_ADDRESS, MESH
MeshMessage, MeshMessageType, OTAApplyMessage, OTASettingMessage)
from c3nav.mesh.models import MeshNode, MeshUplink, NodeMessage, OTARecipientStatus, OTAUpdate, OTAUpdateRecipient
from c3nav.mesh.utils import MESH_ALL_OTA_GROUP, MESH_ALL_UPLINKS_GROUP, UPLINK_PING, get_mesh_uplink_group
from c3nav.routing.rangelocator import RangeLocator
from c3nav.routing.locator import Locator
class Unknown:
@ -738,13 +738,18 @@ class MeshUIConsumer(AsyncJsonWebsocketConsumer):
@database_sync_to_async
def locator(self, msg, orig_addr=None):
locator = RangeLocator.load()
return locator.locate(
{
r["peer"]: r["distance"]
locator = Locator.load()
return locator.locate_range(
locator.convert_raw_scan_data([
{
"bssid": r["peer"],
"ssid": "",
"rssi": r["rssi"],
"distance": r["distance"]
}
for r in msg["ranges"]
if r["distance"] != 0xFFFF
},
]),
permissions=None,
orig_addr=orig_addr,
)