Fix map and footer data
Merge branch 'master' of https://github.com/fanGroup/new-fan