add choropleth and datamap versions