|
|
@ -48,15 +48,14 @@ class RouteEngine: |
|
|
|
|
|
|
|
|
|
|
|
self.reroute_counter = 0 |
|
|
|
self.reroute_counter = 0 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.api = None |
|
|
|
|
|
|
|
self.mapbox_token = None |
|
|
|
if "MAPBOX_TOKEN" in os.environ: |
|
|
|
if "MAPBOX_TOKEN" in os.environ: |
|
|
|
self.mapbox_token = os.environ["MAPBOX_TOKEN"] |
|
|
|
self.mapbox_token = os.environ["MAPBOX_TOKEN"] |
|
|
|
self.mapbox_host = "https://api.mapbox.com" |
|
|
|
self.mapbox_host = "https://api.mapbox.com" |
|
|
|
else: |
|
|
|
else: |
|
|
|
try: |
|
|
|
self.api = Api(self.params.get("DongleId", encoding='utf8')) |
|
|
|
self.mapbox_token = Api(self.params.get("DongleId", encoding='utf8')).get_token(expiry_hours=4 * 7 * 24) |
|
|
|
|
|
|
|
except FileNotFoundError: |
|
|
|
|
|
|
|
cloudlog.exception("Failed to generate mapbox token due to missing private key. Ensure device is registered.") |
|
|
|
|
|
|
|
self.mapbox_token = "" |
|
|
|
|
|
|
|
self.mapbox_host = "https://maps.comma.ai" |
|
|
|
self.mapbox_host = "https://maps.comma.ai" |
|
|
|
|
|
|
|
|
|
|
|
def update(self): |
|
|
|
def update(self): |
|
|
@ -122,8 +121,12 @@ class RouteEngine: |
|
|
|
if lang is not None: |
|
|
|
if lang is not None: |
|
|
|
lang = lang.replace('main_', '') |
|
|
|
lang = lang.replace('main_', '') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
token = self.mapbox_token |
|
|
|
|
|
|
|
if token is None: |
|
|
|
|
|
|
|
token = self.api.get_token() |
|
|
|
|
|
|
|
|
|
|
|
params = { |
|
|
|
params = { |
|
|
|
'access_token': self.mapbox_token, |
|
|
|
'access_token': token, |
|
|
|
'annotations': 'maxspeed', |
|
|
|
'annotations': 'maxspeed', |
|
|
|
'geometries': 'geojson', |
|
|
|
'geometries': 'geojson', |
|
|
|
'overview': 'full', |
|
|
|
'overview': 'full', |
|
|
|