Skip to content

Commit 467b1f9

Browse files
committed
Add dynamic flag to RouteManager.start_routemanager so that we can override it for route recalc (fixes Map-A-Droid#1289)
1 parent 27e07a0 commit 467b1f9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Diff for: mapadroid/mapping_manager/MappingManager.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ async def routemanager_recalculate(self, routemanager_id: int) -> bool:
557557
return False
558558
try:
559559
try:
560-
await routemanager.start_routemanager()
560+
await routemanager.start_routemanager(dynamic=False)
561561
except RoutemanagerShuttingDown as e:
562562
logger.warning("Unable to start routemanager for recalc: {}", e)
563563
return False

Diff for: mapadroid/route/RouteManagerBase.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ def add_coord_to_be_removed(self, lat: float, lon: float):
268268
return
269269
self._coords_to_be_ignored.add(Location(lat, lon))
270270

271-
async def start_routemanager(self) -> bool:
271+
async def start_routemanager(self, dynamic: bool = False) -> bool:
272272
"""
273273
Starts priority queue or whatever the implementations require
274274
:return:
@@ -278,7 +278,7 @@ async def start_routemanager(self) -> bool:
278278
self._is_started.set()
279279
self._coords_to_be_ignored.clear()
280280
logger.info("Starting routemanager {}", self.name)
281-
await self.calculate_route(dynamic=False, overwrite_persisted_route=False)
281+
await self.calculate_route(dynamic=dynamic, overwrite_persisted_route=False)
282282
await self._start_priority_queue()
283283
await self._start_check_routepools()
284284
self._init_route_queue()

Diff for: mapadroid/route/RouteManagerLeveling.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ async def _any_coords_left_after_finishing_route(self) -> bool:
143143

144144
return await self._update_routepool()
145145

146-
async def start_routemanager(self):
146+
async def start_routemanager(self, dynamic: bool = True):
147147
async with self._manager_mutex:
148148
if not self._is_started.is_set():
149149
self._is_started.set()

Diff for: mapadroid/route/RouteManagerQuests.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ async def _any_coords_left_after_finishing_route(self) -> bool:
102102
return False
103103
return True
104104

105-
async def start_routemanager(self):
105+
async def start_routemanager(self, dynamic: bool = True):
106106
if self._shutdown_route.is_set():
107107
logger.info('Route is shutting down already.')
108108
return False
@@ -114,7 +114,7 @@ async def start_routemanager(self):
114114
logger.info("Starting routemanager")
115115
self._is_started.set()
116116

117-
await self.calculate_route(dynamic=True, overwrite_persisted_route=False)
117+
await self.calculate_route(dynamic=dynamic, overwrite_persisted_route=False)
118118
await self._start_check_routepools()
119119

120120
logger.info('Getting {} positions in route', len(self._route))

0 commit comments

Comments
 (0)