Authored by Michael Hill

zoombounds respected on pinch zoom in

... ... @@ -346,7 +346,16 @@
}
else
{
if(([self zoom] >= [self minZoom]) && ([self zoom] <= [self maxZoom]))
//bools for syntactical sugar to understand the logic in the if statement below
BOOL zoomAtMax = ([self zoom] == [self maxZoom]);
BOOL zoomAtMin = ([self zoom] == [self minZoom]);
BOOL zoomGreaterMin = ([self zoom] > [self minZoom]);
BOOL zoomLessMax = ([self zoom] < [self maxZoom]);
//zooming in zoomFactor > 1
//zooming out zoomFactor < 1
if ((zoomGreaterMin && zoomLessMax) || (zoomAtMax && zoomFactor<1) || (zoomAtMin && zoomFactor>1))
{
[mercatorToScreenProjection zoomScreenByFactor:zoomFactor near:pivot];
[imagesOnScreen zoomByFactor:zoomFactor near:pivot];
... ...