Authored by Justin R. Miller

update RMMarker to use red star pin image by default

@@ -74,34 +74,34 @@ typedef enum { @@ -74,34 +74,34 @@ typedef enum {
74 74
75 /** @name Creating Markers Using MapBox Images */ 75 /** @name Creating Markers Using MapBox Images */
76 76
77 -/** Initializes and returns a newly allocated marker object using an empty, gray, medium-sized pin image. */ 77 +/** Initializes and returns a newly allocated marker object using a red, medium-sized star pin image. */
78 - (id)initWithMapBoxMarkerImage; 78 - (id)initWithMapBoxMarkerImage;
79 79
80 -/** Initializes and returns a newly allocated marker object using a gray, medium-sized pin image and a given symbol name, e.g., `bus`. 80 +/** Initializes and returns a newly allocated marker object using a red, medium-sized pin image and a given symbol name, e.g., `bus`.
81 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 81 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
82 * @return An initialized RMMarker layer. */ 82 * @return An initialized RMMarker layer. */
83 - (id)initWithMapBoxMarkerImage:(NSString *)symbolName; 83 - (id)initWithMapBoxMarkerImage:(NSString *)symbolName;
84 84
85 -/** Initializes and returns a newly allocated marker object using a medium-sized pin image and a given symbol name, e.g., `bus` and a given color. 85 +/** Initializes and returns a newly allocated marker object using a medium-sized pin image, a given symbol name, e.g., `bus`, and a given color.
86 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 86 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
87 * @param color A color for the marker. 87 * @param color A color for the marker.
88 * @return An initialized RMMarker layer. */ 88 * @return An initialized RMMarker layer. */
89 - (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color; 89 - (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color;
90 90
91 -/** Initializes and returns a newly allocated marker object using a pin image and a given symbol name, e.g., `bus`, a given color, and a given size. 91 +/** Initializes and returns a newly allocated marker object using a pin image, a given symbol name, e.g., `bus`, a given color, and a given size.
92 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 92 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
93 * @param color A color for the marker. 93 * @param color A color for the marker.
94 * @param size A size for the marker. 94 * @param size A size for the marker.
95 * @return An initialized RMMarker layer. */ 95 * @return An initialized RMMarker layer. */
96 - (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapBoxImageSize)size; 96 - (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapBoxImageSize)size;
97 97
98 -/** Initializes and returns a newly allocated marker object using a medium-sized pin image and a given symbol name, e.g., `bus` and a given HTML hex color, e.g., `ff0000`. 98 +/** Initializes and returns a newly allocated marker object using a medium-sized pin image, a given symbol name, e.g., `bus`, and a given HTML hex color, e.g., `ff0000`.
99 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 99 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
100 * @param colorHex A color for the marker specified as an HTML hex code. 100 * @param colorHex A color for the marker specified as an HTML hex code.
101 * @return An initialized RMMarker layer. */ 101 * @return An initialized RMMarker layer. */
102 - (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex; 102 - (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex;
103 103
104 -/** Initializes and returns a newly allocated marker object using a pin image and a given symbol name, e.g., `bus`, a given HTML hex color, e.g., `ff0000`, and a given size, e.g., `large`. 104 +/** Initializes and returns a newly allocated marker object using a pin image, a given symbol name, e.g., `bus`, a given HTML hex color, e.g., `ff0000`, and a given size, e.g., `large`.
105 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 105 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
106 * @param colorHex A color for the marker specified as an HTML hex code. 106 * @param colorHex A color for the marker specified as an HTML hex code.
107 * @param sizeString A size such as `small`, `medium`, or `large`. 107 * @param sizeString A size such as `small`, `medium`, or `large`.
@@ -136,8 +136,8 @@ @@ -136,8 +136,8 @@
136 136
137 NSURL *imageURL = [NSURL URLWithString:[NSString stringWithFormat:@"http://a.tiles.mapbox.com/v3/marker/pin-%@%@%@%@.png", 137 NSURL *imageURL = [NSURL URLWithString:[NSString stringWithFormat:@"http://a.tiles.mapbox.com/v3/marker/pin-%@%@%@%@.png",
138 (sizeString ? [sizeString substringToIndex:1] : @"m"), 138 (sizeString ? [sizeString substringToIndex:1] : @"m"),
139 - (symbolName ? [@"-" stringByAppendingString:symbolName] : @""),  
140 - (colorHex ? [@"+" stringByAppendingString:[colorHex stringByReplacingOccurrencesOfString:@"#" withString:@""]] : @""), 139 + (symbolName ? [@"-" stringByAppendingString:symbolName] : @"-star"),
  140 + (colorHex ? [@"+" stringByAppendingString:[colorHex stringByReplacingOccurrencesOfString:@"#" withString:@""]] : @"+ff0000"),
141 (useRetina ? @"@2x" : @"")]]; 141 (useRetina ? @"@2x" : @"")]];
142 142
143 UIImage *image; 143 UIImage *image;
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 { 42 {
43 if ( ! [super layer]) 43 if ( ! [super layer])
44 { 44 {
45 - RMMarker *marker = [[[RMMarker alloc] initWithMapBoxMarkerImage:@"star" tintColor:[UIColor redColor]] autorelease]; 45 + RMMarker *marker = [[[RMMarker alloc] initWithMapBoxMarkerImage] autorelease];
46 46
47 marker.canShowCallout = YES; 47 marker.canShowCallout = YES;
48 48