Retarget #884 to develop. Use d3 map instead of object in new style plot.