batcave: upon merging ALFRED and BATMAN data always reset a node's aliases, clients and neighbours

batcave.py

@@ -107,7 +107,13 @@ while True:
 			d.push(newdata)
 
 		logger.debug('Step 3/3: Merging current data ...')
-		storage.data = dict_merge(storage.data, newdata)
+		temp = dict_merge(storage.data, {})
+		for x in temp:
+			if not x in newdata: continue
+			temp[x]['aliases'] = []
+			temp[x]['clients'] = []
+			temp[x]['neighbours'] = []
+		storage.data = dict_merge(temp, newdata)
 		logger.debug('I have data for ' + str(len(storage.data)) + ' nodes.')
 
 		storage.save()