Added Location and LocationFn. Modified MapActivity to use them.