Chore/refactor js map model