Got the plotter updated correctly to work with both geometry types