Merge pull request #5069 from PokemonGoF/dev

Dev merge to master

map-chat/javascript/main.js

@@ -8,10 +8,16 @@ var topic = urlHashTopic ? urlHashTopic : "pgomapcatch/chat";
 
 function initialiseEventBus(){
   window.client = mqtt.connect('ws://broker.pikabot.org',{
-      reconnectPeriod:10*1000
+      reconnectPeriod:60*1000
   });
-  client.subscribe("pgomapcatch/#");
-  client.subscribe("pgochat/chat");
+  client.on("connect", function(err,res){
+    client.subscribe("pgomapcatch/#");
+    client.subscribe("pgochat/chat");
+  })
+  client.on("disconnect", function(err,res){
+    client.unsubscribe("pgomapcatch/#");
+    client.unsubscribe("pgochat/chat");
+  })
   client.on("message", function (topic, payload) {
     //Materialize.toast(payload, 4000);
     if (topic === 'pgochat/chat') {
@@ -105,9 +111,9 @@ $(document).ready(function () {
     Materialize.toast(shareAccurateLocation ? 'Sharing Your Accurate Location' : 'Sharing Your Fuzzy Location', 3000);
   });
 
-  if (topic != "main") {
+  /*if (topic != "main") {
     Materialize.toast("Private chat map - " + topic, 5000);
-  }
+  }*/
 
-  Materialize.toast("New: Click a user dot to mute it!", 7000);
+  //Materialize.toast("News: Server Over Load since the huge traffic ... ", 7000);
 });

map-chat/javascript/map.js

@@ -64,12 +64,20 @@ function initialize() {
   var mapDiv = document.getElementById('map-canvas');
   map = new google.maps.Map(mapDiv, mapOptions);
 
-  navigator.geolocation.getCurrentPosition(onFirstPosition, onPositionError, locationOptions);
+  initialiseEventBus();
+
+  //navigator.geolocation.getCurrentPosition(onFirstPosition, onPositionError, locationOptions);
+
+  onFirstPosition({
+     "coords": {
+       latitude: parseFloat(0.1),
+       longitude: parseFloat(0.1)
+     }
+   });
 }
 
 function onFirstPosition(position) {
   setUserLocation(position.coords.latitude, position.coords.longitude);
-  initialiseEventBus();
   map.panTo(userLocation);
   var message = {};
   message.lat = position.coords.latitude;

pokecli.py

@@ -375,7 +375,7 @@ def _json_loader(filename):
         load,
         short_flag="-wsr",
         long_flag="--websocket.remote_control",
-        help="Enable remote control through websocket (requires websocekt server url)",
+        help="Enable remote control through websocket (requires websocket server url)",
         default=False
     )
     add_config(

pokemongo_bot/cell_workers/transfer_pokemon.py

@@ -253,7 +253,7 @@ def _validate_keep_best_config_custom(self, pokemon_name, keep_best_possible_cus
         if keep_best_custom and keep_amount:
             keep_best = True
 
-            keep_best_custom = keep_best_custom.split(',')
+            keep_best_custom = keep_best_custom.replace(' ','').split(',')
             for _str in keep_best_custom:
                 if _str not in keep_best_possible_custom:
                     keep_best = False