update osmdroid and the code for the new way, fix test problems