diff --git a/helpers/geo_helper.py b/helpers/geo_helper.py index 8169fe8..b1a2784 100644 --- a/helpers/geo_helper.py +++ b/helpers/geo_helper.py @@ -95,6 +95,8 @@ class Geo_helper: ordDic = OrderedDict() #keep fields with the same layout in redis ordDic['lat'] = coord_dic['lat'] ordDic['lon'] = coord_dic['lon'] + ordDic['categ'] = categ + ordDic['value'] = supposed_ip coord_list = [coord['lat'], coord['lon']] self.push_to_redis_zset(self.keyCategCoord, json.dumps(ordDic)) self.push_to_redis_zset(self.keyCategCountry, rep['full_rep'].country.iso_code) diff --git a/static/js/geo.js b/static/js/geo.js index d2160a2..8f06559 100644 --- a/static/js/geo.js +++ b/static/js/geo.js @@ -122,19 +122,21 @@ function updateTopMaps(date) { } for(var i=0; i<6 && i'+list[i][1]+')'); + markerToUpdate.setLatLng({lat: dataJson.lat, lng: dataJson.lon}); + markerToUpdate._popup.setContent(categ+' - '+value+' ('+list[i][1]+')'); markerToUpdate.update(); } else { // create new marker - var marker = L.marker([coordJson.lat, coordJson.lon]).addTo(allOpenStreetMap[i+1]); + var marker = L.marker([dataJson.lat, dataJson.lon]).addTo(allOpenStreetMap[i+1]); savedMarker[i+1] = marker; - marker.bindPopup('lat: '+coordJson.lat+', lon: '+coordJson.lon+' ('+list[i][1]+')').openPopup(); + marker.bindPopup(categ+' - '+value+' ('+list[i][1]+')').openPopup(); } } });