refoctor: simplify, dont use google map
changelog note