Innovation/nightui
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make no-fix state of navigationd make more sense (such as not just defaulting to Detroit or some shit).

Browse source
This commit is contained in:
Innovation 2024-06-11 10:38:19 +01:00
parent 66d4c64a8a
commit ff5a2e51e9
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/modules/navigationd/navigationd.py
View file

@ -31,14 +31,16 @@ def disconnectCyberware():
except: except:
print("Cannot disconnect Cyberware.") print("Cannot disconnect Cyberware.")
gpsdData = None def getMapImage(distance, gpsdData):
def getMapImage(distance):
ox.settings.use_cache = True ox.settings.use_cache = True
# We don't want to send any data if we don't have a fix.
if(gpsdData.lat == 0 and gpsdData.lon == 0): if(gpsdData.lat == 0 and gpsdData.lon == 0):
point = (42.352593, -83.2640164) return
#point = (42.352593, -83.2640164)
point = (gpsdData.lat, gpsdData.lon)
try: try:
G = ox.graph_from_point(point, dist=distance, dist_type="bbox", network_type="drive") G = ox.graph_from_point(point, dist=distance, dist_type="bbox", network_type="drive")
@ -62,10 +64,11 @@ def getMapImage(distance):
# #
# G = ox.graph_from_bbox(bbox=bbox, network_type="drive_service") # G = ox.graph_from_bbox(bbox=bbox, network_type="drive_service")
def sendLocation(): def sendLocation(gpsdData):
# We don't want to hit the API if we don't have a fix.
if(gpsdData.lat != 0 and gpsdData.lon !=0):
try: try:
#request = requests.post(urlLocation, json={ 'x': gpsdData.lat, 'y': gpsdData.lon, 'z': gpsdData.alt, 'o': gpsdData.track }) request = requests.post(urlLocation, json={ 'x': gpsdData.lat, 'y': gpsdData.lon, 'z': gpsdData.alt, 'o': None, 'uuid': uuid })
request = requests.post(urlLocation, json={ 'x': None, 'y': None, 'z': None, 'o': None, 'uuid': uuid })
except: except:
print('Could not contact NightCall') print('Could not contact NightCall')
@ -73,6 +76,8 @@ def sendMapImage():
try: try:
files = { 'image': open(uuid+".png", 'rb') } files = { 'image': open(uuid+".png", 'rb') }
request = requests.post(urlImage, files=files) request = requests.post(urlImage, files=files)
except FileNotFoundError: # Occurs if we don't have a fix yet.
return
except: except:
print("Could not contact NightCall") print("Could not contact NightCall")
@ -90,11 +95,10 @@ while continueFlag:
try: try:
gpsdData = gpsd.get_current() gpsdData = gpsd.get_current()
except gpsd.NoFixError: except gpsd.NoFixError:
gpsdData = None print("No GPS fix!")
print("No GPS fix yet! Using default coordinates.")
getMapImage(1000) getMapImage(1000, gpsdData)
sendLocation() sendLocation(gpsdData)
sendMapImage() sendMapImage()
#print(packet.position()) #print(packet.position())
@ -106,4 +110,8 @@ print("Removing Cyberware")
disconnectCyberware() disconnectCyberware()
print("Cleaning up") print("Cleaning up")
os.remove(uuid+".png")
try:
os.remove(uuid+".png")
except:
print("No minimap image was ever made. GPS probably never had a fix.")