Merge pull request #211 from hansemannn/MOD-2357

[MOD-2357] Fix selectedAnnotation release-crash
tidev · Sep 29, 2017 · 2220444 · 2220444
2 parents 0336990 + 35e3124
commit 2220444
Show file tree

Hide file tree

Showing 34 changed files with 3,029 additions and 3,047 deletions.
diff --git a/ios/.clang-format b/ios/.clang-format
@@ -0,0 +1,96 @@
+---
+# BasedOnStyle:  WebKit
+AccessModifierOffset: -4
+AlignAfterOpenBracket: DontAlign
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: false
+AlignOperands:   false
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: WebKit
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     0
+CommentPragmas:  '^ IWYU pragma:'
+BreakBeforeInheritanceComma: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories: 
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '$'
+IndentCaseLabels: false
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: Inner
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
diff --git a/ios/Classes/TiMKOverlayPathUniversal.h b/ios/Classes/TiMKOverlayPathUniversal.h
@@ -7,7 +7,7 @@
 
 #import <MapKit/MapKit.h>
 
-@protocol TiMKOverlayPathUniversal<NSObject>
+@protocol TiMKOverlayPathUniversal <NSObject>
 
 @property (retain) UIColor *fillColor;
 @property (retain) UIColor *strokeColor;

diff --git a/ios/Classes/TiMapAnnotationProxy.h b/ios/Classes/TiMapAnnotationProxy.h
@@ -11,23 +11,23 @@
 
 @class TiMapViewProxy;
 
-@interface TiMapAnnotationProxy : TiViewProxy<MKAnnotation, TiProxyObserver> {
-@private
-	int tag;
-	TiMapViewProxy *delegate;
-	BOOL needsRefreshing;
-	BOOL needsRefreshingWithSelection;
-	BOOL placed;
-	CGPoint offset;
+@interface TiMapAnnotationProxy : TiViewProxy <MKAnnotation, TiProxyObserver> {
+  @private
+  int tag;
+  TiMapViewProxy *delegate;
+  BOOL needsRefreshing;
+  BOOL needsRefreshingWithSelection;
+  BOOL placed;
+  CGPoint offset;
 }
 
 // Center latitude and longitude of the annotion view.
 @property (nonatomic, readonly) CLLocationCoordinate2D coordinate;
 @property (nonatomic, readwrite, assign) TiMapViewProxy *delegate;
-@property (nonatomic,readonly)	BOOL needsRefreshingWithSelection;
+@property (nonatomic, readonly) BOOL needsRefreshingWithSelection;
 @property (nonatomic, readwrite, assign) BOOL placed;
 @property (nonatomic, readonly) CGPoint offset;
-@property (nonatomic, retain) id <UIViewControllerPreviewing> controllerPreviewing;
+@property (nonatomic, retain) id<UIViewControllerPreviewing> controllerPreviewing;
 
 // Title and subtitle for use by selection UI.
 - (NSString *)title;
@@ -38,8 +38,8 @@
 - (BOOL)animatesDrop;
 - (void)setHidden:(id)value;
 
-- (UIView*)leftViewAccessory;
-- (UIView*)rightViewAccessory;
+- (UIView *)leftViewAccessory;
+- (UIView *)rightViewAccessory;
 
 - (int)tag;