#94986 buffer and canvas approaches to representing areas around stations

And other changes