Taxi Station Mapping: Fixes #5789 and #5787

Created by: Arthurdentist

Haven't tested it yet because I need to sleep, but I am throwing this up now so that people know they are both being sorted.