removed Canvas dependency in Map module