fixed the 4.5 merge bug of plotting station in the map
Merge remote-tracking branch 'origin/master'