geoJSON formatting, d3 add, move geoJSON defs into callback