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

some more locator bug fixes

Browse source
This commit is contained in:
Laura Klünder 2024-12-29 02:12:55 +01:00
parent 5a32942fec
commit 0b88260c7c
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,7 +95,7 @@ class Locator:
for beacon in calculated.beacons.values(): for beacon in calculated.beacons.values():
identifiers = [] identifiers = []
for bssid in beacon.addresses: for bssid in beacon.addresses:
identifiers.append(TypedIdentifier(PeerType.WIFI, bssid)) identifiers.append(TypedIdentifier(PeerType.WIFI, bssid.lower()))
if beacon.ap_name: if beacon.ap_name:
identifiers.append(TypedIdentifier(PeerType.WIFI, beacon.ap_name)) identifiers.append(TypedIdentifier(PeerType.WIFI, beacon.ap_name))
if beacon.ibeacon_uuid and beacon.ibeacon_major is not None and beacon.ibeacon_minor is not None: if beacon.ibeacon_uuid and beacon.ibeacon_major is not None and beacon.ibeacon_minor is not None:
@ -142,7 +142,7 @@ class Locator:
if settings.WIFI_SSIDS and scan_value.ssid not in settings.WIFI_SSIDS: if settings.WIFI_SSIDS and scan_value.ssid not in settings.WIFI_SSIDS:
continue continue
peer_ids = { peer_ids = {
self.get_peer_id(TypedIdentifier(PeerType.WIFI, scan_value.bssid), create=create_peers), self.get_peer_id(TypedIdentifier(PeerType.WIFI, scan_value.bssid.lower()), create=create_peers),
self.get_peer_id(TypedIdentifier(PeerType.WIFI, scan_value.ap_name), create=create_peers), self.get_peer_id(TypedIdentifier(PeerType.WIFI, scan_value.ap_name), create=create_peers),
} - {None, ""} } - {None, ""}
for peer_id in peer_ids: for peer_id in peer_ids:
@ -254,6 +254,7 @@ class Locator:
key = tuple(self.peers[peer_id].xyz) key = tuple(self.peers[peer_id].xyz)
if key in already_got: if key in already_got:
continue continue
already_got.add(key)
deduplicized_scan_data_in_the_same_room.append((peer_id, value)) deduplicized_scan_data_in_the_same_room.append((peer_id, value))
the_sum = sum((value.rssi + 90) for peer_id, value in deduplicized_scan_data_in_the_same_room[:3]) the_sum = sum((value.rssi + 90) for peer_id, value in deduplicized_scan_data_in_the_same_room[:3])