Update map

Increase max zoom to 17 and make explicit that MapBuilder is in the global namespace.