Choropleth and risk maps and point maps done