Expose zIndex for annotations, title for overlays

hansemannn · Jul 11, 2017 · 63d4f95 · 63d4f95
1 parent 6748c00
commit 63d4f95
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -244,6 +244,7 @@ var annotation = maps.createAnnotation({
     draggable: true, // Default: false
     flat: true, // Default: false
     opacity: 1,
+    zIndex: 1,
     animationStyle: maps.APPEAR_ANIMATION_POP, // One of 'APPEAR_ANIMATION_NONE' (default) and 'APPEAR_ANIMATION_POP'
     rotation: 30, // measured in degrees clockwise from the default position
     centerOffset: {
@@ -406,7 +407,8 @@ var polyline = maps.createPolyline({
         longitude : 144.96298
     }, [-31.95285, 115.85734]],
     strokeWidth : 3, // Default: 1
-    strokeColor : '#f00'  // Default: Black (#000000)
+    strokeColor : '#f00'  // Default: Black (#000000),
+    title: 'My Polyline'
 });
 mapView.addPolyline(polyline);
 ```
@@ -424,7 +426,8 @@ var polygon = maps.createPolygon({
     [-33.91785, 115.82234]],
     strokeWidth : 3,
     fillColor : 'yellow', // Default: Blue (#0000ff)
-    strokeColor : 'green'
+    strokeColor : 'green',
+    title: 'My Polygon'
 });
 mapView.addPolygon(polygon);
 ```
@@ -439,6 +442,7 @@ var circle = maps.createCircle({
     fillColor: 'blue', // Default: transparent
     strokeWidth : 3,
     strokeColor : 'orange'
+    title: 'My Circle'
 });
 mapView.addCircle(circle);
 ```

diff --git a/ios/Classes/TiGooglemapsAnnotationProxy.m b/ios/Classes/TiGooglemapsAnnotationProxy.m
@@ -74,6 +74,15 @@ - (void)setSubtitle:(id)value
     [self replaceValue:value forKey:@"subtitle" notification:NO];
 }
 
+- (void)setZIndex:(id)value
+{
+    ENSURE_UI_THREAD_1_ARG(value);
+    ENSURE_TYPE(value, NSNumber);
+
+    [[self marker] setZIndex:[TiUtils intValue:value]];
+    [self replaceValue:value forKey:@"zIndex" notification:NO];
+}
+
 - (void)setCenterOffset:(id)args
 {
     ENSURE_UI_THREAD_1_ARG(args);

diff --git a/ios/Classes/TiGooglemapsCircleProxy.m b/ios/Classes/TiGooglemapsCircleProxy.m
@@ -76,6 +76,15 @@ - (void)setStrokeWidth:(id)value
     [self replaceValue:value forKey:@"strokeWidth" notification:NO];
 }
 
+- (void)setTitle:(id)value
+{
+    ENSURE_UI_THREAD(setTitle, value);
+    ENSURE_TYPE(value, NSString);
+
+    [[self circle] setTitle:[TiUtils stringValue:value]];
+    [self replaceValue:value forKey:@"title" notification:NO];
+}
+
 #pragma mark Utilities
 
 - (CLLocationCoordinate2D)positionFromPoint:(id)point

diff --git a/ios/Classes/TiGooglemapsPolygonProxy.m b/ios/Classes/TiGooglemapsPolygonProxy.m
@@ -95,4 +95,13 @@ - (void)setGeodesic:(id)value
     [self replaceValue:value forKey:@"setGeodesic" notification:NO];
 }
 
+- (void)setTitle:(id)value
+{
+    ENSURE_UI_THREAD(setTitle, value);
+    ENSURE_TYPE(value, NSString);
+
+    [[self polygon] setTitle:[TiUtils stringValue:value]];
+    [self replaceValue:value forKey:@"title" notification:NO];
+}
+
 @end
diff --git a/ios/Classes/TiGooglemapsPolylineProxy.m b/ios/Classes/TiGooglemapsPolylineProxy.m
@@ -85,4 +85,13 @@ - (void)setGeodesic:(id)value
     [self replaceValue:value forKey:@"setGeodesic" notification:NO];
 }
 
+- (void)setTitle:(id)value
+{
+    ENSURE_UI_THREAD(setTitle, value);
+    ENSURE_TYPE(value, NSString);
+
+    [[self polyline] setTitle:[TiUtils stringValue:value]];
+    [self replaceValue:value forKey:@"title" notification:NO];
+}
+
 @end
diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.6.1
+version: 3.7.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: ti.googlemaps