integrate changes from mapjs for keyboard shortcuts