mirror of https://github.com/MISP/misp-dashboard
Merge pull request #23 from mokaddem/updateGeo
Changed tooltip content in geolocalisationpull/31/head
commit
dde6362f8b
|
@ -95,6 +95,8 @@ class Geo_helper:
|
||||||
ordDic = OrderedDict() #keep fields with the same layout in redis
|
ordDic = OrderedDict() #keep fields with the same layout in redis
|
||||||
ordDic['lat'] = coord_dic['lat']
|
ordDic['lat'] = coord_dic['lat']
|
||||||
ordDic['lon'] = coord_dic['lon']
|
ordDic['lon'] = coord_dic['lon']
|
||||||
|
ordDic['categ'] = categ
|
||||||
|
ordDic['value'] = supposed_ip
|
||||||
coord_list = [coord['lat'], coord['lon']]
|
coord_list = [coord['lat'], coord['lon']]
|
||||||
self.push_to_redis_zset(self.keyCategCoord, json.dumps(ordDic))
|
self.push_to_redis_zset(self.keyCategCoord, json.dumps(ordDic))
|
||||||
self.push_to_redis_zset(self.keyCategCountry, rep['full_rep'].country.iso_code)
|
self.push_to_redis_zset(self.keyCategCountry, rep['full_rep'].country.iso_code)
|
||||||
|
|
|
@ -122,19 +122,21 @@ function updateTopMaps(date) {
|
||||||
}
|
}
|
||||||
for(var i=0; i<6 && i<list.length; i++) {
|
for(var i=0; i<6 && i<list.length; i++) {
|
||||||
// create marker + flyToIt
|
// create marker + flyToIt
|
||||||
coordJson = JSON.parse(list[i][0]);
|
dataJson = JSON.parse(list[i][0]);
|
||||||
allOpenStreetMap[i+1].flyTo([coordJson.lat, coordJson.lon], ZOOMLEVEL);
|
categ = dataJson.categ === undefined ? "" : dataJson.categ;
|
||||||
|
value = dataJson.value === undefined ? "" : dataJson.value;
|
||||||
|
allOpenStreetMap[i+1].flyTo([dataJson.lat, dataJson.lon], ZOOMLEVEL);
|
||||||
|
|
||||||
// update marker
|
// update marker
|
||||||
var markerToUpdate = savedMarker[i+1];
|
var markerToUpdate = savedMarker[i+1];
|
||||||
if (markerToUpdate != undefined) {
|
if (markerToUpdate != undefined) {
|
||||||
markerToUpdate.setLatLng({lat: coordJson.lat, lng: coordJson.lon});
|
markerToUpdate.setLatLng({lat: dataJson.lat, lng: dataJson.lon});
|
||||||
markerToUpdate._popup.setContent('lat: '+coordJson.lat+', lon: '+coordJson.lon+' (<strong>'+list[i][1]+'</strong>)');
|
markerToUpdate._popup.setContent(categ+' - '+value+' (<strong>'+list[i][1]+'</strong>)');
|
||||||
markerToUpdate.update();
|
markerToUpdate.update();
|
||||||
} else { // create new marker
|
} 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;
|
savedMarker[i+1] = marker;
|
||||||
marker.bindPopup('lat: '+coordJson.lat+', lon: '+coordJson.lon+' (<strong>'+list[i][1]+'</strong>)').openPopup();
|
marker.bindPopup(categ+' - '+value+' (<strong>'+list[i][1]+'</strong>)').openPopup();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue