Refactor map format to not have a separate tile model