refactor towards moving map functions to mapfactory
refactor map rendering into mapfactory
refactor map to map factory
resolve merge conflict
Merge pull request #197 from atungare/dev

refactor map out to map factory