MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bug marker from streetLocation not removing

pull/18/head
Sami Mokaddem 2017-10-27 16:16:40 +02:00
parent 62522f822f
commit 7b1afdc60e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/index/index_map.js
View File

@ -1,6 +1,6 @@
const MAXNUMCOORD = 100; const MAXNUMCOORD = 100;
const PINGWAITTIME = 1000*1; //1s const PINGWAITTIME = 1000*1; //1s
const MAXIMGROTATION = max_img_rotation; const MAXIMGROTATION = parseInt(max_img_rotation);
const OSMURL='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; const OSMURL='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
const OSMATTRIB='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors'; const OSMATTRIB='Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors';
@ -44,11 +44,11 @@ class MapEventManager {
} }
addMapEvent(mapevent) { addMapEvent(mapevent) {
if(this._mapEventArray.length >= MAXIMGROTATION) { if(this.getNumberOfEvent() > MAXIMGROTATION) {
var toDel = this._mapEventArray[0]; var toDel = this._mapEventArray[0];
toDel.marker.remove(); // remove marker toDel.marker.remove(); // remove marker
this._coordSet.delete(toDel.text); this._coordSet.delete(toDel.text);
this._mapEventArray.slice(1); this._mapEventArray = this._mapEventArray.slice(1);
} }
if(!this._coordSet.has(mapevent.text)) { // avoid duplicate map if(!this._coordSet.has(mapevent.text)) { // avoid duplicate map
@ -124,7 +124,7 @@ class MapEventManager {
this._curMarkerNum = this._curMarkerNum >= MAXNUMCOORD ? 0 : this._curMarkerNum+1; this._curMarkerNum = this._curMarkerNum >= MAXNUMCOORD ? 0 : this._curMarkerNum+1;
if (this._allMarkers.length >= MAXNUMCOORD) { if (this._allMarkers.length >= MAXNUMCOORD) {
to_remove = this._allMarkers[0]; var to_remove = this._allMarkers[0];
openStreetMapObj.removeMarkers([to_remove]); openStreetMapObj.removeMarkers([to_remove]);
this._allMarkers = this._allMarkers.slice(1); this._allMarkers = this._allMarkers.slice(1);
} }

2
zmq_subscriber.py
View File

@ -91,7 +91,7 @@ def getCoordAndPublish(zmq_name, supposed_ip, categ):
serv_coord.publish(CHANNELDISP, json.dumps(to_send)) serv_coord.publish(CHANNELDISP, json.dumps(to_send))
except ValueError: except ValueError:
print("can't resolve ip") print("can't resolve ip")
except ip2.errors.AddressNotFoundError: except geoip2.errors.AddressNotFoundError:
print("Address not in Database") print("Address not in Database")
def getFields(obj, fields): def getFields(obj, fields):