Map expieration timestamps / names (#4633) (#4636)

* Map expieration timestamps / names (#4633)

* name from ID

* p name

* name from id

* Pokemon name & expiration information

* Update map.js

* Update map.js

* Add files via upload

* Update main.js

* Update map.js

* Add files via upload (#4637)

map-chat/javascript/main.js

@@ -27,12 +27,14 @@ function initialiseEventBus(){
         var olong = pLoadR2[1]
         var sessid = pLoadR2[2]
         var ico = pLoadR2[3]
+	var expir = pLoadR2[4]
+	var pokenick = pLoadR2[5]
         var path = "./images/p/"
         var icon = path+"0"+ico+".png"
-		    var icostr = icon.toString();
-		    //console.log(icostr)
+	var icostr = icon.toString();
+	//console.log(icostr)
 
-      displayMessageOnMap(payload, olat, olong, sessid, icostr);
+      displayMessageOnMap(payload, olat, olong, sessid, icostr, expir, pokenick);
     }
   });
 

map-chat/javascript/map.js

@@ -207,12 +207,27 @@ function displayChatMessageOnMap(raw){
     }
 }
 
-function displayMessageOnMap(msg, olat, olong, sessid, icostr){
+// @ro: to calculate time until expiration
+function timeUntil(now, then) {
+  var timestampNow = Date.parse(now);
+  var timestampThen = Date.parse(then);
+  var diff = new Date(timestampThen - timestampNow);
+
+  diff.setSeconds(Math.round(diff.getSeconds() / 30) * 30);
+
+  return diff;
+}
+
+
+function displayMessageOnMap(msg, olat, olong, sessid, icostr, expir, pokenick){
 
     // @ro: passing values split from incoming payload into two variables for now (lat and long)
     var newPosition = new google.maps.LatLng(olat, olong);
     var msgSessionId = sessid;
-
+	var expiration = expir;
+	var thetime = "155564565475"
+	var pName = pokenick/* + " disappears in " + timeUntil(thetime,expiration)*/;
+	console.log(pName)
     // @ro: just checking the output
     //console.log(olat);
     //console.log(olong);
@@ -233,7 +248,7 @@ function displayMessageOnMap(msg, olat, olong, sessid, icostr){
 
     if(markersMap[msgSessionId]){ // update existing marker
         var infoWindow = new google.maps.InfoWindow({
-            content: msg.text,
+            content: pName,
             maxWidth: 400,
             disableAutoPan: true,
             zIndex: infoWindowZIndex
@@ -245,6 +260,7 @@ function displayMessageOnMap(msg, olat, olong, sessid, icostr){
             map: map,
             draggable: false,
             icon: icostr,
+			icon: { url: icostr, scaledSize: new google.maps.Size(60,60) },
             title: "Click to mute/un-mute User "+msgSessionId
         });
 
@@ -260,7 +276,7 @@ function displayMessageOnMap(msg, olat, olong, sessid, icostr){
         });
     } else { // new marker
         var infoWindow = new google.maps.InfoWindow({
-            content: msg.text,
+            content: pName,
             maxWidth: 400,
             disableAutoPan: true,
             zIndex: infoWindowZIndex
@@ -271,7 +287,7 @@ function displayMessageOnMap(msg, olat, olong, sessid, icostr){
             position: newPosition,
             map: map,
             draggable: false,
-            icon: markerImage,
+            icon: { url: icostr, scaledSize: new google.maps.Size(60,60) },
             title: "Click to mute/un-mute User "+msgSessionId
         });
 

pokemongo_bot/__init__.py

@@ -289,7 +289,8 @@ def _register_events(self):
                 'encounter_id',
                 'latitude',
                 'longitude',
-                'expiration_timestamp_ms'
+                'expiration_timestamp_ms',
+                'pokemon_name'
             )
         )
         self.event_manager.register_event(

pokemongo_bot/cell_workers/catch_pokemon.py

@@ -12,7 +12,7 @@
 from utils import fort_details, distance
 from pokemongo_bot.base_dir import _base_dir
 from pokemongo_bot.constants import Constants
-
+from pokemongo_bot.inventory import Pokemons, Pokemon, Attack
 
 class CatchPokemon(BaseTask):
     SUPPORTED_TASK_API_VERSION = 1
@@ -60,6 +60,7 @@ def get_visible_pokemon(self):
     		                'latitude': pokemon['latitude'],
     		                'longitude': pokemon['longitude'],
     		                'expiration_timestamp_ms': pokemon['expiration_timestamp_ms'],
+    		                'pokemon_name': Pokemons.name_for(pokemon['pokemon_id']),
     		            }
     		        )
 

pokemongo_bot/cell_workers/catch_visible_pokemon.py

@@ -6,7 +6,7 @@
 from utils import distance
 from pokemongo_bot.worker_result import WorkerResult
 from pokemongo_bot.base_dir import _base_dir
-
+from pokemongo_bot.inventory import Pokemons, Pokemon, Attack
 
 class CatchVisiblePokemon(BaseTask):
     SUPPORTED_TASK_API_VERSION = 1
@@ -54,6 +54,7 @@ def work(self):
                         'latitude': pokemon['latitude'],
                         'longitude': pokemon['longitude'],
                         'expiration_timestamp_ms': pokemon['expiration_timestamp_ms'],
+                        'pokemon_name': Pokemons.name_for(pokemon['pokemon_id']),
                     }
                 )
                 if not self.was_encountered(pokemon):

pokemongo_bot/event_handlers/social_handler.py

@@ -56,8 +56,8 @@ def handle_event(self, event, sender, level, formatted_msg, data):
                 #self.mqttc.publish("pgomapcatch/all/catchable/"+str(data['pokemon_id']), str(data))
                 # precision=4 mean 19545 meters, http://stackoverflow.com/questions/13836416/geohash-and-max-distance
                 geo_hash = Geohash.encode(data['latitude'], data['longitude'], precision=4)
-                self.mqttc.publish("pgomapgeo/"+geo_hash+"/"+str(data['pokemon_id']), str(data['latitude'])+","+str(data['longitude'])+","+str(data['encounter_id'])+","+str(data['pokemon_id']))
-                self.mqttc.publish("pgomapcatch/all/catchable/"+str(data['pokemon_id']), str(data['latitude'])+","+str(data['longitude'])+","+str(data['encounter_id'])+","+str(data['pokemon_id']))
+                self.mqttc.publish("pgomapgeo/"+geo_hash+"/"+str(data['pokemon_id']), str(data['latitude'])+","+str(data['longitude'])+","+str(data['encounter_id'])+","+str(data['pokemon_id'])+","+str(data['expiration_timestamp_ms'])+","+str(data['pokemon_name']))
+                self.mqttc.publish("pgomapcatch/all/catchable/"+str(data['pokemon_id']), str(data['latitude'])+","+str(data['longitude'])+","+str(data['encounter_id'])+","+str(data['pokemon_id'])+","+str(data['expiration_timestamp_ms'])+","+str(data['pokemon_name']))
 
             #print 'have catchable_pokemon'
             #print message