merge from mapjs fix -flip bug - goes back to original position sometimes