merge from mapjs