Oomph · MartinLobger-GN-com · Aug 1, 2013 · Mar 31, 2014 · Mar 18, 2015 · Nov 11, 2015
diff --git a/Source/DemoApp/Classes/DemoAppApplicationDelegate.h b/Source/DemoApp/Classes/DemoAppApplicationDelegate.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MapKit.h>
+#import "MapKit.h"
 
 @class MKMapView;
 

diff --git a/Source/DemoApp/Classes/DemoAppApplicationDelegate.m b/Source/DemoApp/Classes/DemoAppApplicationDelegate.m
@@ -8,7 +8,7 @@
 
 #import "DemoAppApplicationDelegate.h"
 #import <CoreLocation/CoreLocation.h>
-#import <MapKit/MapKit.h>
+#import "MapKit.h"
 
 @implementation DemoAppApplicationDelegate
 

diff --git a/Source/Framework/Classes/MKAnnotationView.h b/Source/Framework/Classes/MKAnnotationView.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKView.h>
+#import "MKView.h"
 #import <WebKit/WebKit.h>
 
 enum {

diff --git a/Source/Framework/Classes/MKAnnotationView.m b/Source/Framework/Classes/MKAnnotationView.m
@@ -7,7 +7,7 @@
 //
 
 #import "MKAnnotationView.h"
-#import <MapKit/MKAnnotation.h>
+#import "MKAnnotation.h"
 
 
 

diff --git a/Source/Framework/Classes/MKCircle.h b/Source/Framework/Classes/MKCircle.h
@@ -8,9 +8,9 @@
 
 #import <Cocoa/Cocoa.h>
 #import <CoreLocation/CoreLocation.h>
-#import <MapKit/MKShape.h>
-#import <MapKit/MKOverlay.h>
-#import <MapKit/MKGeometry.h>
+#import "MKShape.h"
+#import "MKOverlay.h"
+#import "MKGeometry.h"
 
 @interface MKCircle : MKShape <MKOverlay> {
     @package

diff --git a/Source/Framework/Classes/MKCircleView.h b/Source/Framework/Classes/MKCircleView.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKOverlayPathView.h>
+#import "MKOverlayPathView.h"
 
 @class MKCircle;
 

diff --git a/Source/Framework/Classes/MKCircleView.m b/Source/Framework/Classes/MKCircleView.m
@@ -7,7 +7,7 @@
 //
 
 #import "MKCircleView.h"
-#import <MapKit/MKCircle.h>
+#import "MKCircle.h"
 
 @implementation MKCircleView
 

diff --git a/Source/Framework/Classes/MKGeocoder.h b/Source/Framework/Classes/MKGeocoder.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import <CoreLocation/CLLocation.h>
 #import <WebKit/WebKit.h>
-#import <MapKit/MKTypes.h>
+#import "MKTypes.h"
 
 @protocol MKGeocoderDelegate;
 

diff --git a/Source/Framework/Classes/MKMapView+Additions.h b/Source/Framework/Classes/MKMapView+Additions.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMapView.h>
+#import "MKMapView.h"
 
 @interface MKMapView (Additions)
 

diff --git a/Source/Framework/Classes/MKMapView+DelegateWrappers.h b/Source/Framework/Classes/MKMapView+DelegateWrappers.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMapView.h>
+#import "MKMapView.h"
 
 @interface MKMapView (DelegateWrappers)
 

diff --git a/Source/Framework/Classes/MKMapView+Private.m b/Source/Framework/Classes/MKMapView+Private.m
@@ -34,14 +34,14 @@ - (void)customInit
 
     // Create the overlay data structures
     overlays = [[NSMutableArray array] retain];
-    overlayViews = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
-    overlayScriptObjects = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
+    overlayViews = [[NSMapTable strongToStrongObjectsMapTable] retain];
+    overlayScriptObjects = [[NSMapTable strongToStrongObjectsMapTable] retain];
 
     // Create the annotation data structures
     annotations = [[NSMutableArray array] retain];
     selectedAnnotations = [[NSMutableArray array] retain];
-    annotationViews = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
-    annotationScriptObjects = [[NSMapTable mapTableWithStrongToStrongObjects] retain];
+    annotationViews = [[NSMapTable strongToStrongObjectsMapTable] retain];
+    annotationScriptObjects = [[NSMapTable strongToStrongObjectsMapTable] retain];
 
     [self loadMapKitHtml];
 

diff --git a/Source/Framework/Classes/MKMapView+WebViewIntegration.h b/Source/Framework/Classes/MKMapView+WebViewIntegration.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMapView.h>
+#import "MKMapView.h"
 
 @interface MKMapView (WebViewIntegration)
 

diff --git a/Source/Framework/Classes/MKMapView.h b/Source/Framework/Classes/MKMapView.h
@@ -9,10 +9,10 @@
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebKit.h>
 #import <CoreLocation/CoreLocation.h>
-#import <MapKit/MKTypes.h>
-#import <MapKit/MKGeometry.h>
-#import <MapKit/MKOverlay.h>
-#import <MapKit/MKAnnotationView.h>
+#import "MKTypes.h"
+#import "MKGeometry.h"
+#import "MKOverlay.h"
+#import "MKAnnotationView.h"
 
 @protocol MKMapViewDelegate;
 @class MKUserLocation;

diff --git a/Source/Framework/Classes/MKMapView.m b/Source/Framework/Classes/MKMapView.m
@@ -9,14 +9,14 @@
 #import "MKMapView.h"
 #import "MKMapView+Private.h"
 #import "JSON.h"
-#import <MapKit/MKUserLocation.h>
+#import "MKUserLocation.h"
 #import "MKUserLocation+Private.h"
-#import <MapKit/MKCircleView.h>
-#import <MapKit/MKCircle.h>
-#import <MapKit/MKPolyline.h>
-#import <MapKit/MKPolygon.h>
-#import <MapKit/MKAnnotationView.h>
-#import <MapKit/MKPointAnnotation.h>
+#import "MKCircleView.h"
+#import "MKCircle.h"
+#import "MKPolyline.h"
+#import "MKPolygon.h"
+#import "MKAnnotationView.h"
+#import "MKPointAnnotation.h"
 #import "MKMapView+DelegateWrappers.h"
 #import "MKMapView+WebViewIntegration.h"
 #import "MKWebView.h"
@@ -60,7 +60,6 @@ - (void)dealloc
     [webView setFrameLoadDelegate:nil];
     delegate = nil;
     [webView removeFromSuperview];
-    [webView autorelease];
     [locationManager stopUpdatingLocation];
     [locationManager release];
     [userLocation release];
@@ -136,6 +135,9 @@ - (MKCoordinateRegion)region
 {
     WebScriptObject *webScriptObject = [webView windowScriptObject];
     NSString *json = [webScriptObject evaluateWebScript:@"getRegion()"];
+    if (![json isKindOfClass:[NSString class]]) {
+        return MKCoordinateRegionMake(CLLocationCoordinate2DMake(0, 0), MKCoordinateSpanMake(0, 0));
+    }
     NSDictionary *regionDict = [json JSONValue];
 
     NSNumber *centerLatitude = [regionDict valueForKeyPath:@"center.latitude"];

diff --git a/Source/Framework/Classes/MKMultiPoint.h b/Source/Framework/Classes/MKMultiPoint.h
@@ -7,9 +7,9 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKShape.h>
-#import <MapKit/MKGeometry.h>
-#import <MapKit/MKTypes.h>
+#import "MKShape.h"
+#import "MKGeometry.h"
+#import "MKTypes.h"
 
 @interface MKMultiPoint : MKShape {
     CLLocationCoordinate2D *coordinates;

diff --git a/Source/Framework/Classes/MKOverlay.h b/Source/Framework/Classes/MKOverlay.h
@@ -7,9 +7,9 @@
  *
  */
 
-#import <MapKit/MKAnnotation.h>
-#import <MapKit/MKTypes.h>
-#import <MapKit/MKGeometry.h>
+#import "MKAnnotation.h"
+#import "MKTypes.h"
+#import "MKGeometry.h"
 
 
 @protocol MKOverlay <MKAnnotation>

diff --git a/Source/Framework/Classes/MKOverlayPathView.h b/Source/Framework/Classes/MKOverlayPathView.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKOverlayView.h>
+#import "MKOverlayView.h"
 
 @interface MKOverlayPathView : MKOverlayView {
     NSColor *fillColor;

diff --git a/Source/Framework/Classes/MKOverlayView.h b/Source/Framework/Classes/MKOverlayView.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKOverlay.h>
-#import <MapKit/MKView.h>
+#import "MKOverlay.h"
+#import "MKView.h"
 
 @interface MKOverlayView : MKView {
     id <MKOverlay> overlay;

diff --git a/Source/Framework/Classes/MKPinAnnotationView.h b/Source/Framework/Classes/MKPinAnnotationView.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKAnnotationView.h>
+#import "MKAnnotationView.h"
 
 enum {
     MKPinAnnotationColorRed = 0,

diff --git a/Source/Framework/Classes/MKPinAnnotationView.m b/Source/Framework/Classes/MKPinAnnotationView.m
@@ -46,4 +46,13 @@ - (NSString *)imageUrl
     return [url absoluteString];
 }
 
+
+- (NSDictionary *)options {
+    NSMutableDictionary* mutableOptions = [[super options] mutableCopy];
+
+    [mutableOptions setObject:[NSNumber numberWithBool:animatesDrop] forKey:@"dropAnimation"];
+
+    return [[mutableOptions copy] autorelease];
+}
+
 @end
diff --git a/Source/Framework/Classes/MKPlacemark+Private.h b/Source/Framework/Classes/MKPlacemark+Private.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKPlacemark.h>
+#import "MKPlacemark.h"
 
 @interface MKPlacemark (Private)
 

diff --git a/Source/Framework/Classes/MKPlacemark.h b/Source/Framework/Classes/MKPlacemark.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKAnnotation.h>
+#import "MKAnnotation.h"
 #import <CoreLocation/CLLocation.h>
 
 @interface MKPlacemark : NSObject <MKAnnotation> {

diff --git a/Source/Framework/Classes/MKPointAnnotation.h b/Source/Framework/Classes/MKPointAnnotation.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKShape.h>
+#import "MKShape.h"
 #import <CoreLocation/CLLocation.h>
 
 @interface MKPointAnnotation : MKShape {

diff --git a/Source/Framework/Classes/MKPolygon.h b/Source/Framework/Classes/MKPolygon.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMultiPoint.h>
-#import <MapKit/MKOverlay.h>
+#import "MKMultiPoint.h"
+#import "MKOverlay.h"
 
 @interface MKPolygon : MKMultiPoint <MKOverlay> {
     NSArray *interiorPolygons;

diff --git a/Source/Framework/Classes/MKPolygonView.h b/Source/Framework/Classes/MKPolygonView.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKPolygon.h>
-#import <MapKit/MKOverlayPathView.h>
+#import "MKPolygon.h"
+#import "MKOverlayPathView.h"
 
 @interface MKPolygonView : MKOverlayPathView{
     NSArray *path;

diff --git a/Source/Framework/Classes/MKPolyline.h b/Source/Framework/Classes/MKPolyline.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKMultiPoint.h>
-#import <MapKit/MKOverlay.h>
+#import "MKMultiPoint.h"
+#import "MKOverlay.h"
 
 @interface MKPolyline : MKMultiPoint <MKOverlay>
 

diff --git a/Source/Framework/Classes/MKPolylineView.h b/Source/Framework/Classes/MKPolylineView.h
@@ -7,8 +7,8 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKPolyline.h>
-#import <MapKit/MKOverlayPathView.h>
+#import "MKPolyline.h"
+#import "MKOverlayPathView.h"
 
 @interface MKPolylineView : MKOverlayPathView {
     NSArray *path;

diff --git a/Source/Framework/Classes/MKReverseGeocoder.h b/Source/Framework/Classes/MKReverseGeocoder.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import <CoreLocation/CLLocation.h>
 #import <WebKit/WebKit.h>
-#import <MapKit/MKTypes.h>
+#import "MKTypes.h"
 
 @class MKPlacemark;
 @protocol MKReverseGeocoderDelegate;

diff --git a/Source/Framework/Classes/MKShape.h b/Source/Framework/Classes/MKShape.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKAnnotation.h>
+#import "MKAnnotation.h"
 
 @interface MKShape : NSObject <MKAnnotation> {
     @package

diff --git a/Source/Framework/Classes/MKUserLocation+Private.h b/Source/Framework/Classes/MKUserLocation+Private.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKUserLocation.h>
+#import "MKUserLocation.h"
 
 @class CLLocation;
 

diff --git a/Source/Framework/Classes/MKUserLocation.h b/Source/Framework/Classes/MKUserLocation.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MapKit/MKAnnotation.h>
+#import "MKAnnotation.h"
 
 @class CLLocation;