refactored d3Map