Change zoom method names
Sort out recomputation of locationScale / zoom so everything gets calculated when it needs to be, and not when it doesn't.

I think. Major change is the computeLocationScale does not recalculate the zoom, which is important because one of the places that gets called is when the zoom changes.