JAL-2349 JAL-4033 refactored contact matrix geom calc to allow reporting of mapped...