Fixed neilang#37.

ashfurrow · Jun 17, 2014 · ce53cc5 · ce53cc5
1 parent 97ed5bd
commit ce53cc5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Next
+
+* [#37](https://github.com/neilang/NAMapKit/issues/37) - Fix `NAMapView` from returning `{NaN, NaN}` - [@ashfurrow](http://github.com/ashfurrow).
+
 #### [3.1.1](https://github.com/neilang/NAMapKit/tree/v3.1.1) (5/12/2014)
 
 * [#31](https://github.com/neilang/NAMapKit/issues/31) - Fix: `NAPinAnnotation` and `NAPinAnnotationView` retain cycle - [@dblock](https://github.com/dblock).

diff --git a/NAMapKit/NAMapView.m b/NAMapKit/NAMapView.m
@@ -121,9 +121,16 @@ - (void)centerOnPoint:(CGPoint)point animated:(BOOL)animate
 
 - (CGPoint)zoomRelativePoint:(CGPoint)point
 {
-    CGFloat x = (self.contentSize.width / self.originalSize.width) * point.x;
-    CGFloat y = (self.contentSize.height / self.originalSize.height) * point.y;
-    return CGPointMake(round(x), round(y));
+    BOOL hasContentSize = fabsf(self.originalSize.width) > 0 && fabsf(self.originalSize.height) > 0;
+    NSAssert(hasContentSize, @"originalSize dimension is zero, will result in NaN in returned value.");
+
+    if (hasContentSize) {
+        CGFloat x = (self.contentSize.width / self.originalSize.width) * point.x;
+        CGFloat y = (self.contentSize.height / self.originalSize.height) * point.y;
+        return CGPointMake(round(x), round(y));
+    } else {
+        return CGPointZero;
+    }
 }
 
 - (void)selectAnnotation:(NAAnnotation *)annotation animated:(BOOL)animate