Update mapd to v2

frogpilot/frogpilot_process.py

@@ -19,7 +19,7 @@ from openpilot.frogpilot.system.frogpilot_tracking import FrogPilotTracking
 
 ASSET_CHECK_RATE = (1 / DT_MDL)
 
-def check_assets(theme_manager, thread_manager, params_memory, frogpilot_toggles):
+def check_assets(now, theme_manager, thread_manager, params, params_memory, frogpilot_toggles):
   for asset_type, asset_param in THEME_COMPONENT_PARAMS.items():
     asset_to_download = params_memory.get(asset_param)
     if asset_to_download:
@@ -33,6 +33,9 @@ def check_assets(theme_manager, thread_manager, params_memory, frogpilot_toggles
     capture_report(report_data["DiscordUser"], report_data["Issue"], vars(frogpilot_toggles))
     params_memory.remove("IssueReported")
 
+  if params_memory.get_bool("DownloadMaps"):
+    thread_manager.run_with_lock(update_maps, (now, params, params_memory, True))
+
 def transition_offroad(frogpilot_planner, theme_manager, thread_manager, time_validated, sm, params, frogpilot_toggles):
   params.put("LastGPSPosition", json.dumps(frogpilot_planner.gps_position))
 
@@ -53,10 +56,10 @@ def update_checks(now, theme_manager, thread_manager, params, params_memory, fro
   while not (is_url_pingable("https://github.com") or is_url_pingable("https://gitlab.com")):
     time.sleep(60)
 
-  thread_manager.run_with_lock(update_maps, (now, params, params_memory))
-
   theme_manager.update_themes(frogpilot_toggles, boot_run)
 
+  thread_manager.run_with_lock(update_maps, (now, params, params_memory))
+
   if frogpilot_toggles.automatic_updates:
     thread_manager.run_with_lock(update_openpilot, (thread_manager, params))
 
@@ -89,7 +92,7 @@ def frogpilot_thread():
   sm = messaging.SubMaster(["carControl", "carState", "controlsState", "deviceState", "driverMonitoringState",
                             "gpsLocation", "gpsLocationExternal", "liveParameters", "managerState", "modelV2",
                             "onroadEvents", "pandaStates", "radarState", "selfdriveState", "frogpilotCarState",
-                            "frogpilotSelfdriveState", "frogpilotModelV2", "frogpilotOnroadEvents"],
+                            "frogpilotSelfdriveState", "frogpilotModelV2", "frogpilotOnroadEvents", "mapdOut"],
                             poll="modelV2")
 
   params = Params(return_defaults=True)
@@ -141,7 +144,7 @@ def frogpilot_thread():
     started_previously = started
 
     if rate_keeper.frame % ASSET_CHECK_RATE == 0:
-      check_assets(theme_manager, thread_manager, params_memory, frogpilot_toggles)
+      check_assets(now, theme_manager, thread_manager, params, params_memory, frogpilot_toggles)
 
     if params_memory.get_bool("FrogPilotTogglesUpdated") or theme_manager.theme_updated:
       frogpilot_toggles = update_toggles(frogpilot_variables, started, theme_manager, thread_manager, time_validated, params, frogpilot_toggles)