Skip to content

Commit 93b4c25

Browse files
author
Hirbod
committed
Merge pull request #616 from nightstomp/master
iOS SDK 1.10.2 Update, Improved marker download
2 parents 5167c13 + cadf982 commit 93b4c25

2 files changed

Lines changed: 627 additions & 602 deletions

File tree

src/ios/GoogleMaps/Marker.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@
3232
- (void)setPosition:(CDVInvokedUrlCommand*)command;
3333
- (void)setRotation:(CDVInvokedUrlCommand*)command;
3434
- (void)setAnimation:(CDVInvokedUrlCommand*)command;
35+
- (void)downloadImageWithURL:(NSURL *)url completionBlock:(void (^)(BOOL succeeded, UIImage *image))completionBlock;
3536

3637
// Internal use
3738
-(void)setMarkerAnimation_:(NSString *)animation marker:(GMSMarker *)marker pluginResult:(CDVPluginResult *)pluginResult callbackId:(NSString*)callbackId;
3839
-(void)setDropAnimation_:(GMSMarker *)marker pluginResult:(CDVPluginResult *)pluginResult callbackId:(NSString*)callbackId;
3940
-(void)setBounceAnimation_:(GMSMarker *)marker pluginResult:(CDVPluginResult *)pluginResult callbackId:(NSString*)callbackId;
4041

4142
-(void)setIcon_:(GMSMarker *)marker iconProperty:(NSDictionary *)iconProperty
42-
pluginResult:(CDVPluginResult *)pluginResult
43-
callbackId:(NSString*)callbackId;
43+
pluginResult:(CDVPluginResult *)pluginResult
44+
callbackId:(NSString*)callbackId;
4445

4546
@end

0 commit comments

Comments
 (0)