first commit
map request ok
set point on map ok
merged conflicts
bla