more googlemapadpter refactoring