fix(map): fix last position marker on the box

This commit is contained in:
Florian Bezannier
2022-04-02 12:14:37 +02:00
parent 888abe3141
commit 30b26bd15b
4 changed files with 17 additions and 16 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ logging.addLevelName(DEBUG_LEVELV_NUM, "DEBUGV")
class CustomLogger(logging.Logger):
def _log(self, level, # pylint: disable=too-many-arguments,unused-argument,arguments-differ
def _log(self, level, # pylint: disable=too-many-arguments,unused-argument
msg,
args,
exc_info=None,
@@ -74,8 +74,8 @@ class ChargeControl:
vehicle_status = self.psacc.vehicles_list.get_car_by_vin(self.vin).get_status()
status = vehicle_status.get_energy('Electric').charging.status
level = vehicle_status.get_energy('Electric').level
logger.info("charging status of %s is %s, battery level: %d", self.vin, status, level)
if status == "InProgress" and self.percentage_threshold < 100:
logger.info("charging status of %s is %s, battery level: %d", self.vin, status, level)
charging_mode = vehicle_status.get_energy('Electric').charging.charging_mode
quick_refresh = isinstance(charging_mode, str) and charging_mode == "Quick"
self.force_update(quick_refresh)
@@ -3,7 +3,6 @@ import threading
from datetime import datetime, timedelta, timezone
from json import JSONEncoder
from hashlib import md5
from time import sleep
from oauth2_client.credentials_manager import ServiceInformation
from urllib3.exceptions import InvalidHeader
@@ -115,21 +114,23 @@ class PSAClient:
def __refresh_vehicle_info(self):
if self.info_refresh_rate is not None:
while True:
try:
logger.debug("refresh_vehicle_info")
for car in self.vehicles_list:
self.get_vehicle_info(car.vin)
for callback in self.info_callback:
callback()
except BaseException:
logger.exception("refresh_vehicle_info: ")
sleep(self.info_refresh_rate)
if self.refresh_thread and self.refresh_thread.is_alive():
logger.warning("refresh_vehicle_info: precedent task still alive")
self.refresh_thread = threading.Timer(self.info_refresh_rate, self.__refresh_vehicle_info)
self.refresh_thread.setDaemon(True)
self.refresh_thread.start()
try:
logger.debug("refresh_vehicle_info")
for car in self.vehicles_list:
self.get_vehicle_info(car.vin)
for callback in self.info_callback:
callback()
except BaseException:
logger.exception("refresh_vehicle_info: ")
def start_refresh_thread(self):
if self.refresh_thread is None:
self.refresh_thread = threading.Thread(target=self.__refresh_vehicle_info, daemon=True)
self.refresh_thread.start()
self.__refresh_vehicle_info()
def get_vehicles(self):
try:
+1 -1
View File
@@ -161,7 +161,7 @@ def get_style():
res = json.loads(f.read())
STYLE_CACHE = res
url_root = request.url_root
STYLE_CACHE["sprite"] = url_root + "assets/sprites/osm-liberty@2x"
STYLE_CACHE["sprite"] = url_root + "assets/sprites/osm-liberty"
return jsonify(STYLE_CACHE)