Adding the navigator to the list of workers (#1950)

pokemongo_bot/__init__.py

@@ -52,12 +52,13 @@ def __init__(self, config):
     def start(self):
         self._setup_logging()
         self._setup_api()
-        self._setup_workers()
 
         if self.config.navigator_type == 'spiral':
-            self.navigator=cell_workers.FollowSpiral(self)
+            self.navigator = cell_workers.FollowSpiral
         elif self.config.navigator_type == 'path':
-            self.navigator=cell_workers.FollowPath(self)
+            self.navigator = cell_workers.FollowPath
+
+        self._setup_workers()
 
         random.seed()
 
@@ -90,8 +91,6 @@ def tick(self):
             if worker.work() == WorkerResult.RUNNING:
                 return
 
-        self.navigator.take_step()
-
     def get_meta_cell(self):
         location = self.position[0:2]
         cells = self.find_close_cells(*location)
@@ -308,7 +307,8 @@ def _setup_workers(self):
             cell_workers.SpinFort(self),
             cell_workers.MoveToFort(self),
             cell_workers.CatchLuredPokemon(self),
-            cell_workers.SpinFort(self)
+            cell_workers.SpinFort(self),
+            self.navigator(self)
         ]
 
     def _print_character_info(self):

pokemongo_bot/cell_workers/follow_path.py

@@ -56,7 +56,7 @@ def load_gpx(self, file):
 
         return points;
 
-    def take_step(self):
+    def work(self):
         point = self.points[self.ptr]
         lat = float(point['lat'])
         lng = float(point['lng'])

pokemongo_bot/cell_workers/follow_spiral.py

@@ -53,7 +53,7 @@ def _generate_spiral(starting_lat, starting_lng, step_size, step_limit):
             m += 1
         return coords
 
-    def take_step(self):
+    def work(self):
         point = self.points[self.ptr]
         self.cnt += 1