Merge pull request #293 from anil-shukla-axway/MOD-2418_Updated

MOD-2418/2450 TI.Map iOS: Support rotation on annotations

apidoc/Annotation.yml

@@ -322,3 +322,23 @@ properties:
     since: "6.2.0"
     type: Titanium.UI.iOS.PreviewContext
     osver: {ios: {min: "9.0"}}
+
+methods:
+
+  - name: animate
+    summary: Animate annotation to new location.
+    parameters:
+        - name: newLocation
+          summary: latitude and longitude where annotation will animate.
+          type: Array<Number>
+    platforms: [iphone, ipad]
+    since: "9.2.0"
+
+  - name: rotate
+    summary: Rotate annotation on its location.
+    parameters:
+        - name: angle
+          summary: angle on which annotation will rotate.
+          type: Number
+    platforms: [iphone, ipad]
+    since: "9.2.0"

ios/Classes/TiMapAnnotationProxy.h

@@ -32,15 +32,14 @@
 // Title and subtitle for use by selection UI.
 - (NSString *)title;
 - (NSString *)subtitle;
-
 - (id)pincolor;
 - (id)nativePinColor;
 - (BOOL)animatesDrop;
 - (void)setHidden:(id)value;
-
 - (UIView *)leftViewAccessory;
 - (UIView *)rightViewAccessory;
-
 - (int)tag;
+- (void)animate:(id)arg;
+- (void)rotate:(id)arg;
 
 @end

ios/Classes/TiMapAnnotationProxy.m

@@ -548,5 +548,24 @@ - (int)tag
 {
   return tag;
 }
+- (void)rotate:(id)arg
+{
+  CGFloat getAngle = [[arg objectAtIndex:0] floatValue];
+  [UIView animateWithDuration:1
+                   animations:^{
+                     MKAnnotationView *annotationView = [[(TiMapView *)[delegate view] map] viewForAnnotation:self];
+                     annotationView.transform = CGAffineTransformMakeRotation(getAngle);
+                   }];
+}
+
+- (void)animate:(id)arg
+{
+  ENSURE_SINGLE_ARG(arg, NSArray);
+  TiMapAnnotationProxy *newAnnotation = self;
+  CLLocationCoordinate2D newLocation;
+  newLocation.latitude = [[arg objectAtIndex:0] floatValue];
+  newLocation.longitude = [[arg objectAtIndex:1] floatValue];
+  [(TiMapView *)[delegate view] animateAnnotation:newAnnotation withLocation:newLocation];
+}
 
 @end

ios/Classes/TiMapView.h

@@ -98,6 +98,7 @@
 #if IS_IOS_11
 - (void)setClusterAnnotation:(TiMapAnnotationProxy *)annotation forMembers:(NSArray<TiMapAnnotationProxy *> *)members;
 #endif
+- (void)animateAnnotation:(TiMapAnnotationProxy *)newAnnotation withLocation:(CLLocationCoordinate2D)newLocation;
 
 #pragma mark Utils
 - (void)addOverlay:(MKPolyline *)polyline level:(MKOverlayLevel)level;

ios/Classes/TiMapView.m

@@ -21,9 +21,12 @@
 #import "TiMapRouteProxy.h"
 #import "TiMapUtils.h"
 #import "TiUtils.h"
+#import <MapKit/MapKit.h>
 
 @implementation TiMapView
 
+CLLocationCoordinate2D userNewLocation;
+
 #pragma mark Internal
 
 - (void)dealloc
@@ -237,7 +240,6 @@ - (void)addAnnotations:(id)args
 {
   ENSURE_TYPE(args, NSArray);
   ENSURE_UI_THREAD(addAnnotations, args);
-
   [[self map] addAnnotations:[self annotationsFromArgs:args]];
 }
 
@@ -1067,7 +1069,6 @@ - (TiMapAnnotationProxy *)proxyForAnnotation:(MKAnnotationView *)pinview
   for (id annotation in [map annotations]) {
     if ([annotation isKindOfClass:[TiMapAnnotationProxy class]]) {
       if ([(TiMapAnnotationProxy *)annotation tag] == pinview.tag) {
-        [annotation setView:pinview];
         return annotation;
       }
     }
@@ -1202,7 +1203,6 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap
   annView.canShowCallout = [TiUtils boolValue:[ann valueForUndefinedKey:@"canShowCallout"] def:YES];
   annView.enabled = YES;
   annView.centerOffset = ann.offset;
-
 #if IS_IOS_11
   if ([TiMapView isiOS11OrGreater]) {
     annView.clusteringIdentifier = [ann valueForUndefinedKey:@"clusterIdentifier"];
@@ -1257,13 +1257,22 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap
     ann.controllerPreviewing = [controller registerForPreviewingWithDelegate:previewingDelegate sourceView:annView];
 #endif
   }
-
   return annView;
 }
+- (void)animateAnnotation:(TiMapAnnotationProxy *)newAnnotation withLocation:(CLLocationCoordinate2D)newLocation
+{
+  userNewLocation.latitude = newLocation.latitude;
+  userNewLocation.longitude = newLocation.longitude;
 
+  [UIView animateWithDuration:2
+                   animations:^{
+                     newAnnotation.coordinate = userNewLocation;
+                     MKAnnotationView *annotationView = (MKAnnotationView *)[self.map viewForAnnotation:newAnnotation];
+                   }];
+}
 // mapView:viewForAnnotation: provides the view for each annotation.
 // This method may be called for all or some of the added annotations.
-// For MapKit provided annotations (eg. MKUserLocation) return nil to use the MapKit provided annotation view.
+// For MapKit provided annotations (eg. MKUserLocation) return nil to use the MapKit provided annotatiown view.
 - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id<MKAnnotation>)annotation
 {
   if ([annotation isKindOfClass:[TiMapAnnotationProxy class]]) {

ios/example/tests/annotations.js

@@ -14,6 +14,22 @@ exports.run = function(UI, Map) {
                 }; //Mountain View
             }
         },
+        {
+            hasChild: true,
+            title: 'animate annotation',
+            run: function() {
+                var newLocation = [-33.09,151.03];
+                anno2.animate(newLocation);
+            }
+        },
+        {
+            hasChild: true,
+            title: 'rotate annotation',
+            run: function() {
+                var angle = 90;
+                anno4.rotate(angle);
+            }
+        },
         {
             hasChild: true,
             title: 'add anno3',
@@ -86,7 +102,6 @@ exports.run = function(UI, Map) {
     tableView.addEventListener('click', function(e) {
         rows[e.index].run && rows[e.index].run();
     });
-
     var anno = Map.createAnnotation({
         latitude: -33.87365,
         image: 'map_pin.png',
@@ -117,7 +132,6 @@ exports.run = function(UI, Map) {
         subtitle: 'This is anno4',
         draggable: true
     });
-
     Ti.API.info('Latitude:' + anno.latitude);
     Ti.API.info('Title:' + anno.title);
 
@@ -127,8 +141,8 @@ exports.run = function(UI, Map) {
         animate: true,
         annotations: [anno, anno2, anno4],
         region: {
-            latitude: -33.87365,
-            longitude: 151.20689,
+            latitude: -33.86365,
+            longitude: 151.21689,
             latitudeDelta: 0.1,
             longitudeDelta: 0.1
         }, //Sydney

ios/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.3.1
+version: 3.4.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: External version of Map module

ios/titanium.xcconfig

@@ -5,7 +5,6 @@
 //
 //
 TITANIUM_SDK_VERSION = 9.0.0.GA
-
 //
 // THESE SHOULD BE OK GENERALLY AS-IS
 //

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titanium-sdk/ti.map",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Provides Map UI elements for Titanium applications",
   "scripts": {
     "commit": "git-cz",