colin/ols
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

locator: Improve single wifi accuracy calculations

Browse Source
This commit is contained in:
Teemu Ikonen
2023-02-20 16:33:20 +02:00
parent 3be2ba52d7
commit e12e8acc50
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ols/locator/clustering.py
View File

@@ -237,8 +237,8 @@ def aggregate_mac_position(networks, minimum_accuracy):
net = networks[0] net = networks[0]
lat = float(net["lat"]) lat = float(net["lat"])
lon = float(net["lon"]) lon = float(net["lon"])
signal = min(net["signalStrength"], WIFI_MAX_SIGNAL) sig = min(net["signalStrength"], WIFI_MAX_SIGNAL)
ratio = 1.0 - abs(signal - WIFI_MIN_SIGNAL) / abs(WIFI_MIN_SIGNAL) ratio = 1.0 - abs(sig - WIFI_MIN_SIGNAL) / (WIFI_MAX_SIGNAL - WIFI_MIN_SIGNAL)
accuracy = max(min(net["radius"] * ratio, WIFI_MAX_ACCURACY), accuracy = max(min(net["radius"] * ratio, WIFI_MAX_ACCURACY),
minimum_accuracy) minimum_accuracy)
return lat, lon, accuracy return lat, lon, accuracy

11
ols/locator/single.py
View File

@@ -6,7 +6,10 @@ from ..constants import (
CELL_DEFAULT_RADIUS, CELL_DEFAULT_RADIUS,
CELL_MIN_SIGNAL, CELL_MIN_SIGNAL,
WIFI_DEFAULT_SIGNAL, WIFI_DEFAULT_SIGNAL,
WIFI_MIN_RADIUS, WIFI_MAX_ACCURACY,
WIFI_MAX_SIGNAL,
WIFI_MIN_ACCURACY,
WIFI_MIN_SIGNAL,
) )
from ..utils import mcc_mnc_to_opc from ..utils import mcc_mnc_to_opc
@@ -31,7 +34,11 @@ class SingleWifiLocatorBase(LocatorBase):
if wifi is not None: if wifi is not None:
log.debug(f'Got result from {mac=}') log.debug(f'Got result from {mac=}')
latlon = wifi.get('latlon') latlon = wifi.get('latlon')
accuracy = max(WIFI_MIN_RADIUS, 100.0 - signalstrength) # FIXME:improve sig = min(signalstrength, WIFI_MAX_SIGNAL)
ratio = 1.0 - ((sig - WIFI_MIN_SIGNAL)
/ (WIFI_MAX_SIGNAL - WIFI_MIN_SIGNAL))
accuracy = max(min(wifi['radius'] * ratio, WIFI_MAX_ACCURACY),
WIFI_MIN_ACCURACY)
break break
return latlon, accuracy return latlon, accuracy