add stronger region annotations to the maps
auto merge of #5670 : thestinger/rust/map, r=catamorphism