From 0b4aa3e4ee94c6de64421799919ac35cbc61f5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20L=C3=B8bger?= Date: Thu, 1 Aug 2013 22:50:31 +0200 Subject: [PATCH 1/8] Fixed animatesDrop for MKPinAnnotationView --- Source/Framework/Classes/MKPinAnnotationView.m | 9 +++++++++ Source/Framework/Resources/MapKit.html | 11 ++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Source/Framework/Classes/MKPinAnnotationView.m b/Source/Framework/Classes/MKPinAnnotationView.m index a59547e..8d64825 100644 --- 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/Resources/MapKit.html b/Source/Framework/Resources/MapKit.html index 4076126..9187a50 100644 --- a/Source/Framework/Resources/MapKit.html +++ b/Source/Framework/Resources/MapKit.html @@ -137,6 +137,7 @@ this.div_ = null; this.imageUrl_ = null; this.imageTag_ = null; + this.dropAnimation = true; // Assume we always want drop animation this.marker_ = null; this.calloutWrapper_ = null; this.calloutCanvas_ = null; @@ -208,6 +209,10 @@ if (annotation.calloutWrapper_) annotation.calloutWrapper_.style.zIndex = value; } + else if (option == "dropAnimation") + { + annotation.dropAnimation = value; + } } } @@ -432,12 +437,12 @@ // the map's panes are now available for attaching // the overlay to the map via the DOM. var me = this; - - // Create the DIV and set some basic attributes. var div = document.createElement('DIV'); - div.className = "dropAnimation"; + if (me.dropAnimation) { + div.className = "dropAnimation"; + } div.style.borderStyle = "none"; div.style.borderWidth = "0px"; div.style.position = "absolute"; From 9e74c5479fa86bce2e6a2061844b79b9f5ed6733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20L=C3=B8bger?= Date: Mon, 31 Mar 2014 10:20:40 +0200 Subject: [PATCH 2/8] Update to support Xcode 5.1 Change-Id: I84ff6cd0afad9dcf8d68f3a6770d1bec535eeb04 --- Source/Framework/Classes/MKMapView+Private.m | 8 ++++---- Source/Framework/Classes/MKMapView.m | 1 - Source/MapKit.xcodeproj/project.pbxproj | 12 +++++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Source/Framework/Classes/MKMapView+Private.m b/Source/Framework/Classes/MKMapView+Private.m index e5d6534..d08b16d 100644 --- 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.m b/Source/Framework/Classes/MKMapView.m index 7193020..b52cf93 100644 --- a/Source/Framework/Classes/MKMapView.m +++ b/Source/Framework/Classes/MKMapView.m @@ -60,7 +60,6 @@ - (void)dealloc [webView setFrameLoadDelegate:nil]; delegate = nil; [webView removeFromSuperview]; - [webView autorelease]; [locationManager stopUpdatingLocation]; [locationManager release]; [userLocation release]; diff --git a/Source/MapKit.xcodeproj/project.pbxproj b/Source/MapKit.xcodeproj/project.pbxproj index d869d5b..e2382be 100644 --- a/Source/MapKit.xcodeproj/project.pbxproj +++ b/Source/MapKit.xcodeproj/project.pbxproj @@ -738,7 +738,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0420; + LastUpgradeCheck = 0510; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "MapKit" */; compatibilityVersion = "Xcode 3.2"; @@ -882,7 +882,6 @@ 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -895,7 +894,6 @@ 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -907,6 +905,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_GC = required; @@ -931,6 +930,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_OBJC_GC = required; @@ -955,6 +955,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -965,7 +966,6 @@ ); FRAMEWORK_VERSION = A; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_GC = supported; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -986,6 +986,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 1; @@ -996,7 +997,6 @@ "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", ); FRAMEWORK_VERSION = A; - GCC_ENABLE_OBJC_GC = supported; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; @@ -1017,6 +1017,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1046,6 +1047,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( From 5db173bbee9b3769fd769e3b5542c64da9dab8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20L=C3=B8bger?= Date: Wed, 18 Mar 2015 16:28:54 +0100 Subject: [PATCH 3/8] Upgrade to Xcode 6.2 --- Source/MapKit.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/MapKit.xcodeproj/project.pbxproj b/Source/MapKit.xcodeproj/project.pbxproj index e2382be..415e194 100644 --- a/Source/MapKit.xcodeproj/project.pbxproj +++ b/Source/MapKit.xcodeproj/project.pbxproj @@ -738,7 +738,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0620; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "MapKit" */; compatibilityVersion = "Xcode 3.2"; From 8960d94ca038b0531b481450a9a84a71d71b33c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20L=C3=B8bger?= Date: Wed, 11 Nov 2015 23:10:09 +0100 Subject: [PATCH 4/8] Update to Xcode 7.1 Change-Id: I8e9c5629abd19917ba2a34ed6bd512a9b73cf641 --- Source/MapKit.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/MapKit.xcodeproj/project.pbxproj b/Source/MapKit.xcodeproj/project.pbxproj index 415e194..7742e6f 100644 --- a/Source/MapKit.xcodeproj/project.pbxproj +++ b/Source/MapKit.xcodeproj/project.pbxproj @@ -738,7 +738,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0620; + LastUpgradeCheck = 0710; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "MapKit" */; compatibilityVersion = "Xcode 3.2"; From 21569c7d33130e3a78b33cacd1d0812ae7ccbcf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20L=C3=B8bger?= Date: Wed, 11 Nov 2015 23:10:18 +0100 Subject: [PATCH 5/8] Use https instead of http Change-Id: I79a2695d6958ff65d17e000923a32c290e9fbf2e --- Source/Framework/Resources/MapKit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Framework/Resources/MapKit.html b/Source/Framework/Resources/MapKit.html index 9187a50..8a241f8 100644 --- a/Source/Framework/Resources/MapKit.html +++ b/Source/Framework/Resources/MapKit.html @@ -1,7 +1,7 @@ - +