California → CA

Looks nicer, and the Google geocode resolves it more reliably than
Wikipedia did
Shorten names in AU & NZ
Cope with no level1 addresses

UK often doesn’t have these.
Add flight details

Need to come up with a more structured approach to this generally, as
this won’t cope with multiple flights on one day
LHR-SFO