Repair and rebase dougt's MapView_support branch

@dougt: I had to fix some bugs in your MapView_support branch, but maps are now working! :+1: