Merge pull request #462 from jquick-axway/TIMOB-28509

fix(ios): include missing i386 and armv7 architectures

ios/Classes/TiMapAnnotationProxy.h

@@ -33,6 +33,7 @@
 - (NSString *)title;
 - (NSString *)subtitle;
 - (id)pincolor;
+- (id)nativePinColor;
 - (BOOL)animatesDrop;
 - (void)setHidden:(id)value;
 - (UIView *)leftViewAccessory;

ios/Classes/TiMapAnnotationProxy.m

@@ -236,6 +236,49 @@ - (void)setPincolor:(id)color
   }
 }
 
+// Mapping both string-colors, color constant and native colors to a pin color
+// This is overcomplicated to maintain iOS < 9 compatibility. Remove this when
+// we have a minimum iOS verion of 9.0+
+- (id)nativePinColor
+{
+  id current = [self valueForUndefinedKey:@"pincolor"];
+
+  if ([current isKindOfClass:[NSString class]]) {
+    return [[TiUtils colorValue:current] color];
+  }
+
+  switch ([TiUtils intValue:current def:TiMapAnnotationPinColorRed]) {
+  case TiMapAnnotationPinColorGreen: {
+    return [MKPinAnnotationView greenPinColor];
+  }
+  case TiMapAnnotationPinColorPurple: {
+    return [MKPinAnnotationView purplePinColor];
+  }
+  case TiMapAnnotationPinColorBlue:
+    return [UIColor blueColor];
+  case TiMapAnnotationPinColorCyan:
+    return [UIColor cyanColor];
+  case TiMapAnnotationPinColorMagenta:
+    return [UIColor magentaColor];
+  case TiMapAnnotationPinColorOrange:
+    return [UIColor orangeColor];
+  case TiMapAnnotationPinColorYellow:
+    return [UIColor yellowColor];
+
+  // UIColor extensions
+  case TiMapAnnotationPinColorAzure:
+    return [UIColor azureColor];
+  case TiMapAnnotationPinColorRose:
+    return [UIColor roseColor];
+  case TiMapAnnotationPinColorViolet:
+    return [UIColor violetColor];
+  case TiMapAnnotationPinColorRed:
+  default: {
+    return [MKPinAnnotationView redPinColor];
+  }
+  }
+}
+
 - (BOOL)animatesDrop
 {
   return [TiUtils boolValue:[self valueForUndefinedKey:@"animate"]];
@@ -442,6 +485,7 @@ - (void)setAnnotationDisplayPriority:(id)displayPriority
   }
 }
 
+#if IS_IOS_11
 - (void)setClusterIdentifier:(id)clusterIdentifier
 {
   id current = [self valueForUndefinedKey:@"clusterIdentifier"];
@@ -450,6 +494,7 @@ - (void)setClusterIdentifier:(id)clusterIdentifier
     [self setNeedsRefreshingWithSelection:YES];
   }
 }
+#endif
 
 - (void)setCustomView:(id)customView
 {

ios/Classes/TiMapMarkerAnnotationView.h

@@ -4,6 +4,7 @@
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
+#if IS_IOS_11
 #import "TiBase.h"
 #import "TiMapView.h"
 #import <MapKit/MapKit.h>
@@ -17,3 +18,4 @@
 - (NSString *)lastHitName;
 
 @end
+#endif

ios/Classes/TiMapMarkerAnnotationView.m

@@ -4,6 +4,7 @@
  * Licensed under the terms of the Apache Public License
  * Please see the LICENSE included with this distribution for details.
  */
+#if IS_IOS_11
 #import "TiMapMarkerAnnotationView.h"
 #import "TiMapAnnotationProxy.h"
 #import "TiMapView.h"
@@ -63,3 +64,4 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
   return result;
 }
 @end
+#endif

ios/Classes/TiMapModule.h

@@ -11,15 +11,15 @@
   UIColor *colorRed;
 }
 
-+ (void)logAddedIniOS7Warning:(NSString *)name;
-
 @property (nonatomic, readonly) NSNumber *STANDARD_TYPE;
 @property (nonatomic, readonly) NSNumber *NORMAL_TYPE; // For parity with Android
 @property (nonatomic, readonly) NSNumber *SATELLITE_TYPE;
 @property (nonatomic, readonly) NSNumber *HYBRID_TYPE;
 @property (nonatomic, readonly) NSNumber *HYBRID_FLYOVER_TYPE;
 @property (nonatomic, readonly) NSNumber *SATELLITE_FLYOVER_TYPE;
+#if IS_IOS_11
 @property (nonatomic, readonly) NSNumber *MUTED_STANDARD_TYPE;
+#endif
 
 @property (nonatomic, readonly) NSNumber *ANNOTATION_RED;
 @property (nonatomic, readonly) NSNumber *ANNOTATION_GREEN;

ios/Classes/TiMapModule.m

@@ -32,13 +32,6 @@ - (NSString *)apiName
   return @"Ti.Map";
 }
 
-#pragma mark Utils
-
-+ (void)logAddedIniOS7Warning:(NSString *)name
-{
-  NSLog(@"[WARN] `%@` is only supported on iOS 7 and greater.", name);
-}
-
 #pragma mark Public APIs
 
 - (TiMapViewProxy *)createView:(id)args
@@ -57,7 +50,9 @@ - (TiMapCameraProxy *)createCamera:(id)args
 MAKE_SYSTEM_PROP(HYBRID_TYPE, MKMapTypeHybrid);
 MAKE_SYSTEM_PROP(HYBRID_FLYOVER_TYPE, MKMapTypeHybridFlyover);
 MAKE_SYSTEM_PROP(SATELLITE_FLYOVER_TYPE, MKMapTypeSatelliteFlyover);
+#if IS_IOS_11
 MAKE_SYSTEM_PROP(MUTED_STANDARD_TYPE, MKMapTypeMutedStandard);
+#endif
 MAKE_SYSTEM_PROP(ANNOTATION_RED, TiMapAnnotationPinColorRed);
 MAKE_SYSTEM_PROP(ANNOTATION_GREEN, TiMapAnnotationPinColorGreen);
 MAKE_SYSTEM_PROP(ANNOTATION_PURPLE, TiMapAnnotationPinColorPurple);
@@ -82,6 +77,7 @@ - (TiMapCameraProxy *)createCamera:(id)args
 MAKE_SYSTEM_PROP(POLYLINE_PATTERN_DASHED, TiMapOverlyPatternTypeDashed);
 MAKE_SYSTEM_PROP(POLYLINE_PATTERN_DOTTED, TiMapOverlyPatternTypeDotted);
 
+#if IS_IOS_11
 MAKE_SYSTEM_PROP(FEATURE_VISIBILITY_ADAPTIVE, MKFeatureVisibilityAdaptive);
 MAKE_SYSTEM_PROP(FEATURE_VISIBILITY_HIDDEN, MKFeatureVisibilityHidden);
 MAKE_SYSTEM_PROP(FEATURE_VISIBILITY_VISIBLE, MKFeatureVisibilityVisible);
@@ -92,5 +88,6 @@ - (TiMapCameraProxy *)createCamera:(id)args
 MAKE_SYSTEM_PROP_DBL(FEATURE_DISPLAY_PRIORITY_REQUIRED, MKFeatureDisplayPriorityRequired);
 MAKE_SYSTEM_PROP_DBL(FEATURE_DISPLAY_PRIORITY_DEFAULT_HIGH, MKFeatureDisplayPriorityDefaultHigh);
 MAKE_SYSTEM_PROP_DBL(FEATURE_DISPLAY_PRIORITY_DEFAULT_LOW, MKFeatureDisplayPriorityDefaultLow);
+#endif
 
 @end

ios/Classes/TiMapPinAnnotationView.h

@@ -9,7 +9,7 @@
 #import "TiMapView.h"
 #import <MapKit/MapKit.h>
 
-@interface TiMapPinAnnotationView : MKMarkerAnnotationView <TiMapAnnotation> {
+@interface TiMapPinAnnotationView : MKPinAnnotationView <TiMapAnnotation> {
   @private
 
   NSString *lastHitName;

ios/Classes/TiMapView.h

@@ -32,8 +32,10 @@
   NSMutableArray *circleProxies;
   NSMutableArray *polylineProxies;
   NSMutableArray *imageOverlayProxies;
-  NSMutableDictionary *clusterAnnotations;
 
+#if IS_IOS_11
+  NSMutableDictionary *clusterAnnotations;
+#endif
   //selected annotation
   MKAnnotationView<TiMapAnnotation> *selectedAnnotation;
 
@@ -93,7 +95,9 @@
 - (void)removeAllImageOverlays;
 
 - (void)firePinChangeDragState:(MKAnnotationView *)pinview newState:(MKAnnotationViewDragState)newState fromOldState:(MKAnnotationViewDragState)oldState;
+#if IS_IOS_11
 - (void)setClusterAnnotation:(TiMapAnnotationProxy *)annotation forMembers:(NSArray<TiMapAnnotationProxy *> *)members;
+#endif
 - (void)animateAnnotation:(TiMapAnnotationProxy *)newAnnotation withLocation:(CLLocationCoordinate2D)newLocation;
 
 #pragma mark Utils

ios/Classes/TiMapView.m

@@ -46,7 +46,9 @@ - (void)dealloc
   RELEASE_TO_NIL(polylineProxies);
   RELEASE_TO_NIL(circleProxies);
   RELEASE_TO_NIL(imageOverlayProxies);
+#if IS_IOS_11
   RELEASE_TO_NIL(clusterAnnotations);
+#endif
   [super dealloc];
 }
 
@@ -917,6 +919,7 @@ - (void)showAnnotations:(id)args
       NO);
 }
 
+#if IS_IOS_11
 - (void)setClusterAnnotation:(TiMapAnnotationProxy *)annotation forMembers:(NSArray<TiMapAnnotationProxy *> *)members
 {
   if (!clusterAnnotations) {
@@ -935,6 +938,7 @@ - (TiMapAnnotationProxy *)clusterAnnotationProxyForMembers:(NSArray *)members
 {
   return [clusterAnnotations objectForKey:members];
 }
+#endif
 
 #pragma mark Utils
 
@@ -1128,7 +1132,7 @@ - (void)mapView:(MKMapView *)mapView didDeselectAnnotationView:(MKAnnotationView
 - (void)mapView:(MKMapView *)mapView annotationView:(MKAnnotationView *)aview calloutAccessoryControlTapped:(UIControl *)control
 {
   if ([aview conformsToProtocol:@protocol(TiMapAnnotation)]) {
-    MKMarkerAnnotationView *pinview = (MKMarkerAnnotationView *)aview;
+    MKPinAnnotationView *pinview = (MKPinAnnotationView *)aview;
     NSString *clickSource = @"unknown";
     if (aview.leftCalloutAccessoryView == control) {
       clickSource = @"leftButton";
@@ -1153,27 +1157,34 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap
   if (customView == nil && !marker) {
     id imagePath = [ann valueForUndefinedKey:@"image"];
     image = [TiUtils image:imagePath proxy:ann];
-    identifier = (image != nil) ? @"timap-image" : @"timap-marker";
+    identifier = (image != nil) ? @"timap-image" : @"timap-pin";
   } else if (customView) {
     identifier = @"timap-customView";
+  } else {
+    identifier = @"timap-marker";
   }
   MKAnnotationView *annView = nil;
   annView = (MKAnnotationView *)[mapView dequeueReusableAnnotationViewWithIdentifier:identifier];
 
   if (annView == nil) {
     if ([identifier isEqualToString:@"timap-customView"]) {
       annView = [[[TiMapCustomAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease];
+#if IS_IOS_11
+    } else if ([TiMapView isiOS11OrGreater] && [identifier isEqualToString:@"timap-marker"]) {
+      annView = [[[TiMapMarkerAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease];
+#endif
     } else if ([identifier isEqualToString:@"timap-image"]) {
       annView = [[[TiMapImageAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self image:image] autorelease];
     } else {
-      annView = [[[TiMapMarkerAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease];
+      annView = [[[TiMapPinAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease];
     }
   }
   if ([identifier isEqualToString:@"timap-customView"]) {
     [((TiMapCustomAnnotationView *)annView) setProxy:customView];
   } else if ([identifier isEqualToString:@"timap-image"]) {
     annView.image = image;
-  } else {
+#if IS_IOS_11
+  } else if ([TiMapView isiOS11OrGreater] && [identifier isEqualToString:@"timap-marker"]) {
     MKMarkerAnnotationView *markerView = (MKMarkerAnnotationView *)annView;
     markerView.markerTintColor = [[TiUtils colorValue:[ann valueForUndefinedKey:@"markerColor"]] color];
     markerView.glyphText = [ann valueForUndefinedKey:@"markerGlyphText"];
@@ -1183,14 +1194,24 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap
     markerView.selectedGlyphImage = [TiUtils image:[ann valueForUndefinedKey:@"markerSelectedGlyphImage"] proxy:ann];
     markerView.titleVisibility = [TiUtils intValue:[ann valueForUndefinedKey:@"markerTitleVisibility"]];
     markerView.subtitleVisibility = [TiUtils intValue:[ann valueForUndefinedKey:@"markerSubtitleVisibility"]];
-  }
+#endif
+  } else {
+    MKPinAnnotationView *pinview = (MKPinAnnotationView *)annView;
 
+    pinview.pinTintColor = [ann nativePinColor];
+    pinview.animatesDrop = [ann animatesDrop] && ![ann placed];
+    annView.calloutOffset = CGPointMake(-8, 0);
+  }
   annView.canShowCallout = [TiUtils boolValue:[ann valueForUndefinedKey:@"canShowCallout"] def:YES];
   annView.enabled = YES;
   annView.centerOffset = ann.offset;
-  annView.clusteringIdentifier = [ann valueForUndefinedKey:@"clusterIdentifier"];
-  annView.collisionMode = [TiUtils intValue:[ann valueForUndefinedKey:@"collisionMode"]];
-  annView.displayPriority = [TiUtils floatValue:[ann valueForUndefinedKey:@"annotationDisplayPriority"] def:1000];
+#if IS_IOS_11
+  if ([TiMapView isiOS11OrGreater]) {
+    annView.clusteringIdentifier = [ann valueForUndefinedKey:@"clusterIdentifier"];
+    annView.collisionMode = [TiUtils intValue:[ann valueForUndefinedKey:@"collisionMode"]];
+    annView.displayPriority = [TiUtils floatValue:[ann valueForUndefinedKey:@"annotationDisplayPriority"] def:1000];
+  }
+#endif
 
   UIView *left = [ann leftViewAccessory];
   UIView *right = [ann rightViewAccessory];
@@ -1248,7 +1269,8 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id<MKAnnot
   if ([annotation isKindOfClass:[TiMapAnnotationProxy class]]) {
     TiMapAnnotationProxy *annotationProxy = (TiMapAnnotationProxy *)annotation;
     return [self mapView:mapView viewForAnnotationProxy:annotationProxy];
-  } else if ([annotation isKindOfClass:[MKClusterAnnotation class]]) {
+#if IS_IOS_11
+  } else if ([TiMapView isiOS11OrGreater] && [annotation isKindOfClass:[MKClusterAnnotation class]]) {
     TiMapAnnotationProxy *annotationProxy = [self clusterAnnotationProxyForMembers:((MKClusterAnnotation *)annotation).memberAnnotations];
     if (!annotationProxy) {
       return nil;
@@ -1257,10 +1279,12 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id<MKAnnot
     clusterAnnotation.title = [annotationProxy valueForUndefinedKey:@"title"];
     clusterAnnotation.subtitle = [annotationProxy valueForUndefinedKey:@"subtitle"];
     return [self mapView:mapView viewForAnnotationProxy:annotationProxy];
+#endif
   }
   return nil;
 }
 
+#if IS_IOS_11
 - (MKClusterAnnotation *)mapView:(MKMapView *)mapView clusterAnnotationForMemberAnnotations:(NSArray<id<MKAnnotation>> *)memberAnnotations
 {
   MKClusterAnnotation *annotation = [[MKClusterAnnotation alloc] initWithMemberAnnotations:memberAnnotations];
@@ -1273,6 +1297,7 @@ - (MKClusterAnnotation *)mapView:(MKMapView *)mapView clusterAnnotationForMember
   }
   return annotation;
 }
+#endif
 
 // mapView:didAddAnnotationViews: is called after the annotation views have been added and positioned in the map.
 // The delegate can implement this method to animate the adding of the annotations views.

ios/Classes/TiMapViewProxy.h

@@ -64,5 +64,7 @@
 - (void)removeImageOverlay:(id)arg;
 - (void)removeAllImageOverlays:(id)args;
 
+#if IS_IOS_11
 - (void)setClusterAnnotation:(id)args;
+#endif
 @end

ios/Classes/TiMapViewProxy.m

@@ -864,6 +864,7 @@ - (void)setImageOverlays:(id)args
   }
 }
 
+#if IS_IOS_11
 - (void)setClusterAnnotation:(id)args
 {
   ENSURE_DICT(args);
@@ -876,6 +877,7 @@ - (void)setClusterAnnotation:(id)args
     [(TiMapView *)[self view] setClusterAnnotation:annotationProxy forMembers:memberAnnotations];
   }
 }
+#endif
 
 #pragma mark Public APIs iOS 7
 

ios/TiMap_Prefix.pch

@@ -2,3 +2,9 @@
 #ifdef __OBJC__
     #import <Foundation/Foundation.h>
 #endif
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
+#define IS_IOS_11 true
+#else
+#define IS_IOS_11 false
+#endif

ios/manifest

@@ -3,9 +3,9 @@
 # during compilation, packaging, distribution, etc.
 #
 
-version: 5.1.0
+version: 5.1.1
 apiversion: 2
-architectures: arm64 x86_64
+architectures: armv7 arm64 i386 x86_64
 description: External version of Map module
 author: Jeff Haynie, Jon Alter, Pedro Enrique, Hans Knöchel, Vijay Singh
 license: Apache Public License v2

ios/map.xcodeproj/project.pbxproj

@@ -519,7 +519,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LIBRARY_SEARCH_PATHS = "";
 				OTHER_CFLAGS = "-DTI_POST_1_2";
 				OTHER_LDFLAGS = "-ObjC";
@@ -555,7 +555,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DDEBUG",
@@ -595,7 +595,7 @@
 				GCC_WARN_UNUSED_VALUE = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				OTHER_CFLAGS = "-DTI_POST_1_2";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = TiMap;