maps feature ok
merge fix
refactor gmap caller