[Map] Fix and improve TypeScript types, refactor same logic into dedicated methods (to reduce file size)

[Map] Fix and improve TypeScript types, refactor same logic into dedicated methods (to reduce file size) #1882