optimising map zoom/pan, reset, etc
minor changes