update map module.
Merge pull request #4496 from hieupham007/map-zip-3_1_X

update map module.