Merge remote-tracking branch 'origin/update_geojs'
update map info during animations
Merge remote-tracking branch 'origin/159-update-query-during-animation' into next