fix divide by zero bug; add distance logging when speed == 0 (#3819)

* fix divide by zero bug; add distance logging when speed == 0 * refactor last position distance; add rules to .gitignore * remove file user_web_catchable that was added by mistake
PokemonGoF · Aug 14, 2016 · d6c5bb3 · d6c5bb3
1 parent d54c256
commit d6c5bb3
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -109,6 +109,8 @@ web/
 data/last-location*.json
 data/cells-*.json
 data/map-caught-*.json
+data/recent-forts-*.json
+user_web_catchable
 
 # Multiple config
 configs/*

diff --git a/pokemongo_bot/cell_workers/follow_path.py b/pokemongo_bot/cell_workers/follow_path.py
@@ -98,6 +98,9 @@ def find_closest_point_idx(self, points):
         return return_idx
 
     def work(self):
+        last_lat = self.bot.api._position_lat
+        last_lng = self.bot.api._position_lng
+
         point = self.points[self.ptr]
         lat = float(point['lat'])
         lng = float(point['lng'])
@@ -115,11 +118,11 @@ def work(self):
                 is_at_destination = True
 
         else:
-            self.bot.api.set_position(lat, lng)
+            self.bot.api.set_position(lat, lng, 0)
 
         dist = distance(
-            self.bot.api._position_lat,
-            self.bot.api._position_lng,
+            last_lat,
+            last_lng,
             lat,
             lng
         )
@@ -132,4 +135,14 @@ def work(self):
             else:
                 self.ptr += 1
 
+        self.emit_event(
+            'position_update',
+            formatted="Teleported from {last_position} to {current_position} ({distance} {distance_unit})",
+            data={
+                'last_position': (last_lat, last_lng, 0),
+                'current_position': (lat, lng, 0),
+                'distance': dist,
+                'distance_unit': 'm'
+            }
+        )
         return [lat, lng]
diff --git a/pokemongo_bot/cell_workers/follow_spiral.py b/pokemongo_bot/cell_workers/follow_spiral.py
@@ -66,9 +66,19 @@ def _generate_spiral(starting_lat, starting_lng, step_size, step_limit):
         return coords
 
     def work(self):
+        last_lat = self.bot.api._position_lat
+        last_lng = self.bot.api._position_lng
+
         point = self.points[self.ptr]
         self.cnt += 1
 
+        dist = distance(
+            last_lat,
+            last_lng,
+            point['lat'],
+            point['lng']
+        )
+
         if self.bot.config.walk > 0:
             step_walker = StepWalker(
                 self.bot,
@@ -77,19 +87,12 @@ def work(self):
                 point['lng']
             )
 
-            dist = distance(
-                self.bot.api._position_lat,
-                self.bot.api._position_lng,
-                point['lat'],
-                point['lng']
-            )
-
             if self.cnt == 1:
                 self.emit_event(
                     'position_update',
                     formatted="Walking from {last_position} to {current_position} ({distance} {distance_unit})",
                     data={
-                        'last_position': self.bot.position,
+                        'last_position': (last_lat, last_lng, 0),
                         'current_position': (point['lat'], point['lng'], 0),
                         'distance': dist,
                         'distance_unit': 'm'
@@ -99,14 +102,20 @@ def work(self):
             if step_walker.step():
                 step_walker = None
         else:
-            self.bot.api.set_position(point['lat'], point['lng'])
-
-        if distance(
-                    self.bot.api._position_lat,
-                    self.bot.api._position_lng,
-                    point['lat'],
-                    point['lng']
-                ) <= 1 or (self.bot.config.walk > 0 and step_walker == None):
+            self.bot.api.set_position(point['lat'], point['lng'], 0)
+
+            self.emit_event(
+                'position_update',
+                formatted="Teleported from {last_position} to {current_position} ({distance} {distance_unit})",
+                data={
+                    'last_position': (last_lat, last_lng, 0),
+                    'current_position': (point['lat'], point['lng'], 0),
+                    'distance': dist,
+                    'distance_unit': 'm'
+                }
+            )
+
+        if dist <= 1 or (self.bot.config.walk > 0 and step_walker == None):
             if self.ptr + self.direction >= len(self.points) or self.ptr + self.direction <= -1:
                 self.direction *= -1
             if len(self.points) != 1:

diff --git a/pokemongo_bot/step_walker.py b/pokemongo_bot/step_walker.py
@@ -25,7 +25,10 @@ def __init__(self, bot, speed, dest_lat, dest_lng):
         self.destLng = dest_lng
         self.totalDist = max(1, self.dist)
 
-        self.steps = (self.dist + 0.0) / (speed + 0.0)
+        if speed == 0:
+            self.steps = 1
+        else:
+            self.steps = (self.dist + 0.0) / (speed + 0.0)
 
         if self.dist < speed or int(self.steps) <= 1:
             self.dLat = 0