Added RMMarkerManager class that handles all marker methods.
Changed the Controller example to reflect changes
Showing
8 changed files
with
161 additions
and
136 deletions
@@ -12,6 +12,8 @@ | @@ -12,6 +12,8 @@ | ||
12 | #import "RMFoundation.h" | 12 | #import "RMFoundation.h" |
13 | #import "RMMarker.h" | 13 | #import "RMMarker.h" |
14 | 14 | ||
15 | +#import "RMMarkerManager.h" | ||
16 | + | ||
15 | @implementation MapViewViewController | 17 | @implementation MapViewViewController |
16 | 18 | ||
17 | /* | 19 | /* |
@@ -35,6 +37,7 @@ | @@ -35,6 +37,7 @@ | ||
35 | - (void)viewDidLoad { | 37 | - (void)viewDidLoad { |
36 | [super viewDidLoad]; | 38 | [super viewDidLoad]; |
37 | 39 | ||
40 | + | ||
38 | /* RMMarker *marker = [[RMMarker alloc] initWithKey:RMMarkerBlueKey]; | 41 | /* RMMarker *marker = [[RMMarker alloc] initWithKey:RMMarkerBlueKey]; |
39 | 42 | ||
40 | RMMercatorRect loc = [[mapView contents] mercatorBounds]; | 43 | RMMercatorRect loc = [[mapView contents] mercatorBounds]; |
@@ -45,9 +48,13 @@ | @@ -45,9 +48,13 @@ | ||
45 | [[[mapView contents] overlay] addSublayer:marker]; | 48 | [[[mapView contents] overlay] addSublayer:marker]; |
46 | NSLog(@"marker added to %f %f", loc.origin.x, loc.origin.y);*/ | 49 | NSLog(@"marker added to %f %f", loc.origin.x, loc.origin.y);*/ |
47 | 50 | ||
48 | - [mapView addDefaultMarkerAt:[[mapView contents] mapCenter]]; | ||
49 | 51 | ||
50 | - NSArray *markers = [mapView getMarkers]; | 52 | + RMMarkerManager *markerManager = [mapView markerManager]; |
53 | + | ||
54 | + [markerManager addDefaultMarkerAt:[[mapView contents] mapCenter]]; | ||
55 | + | ||
56 | + | ||
57 | + NSArray *markers = [markerManager getMarkers]; | ||
51 | 58 | ||
52 | NSLog(@"Nb markers %d", [markers count]); | 59 | NSLog(@"Nb markers %d", [markers count]); |
53 | 60 | ||
@@ -59,18 +66,18 @@ | @@ -59,18 +66,18 @@ | ||
59 | { | 66 | { |
60 | RMXYPoint point = [aMarker location]; | 67 | RMXYPoint point = [aMarker location]; |
61 | NSLog(@"Marker mercator location: X:%lf, Y:%lf", point.x, point.y); | 68 | NSLog(@"Marker mercator location: X:%lf, Y:%lf", point.x, point.y); |
62 | - CGPoint screenPoint = [mapView getMarkerScreenCoordinate: aMarker]; | 69 | + CGPoint screenPoint = [markerManager getMarkerScreenCoordinate: aMarker]; |
63 | NSLog(@"Marker screen location: X:%lf, Y:%lf", screenPoint.x, screenPoint.y); | 70 | NSLog(@"Marker screen location: X:%lf, Y:%lf", screenPoint.x, screenPoint.y); |
64 | - CLLocationCoordinate2D coordinates = [mapView getMarkerCoordinate2D: aMarker]; | 71 | + CLLocationCoordinate2D coordinates = [markerManager getMarkerCoordinate2D: aMarker]; |
65 | NSLog(@"Marker Lat/Lon location: Lat:%lf, Lon:%lf", coordinates.latitude, coordinates.longitude); | 72 | NSLog(@"Marker Lat/Lon location: Lat:%lf, Lon:%lf", coordinates.latitude, coordinates.longitude); |
66 | 73 | ||
67 | - [mapView removeMarker:aMarker]; | 74 | + [markerManager removeMarker:aMarker]; |
68 | } | 75 | } |
69 | 76 | ||
70 | // Put the marker back | 77 | // Put the marker back |
71 | - [mapView addDefaultMarkerAt:[[mapView contents] mapCenter]]; | 78 | + [markerManager addDefaultMarkerAt:[[mapView contents] mapCenter]]; |
72 | 79 | ||
73 | - markers = [mapView getMarkersForScreenBounds]; | 80 | + markers = [markerManager getMarkersForScreenBounds]; |
74 | 81 | ||
75 | NSLog(@"Nb Markers in Screen: %d", [markers count]); | 82 | NSLog(@"Nb Markers in Screen: %d", [markers count]); |
76 | 83 |
@@ -124,16 +124,7 @@ enum { | @@ -124,16 +124,7 @@ enum { | ||
124 | - (void)zoomWithLatLngBoundsNorthEast:(CLLocationCoordinate2D)ne SouthWest:(CLLocationCoordinate2D)se; | 124 | - (void)zoomWithLatLngBoundsNorthEast:(CLLocationCoordinate2D)ne SouthWest:(CLLocationCoordinate2D)se; |
125 | - (void)zoomWithRMMercatorRectBounds:(RMXYRect)bounds; | 125 | - (void)zoomWithRMMercatorRectBounds:(RMXYRect)bounds; |
126 | 126 | ||
127 | -- (void) addMarker: (RMMarker*)marker; | ||
128 | -- (void) addMarker: (RMMarker*)marker AtLatLong:(CLLocationCoordinate2D)point; | ||
129 | -- (void) addDefaultMarkerAt: (CLLocationCoordinate2D)point; | ||
130 | -- (void) removeMarkers; | ||
131 | -- (NSArray *)getMarkers; | ||
132 | -- (void) removeMarker:(RMMarker *)marker; | ||
133 | -- (CGPoint) getMarkerScreenCoordinate: (RMMarker *)marker; | ||
134 | -- (CLLocationCoordinate2D) getMarkerCoordinate2D: (RMMarker *) marker; | ||
135 | -- (NSArray *) getMarkersForScreenBounds; | ||
136 | - | 127 | +- (RMXYPoint)latLongToPoint:(RMLatLong)aLatLong; |
137 | - (CLLocationCoordinate2DBounds) getScreenCoordinateBounds; | 128 | - (CLLocationCoordinate2DBounds) getScreenCoordinateBounds; |
138 | 129 | ||
139 | 130 |
@@ -561,72 +561,9 @@ static BOOL _performExpensiveOperations = YES; | @@ -561,72 +561,9 @@ static BOOL _performExpensiveOperations = YES; | ||
561 | 561 | ||
562 | // Move overlays stuff here - at the moment overlay stuff is above... | 562 | // Move overlays stuff here - at the moment overlay stuff is above... |
563 | 563 | ||
564 | -- (void) addMarker: (RMMarker*)marker | 564 | +- (RMXYPoint)latLongToPoint:(RMLatLong)aLatLong |
565 | { | 565 | { |
566 | - [overlay addSublayer:marker]; | ||
567 | -} | ||
568 | - | ||
569 | -- (void) addMarker: (RMMarker*)marker AtLatLong:(CLLocationCoordinate2D)point | ||
570 | -{ | ||
571 | - [marker setLocation:[projection latLongToPoint:point]]; | ||
572 | - [self addMarker: marker]; | ||
573 | -} | ||
574 | - | ||
575 | -- (void) addDefaultMarkerAt: (CLLocationCoordinate2D)point | ||
576 | -{ | ||
577 | - RMMarker *marker = [[RMMarker alloc] initWithKey:RMMarkerRedKey]; | ||
578 | - [self addMarker:marker AtLatLong:point]; | ||
579 | - [marker release]; | ||
580 | -} | ||
581 | - | ||
582 | -- (void) removeMarkers | ||
583 | -{ | ||
584 | - overlay.sublayers = [NSArray arrayWithObjects:nil]; | ||
585 | -} | ||
586 | - | ||
587 | -- (NSArray *)getMarkers | ||
588 | -{ | ||
589 | - return [overlay sublayers]; | ||
590 | -} | ||
591 | - | ||
592 | -- (void) removeMarker:(RMMarker *)marker | ||
593 | -{ | ||
594 | - [marker removeFromSuperlayer]; | ||
595 | -} | ||
596 | - | ||
597 | -- (CGPoint) getMarkerScreenCoordinate: (RMMarker *)marker | ||
598 | -{ | ||
599 | - return [mercatorToScreenProjection projectXYPoint:[marker location]]; | ||
600 | -} | ||
601 | - | ||
602 | -- (CLLocationCoordinate2D) getMarkerCoordinate2D: (RMMarker *) marker | ||
603 | -{ | ||
604 | - return [self pixelToLatLong:[self getMarkerScreenCoordinate:marker]]; | ||
605 | -} | ||
606 | - | ||
607 | -- (NSArray *) getMarkersForScreenBounds | ||
608 | -{ | ||
609 | - NSMutableArray *markers; | ||
610 | - markers = [NSMutableArray array]; | ||
611 | - CGRect rect = [mercatorToScreenProjection screenBounds]; | ||
612 | - | ||
613 | - NSArray *allMarkers = [self getMarkers]; | ||
614 | - | ||
615 | - NSEnumerator *markerEnumerator = [allMarkers objectEnumerator]; | ||
616 | - RMMarker *aMarker; | ||
617 | - | ||
618 | - while (aMarker = (RMMarker *)[markerEnumerator nextObject]) | ||
619 | - { | ||
620 | - CGPoint markerCoord = [self getMarkerScreenCoordinate:aMarker]; | ||
621 | - | ||
622 | - if( ((markerCoord.x > rect.origin.x) && (markerCoord.y > rect.origin.y)) && | ||
623 | - ((markerCoord.x < (rect.origin.x + rect.size.width)) && (markerCoord.y < (rect.origin.y + rect.size.height)))) | ||
624 | - { | ||
625 | - [markers addObject:aMarker]; | ||
626 | - } | ||
627 | - } | ||
628 | - | ||
629 | - return markers; | 566 | + return [projection latLongToPoint:aLatLong]; |
630 | } | 567 | } |
631 | 568 | ||
632 | - (CLLocationCoordinate2DBounds) getScreenCoordinateBounds | 569 | - (CLLocationCoordinate2DBounds) getScreenCoordinateBounds |
@@ -25,6 +25,7 @@ typedef struct { | @@ -25,6 +25,7 @@ typedef struct { | ||
25 | 25 | ||
26 | @class RMMapContents; | 26 | @class RMMapContents; |
27 | @class RMMarker; | 27 | @class RMMarker; |
28 | +@class RMMarkerManager; | ||
28 | 29 | ||
29 | // This class is a wrapper around RMMapContents for the iphone. | 30 | // This class is a wrapper around RMMapContents for the iphone. |
30 | // It implements event handling; but thats about it. All the interesting map | 31 | // It implements event handling; but thats about it. All the interesting map |
@@ -32,6 +33,7 @@ typedef struct { | @@ -32,6 +33,7 @@ typedef struct { | ||
32 | @interface RMMapView : UIView | 33 | @interface RMMapView : UIView |
33 | { | 34 | { |
34 | RMMapContents *contents; | 35 | RMMapContents *contents; |
36 | + RMMarkerManager *markerManager; | ||
35 | id<RMMapViewDelegate> delegate; | 37 | id<RMMapViewDelegate> delegate; |
36 | 38 | ||
37 | BOOL enableDragging; | 39 | BOOL enableDragging; |
@@ -43,6 +45,8 @@ typedef struct { | @@ -43,6 +45,8 @@ typedef struct { | ||
43 | // property. The contents structure holds the actual map bits. | 45 | // property. The contents structure holds the actual map bits. |
44 | @property (readonly) RMMapContents *contents; | 46 | @property (readonly) RMMapContents *contents; |
45 | 47 | ||
48 | +@property (retain, readonly) RMMarkerManager *markerManager; | ||
49 | + | ||
46 | // do not retain the delegate so you can let the corresponding controller implement the | 50 | // do not retain the delegate so you can let the corresponding controller implement the |
47 | // delegate without circular references | 51 | // delegate without circular references |
48 | @property (assign) id<RMMapViewDelegate> delegate; | 52 | @property (assign) id<RMMapViewDelegate> delegate; |
@@ -59,16 +63,6 @@ typedef struct { | @@ -59,16 +63,6 @@ typedef struct { | ||
59 | - (void)setZoomBounds:(float)aMinZoom maxZoom:(float)aMaxZoom; | 63 | - (void)setZoomBounds:(float)aMinZoom maxZoom:(float)aMaxZoom; |
60 | 64 | ||
61 | 65 | ||
62 | -- (void) addMarker: (RMMarker*)marker; | ||
63 | -- (void) addMarker: (RMMarker*)marker AtLatLong:(CLLocationCoordinate2D)point; | ||
64 | -- (void) addDefaultMarkerAt: (CLLocationCoordinate2D)point; | ||
65 | -- (void) removeMarkers; | ||
66 | -- (NSArray *) getMarkers; | ||
67 | -- (void) removeMarker:(RMMarker *)marker; | ||
68 | -- (CGPoint) getMarkerScreenCoordinate: (RMMarker *)marker; | ||
69 | -- (CLLocationCoordinate2D) getMarkerCoordinate2D: (RMMarker *) marker; | ||
70 | -- (NSArray *) getMarkersForScreenBounds; | ||
71 | - | ||
72 | - (CLLocationCoordinate2DBounds) getScreenCoordinateBounds; | 66 | - (CLLocationCoordinate2DBounds) getScreenCoordinateBounds; |
73 | 67 | ||
74 | 68 |
@@ -15,6 +15,8 @@ | @@ -15,6 +15,8 @@ | ||
15 | #import "RMMercatorToScreenProjection.h" | 15 | #import "RMMercatorToScreenProjection.h" |
16 | #import "RMMarker.h" | 16 | #import "RMMarker.h" |
17 | 17 | ||
18 | +#import "RMMarkerManager.h" | ||
19 | + | ||
18 | @implementation RMMapView (Internal) | 20 | @implementation RMMapView (Internal) |
19 | BOOL delegateHasBeforeMapMove; | 21 | BOOL delegateHasBeforeMapMove; |
20 | BOOL delegateHasAfterMapMove; | 22 | BOOL delegateHasAfterMapMove; |
@@ -26,9 +28,12 @@ | @@ -26,9 +28,12 @@ | ||
26 | 28 | ||
27 | @implementation RMMapView | 29 | @implementation RMMapView |
28 | 30 | ||
31 | +@synthesize markerManager; | ||
32 | + | ||
29 | -(void) initValues | 33 | -(void) initValues |
30 | { | 34 | { |
31 | contents = [[RMMapContents alloc] initForView:self]; | 35 | contents = [[RMMapContents alloc] initForView:self]; |
36 | + markerManager = [[RMMarkerManager alloc] initWithContents:contents]; | ||
32 | 37 | ||
33 | enableDragging = YES; | 38 | enableDragging = YES; |
34 | enableZoom = YES; | 39 | enableZoom = YES; |
@@ -330,50 +335,6 @@ | @@ -330,50 +335,6 @@ | ||
330 | } | 335 | } |
331 | 336 | ||
332 | 337 | ||
333 | -#pragma mark Markers | ||
334 | - | ||
335 | -- (void) addMarker: (RMMarker*)marker | ||
336 | -{ | ||
337 | - [contents addMarker:marker]; | ||
338 | -} | ||
339 | -- (void) addMarker: (RMMarker*)marker AtLatLong:(CLLocationCoordinate2D)point | ||
340 | -{ | ||
341 | - [contents addMarker:marker AtLatLong:point]; | ||
342 | -} | ||
343 | -- (void) addDefaultMarkerAt: (CLLocationCoordinate2D)point | ||
344 | -{ | ||
345 | - [contents addDefaultMarkerAt:point]; | ||
346 | -} | ||
347 | - | ||
348 | -- (void) removeMarkers | ||
349 | -{ | ||
350 | - [contents removeMarkers]; | ||
351 | -} | ||
352 | - | ||
353 | -- (NSArray *) getMarkers | ||
354 | -{ | ||
355 | - return [contents getMarkers]; | ||
356 | -} | ||
357 | - | ||
358 | -- (void) removeMarker: (RMMarker *)marker | ||
359 | -{ | ||
360 | - [contents removeMarker:marker]; | ||
361 | -} | ||
362 | - | ||
363 | -- (CGPoint) getMarkerScreenCoordinate: (RMMarker *)marker | ||
364 | -{ | ||
365 | - return [contents getMarkerScreenCoordinate:marker]; | ||
366 | -} | ||
367 | - | ||
368 | -- (CLLocationCoordinate2D) getMarkerCoordinate2D: (RMMarker *) marker | ||
369 | -{ | ||
370 | - return [contents getMarkerCoordinate2D:marker]; | ||
371 | -} | ||
372 | - | ||
373 | -- (NSArray *) getMarkersForScreenBounds | ||
374 | -{ | ||
375 | - return [contents getMarkersForScreenBounds]; | ||
376 | -} | ||
377 | 338 | ||
378 | - (CLLocationCoordinate2DBounds) getScreenCoordinateBounds | 339 | - (CLLocationCoordinate2DBounds) getScreenCoordinateBounds |
379 | { | 340 | { |
MapView/Map/RMMarkerManager.h
0 → 100644
1 | +// | ||
2 | +// RMMarkerManager.h | ||
3 | +// MapView | ||
4 | +// | ||
5 | +// Created by olivier on 11/5/08. | ||
6 | +// Copyright 2008 NA. All rights reserved. | ||
7 | +// | ||
8 | + | ||
9 | +#import <UIKit/UIKit.h> | ||
10 | + | ||
11 | +#import "RMMapContents.h" | ||
12 | +#import "RMMarker.h" | ||
13 | + | ||
14 | +@class RMProjection; | ||
15 | + | ||
16 | +@interface RMMarkerManager : NSObject { | ||
17 | + RMMapContents *contents; | ||
18 | +} | ||
19 | + | ||
20 | +@property (retain, readwrite) RMMapContents *contents; | ||
21 | + | ||
22 | +- (id)initWithContents:(RMMapContents *)mapContents; | ||
23 | + | ||
24 | +- (void) addMarker: (RMMarker*)marker; | ||
25 | +- (void) addMarker: (RMMarker*)marker AtLatLong:(CLLocationCoordinate2D)point; | ||
26 | +- (void) addDefaultMarkerAt: (CLLocationCoordinate2D)point; | ||
27 | +- (void) removeMarkers; | ||
28 | + | ||
29 | +- (NSArray *)getMarkers; | ||
30 | +- (void) removeMarker:(RMMarker *)marker; | ||
31 | +- (CGPoint) getMarkerScreenCoordinate: (RMMarker *)marker; | ||
32 | +- (CLLocationCoordinate2D) getMarkerCoordinate2D: (RMMarker *) marker; | ||
33 | +- (NSArray *) getMarkersForScreenBounds; | ||
34 | + | ||
35 | +@end |
MapView/Map/RMMarkerManager.m
0 → 100644
1 | +// | ||
2 | +// RMMarkerManager.m | ||
3 | +// MapView | ||
4 | +// | ||
5 | +// Created by olivier on 11/5/08. | ||
6 | +// Copyright 2008 NA. All rights reserved. | ||
7 | +// | ||
8 | + | ||
9 | +#import "RMMarkerManager.h" | ||
10 | +#import "RMMercatorToScreenProjection.h" | ||
11 | + | ||
12 | +@implementation RMMarkerManager | ||
13 | + | ||
14 | +@synthesize contents; | ||
15 | + | ||
16 | +- (id)initWithContents:(RMMapContents *)mapContents | ||
17 | +{ | ||
18 | + if (![super init]) | ||
19 | + return nil; | ||
20 | + | ||
21 | + contents = mapContents; | ||
22 | + | ||
23 | + return self; | ||
24 | +} | ||
25 | + | ||
26 | +- (void) addMarker: (RMMarker*)marker | ||
27 | +{ | ||
28 | + [[contents overlay] addSublayer:marker]; | ||
29 | +} | ||
30 | + | ||
31 | +- (void) addMarker: (RMMarker*)marker AtLatLong:(CLLocationCoordinate2D)point | ||
32 | +{ | ||
33 | + [marker setLocation:[contents latLongToPoint:point]]; | ||
34 | + [self addMarker: marker]; | ||
35 | +} | ||
36 | + | ||
37 | +- (void) addDefaultMarkerAt: (CLLocationCoordinate2D)point | ||
38 | +{ | ||
39 | + RMMarker *marker = [[RMMarker alloc] initWithKey:RMMarkerRedKey]; | ||
40 | + [self addMarker:marker AtLatLong:point]; | ||
41 | + [marker release]; | ||
42 | +} | ||
43 | + | ||
44 | +- (void) removeMarkers | ||
45 | +{ | ||
46 | + [[contents overlay] setSublayers:[NSArray arrayWithObjects:nil]]; | ||
47 | +} | ||
48 | + | ||
49 | +- (NSArray *)getMarkers | ||
50 | +{ | ||
51 | + return [[contents overlay] sublayers]; | ||
52 | +} | ||
53 | + | ||
54 | +- (void) removeMarker:(RMMarker *)marker | ||
55 | +{ | ||
56 | + [marker removeFromSuperlayer]; | ||
57 | +} | ||
58 | + | ||
59 | +- (CGPoint) getMarkerScreenCoordinate: (RMMarker *)marker | ||
60 | +{ | ||
61 | + return [[contents mercatorToScreenProjection] projectXYPoint:[marker location]]; | ||
62 | +} | ||
63 | + | ||
64 | +- (CLLocationCoordinate2D) getMarkerCoordinate2D: (RMMarker *) marker | ||
65 | +{ | ||
66 | + return [contents pixelToLatLong:[self getMarkerScreenCoordinate:marker]]; | ||
67 | +} | ||
68 | + | ||
69 | +- (NSArray *) getMarkersForScreenBounds | ||
70 | +{ | ||
71 | + NSMutableArray *markers; | ||
72 | + markers = [NSMutableArray array]; | ||
73 | + CGRect rect = [[contents mercatorToScreenProjection] screenBounds]; | ||
74 | + | ||
75 | + NSArray *allMarkers = [self getMarkers]; | ||
76 | + | ||
77 | + NSEnumerator *markerEnumerator = [allMarkers objectEnumerator]; | ||
78 | + RMMarker *aMarker; | ||
79 | + | ||
80 | + while (aMarker = (RMMarker *)[markerEnumerator nextObject]) | ||
81 | + { | ||
82 | + CGPoint markerCoord = [self getMarkerScreenCoordinate:aMarker]; | ||
83 | + | ||
84 | + if( ((markerCoord.x > rect.origin.x) && (markerCoord.y > rect.origin.y)) && | ||
85 | + ((markerCoord.x < (rect.origin.x + rect.size.width)) && (markerCoord.y < (rect.origin.y + rect.size.height)))) | ||
86 | + { | ||
87 | + [markers addObject:aMarker]; | ||
88 | + } | ||
89 | + } | ||
90 | + | ||
91 | + return markers; | ||
92 | +} | ||
93 | + | ||
94 | +@end |
@@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
7 | objects = { | 7 | objects = { |
8 | 8 | ||
9 | /* Begin PBXBuildFile section */ | 9 | /* Begin PBXBuildFile section */ |
10 | + 090C948D0EC23FCD003AEE25 /* RMMarkerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 090C948C0EC23FCD003AEE25 /* RMMarkerManager.m */; }; | ||
10 | 126692A10EB75C0A00E002D5 /* RMConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 126692A00EB75C0A00E002D5 /* RMConfiguration.m */; }; | 11 | 126692A10EB75C0A00E002D5 /* RMConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 126692A00EB75C0A00E002D5 /* RMConfiguration.m */; }; |
11 | 126693040EB76C0B00E002D5 /* RMConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 126692A00EB75C0A00E002D5 /* RMConfiguration.m */; }; | 12 | 126693040EB76C0B00E002D5 /* RMConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 126692A00EB75C0A00E002D5 /* RMConfiguration.m */; }; |
12 | 1296F5610EB8743500FF25E0 /* RMMarkerStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 1296F5600EB8743500FF25E0 /* RMMarkerStyle.m */; }; | 13 | 1296F5610EB8743500FF25E0 /* RMMarkerStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 1296F5600EB8743500FF25E0 /* RMMarkerStyle.m */; }; |
@@ -134,6 +135,8 @@ | @@ -134,6 +135,8 @@ | ||
134 | /* End PBXContainerItemProxy section */ | 135 | /* End PBXContainerItemProxy section */ |
135 | 136 | ||
136 | /* Begin PBXFileReference section */ | 137 | /* Begin PBXFileReference section */ |
138 | + 090C948B0EC23FCD003AEE25 /* RMMarkerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMarkerManager.h; sourceTree = "<group>"; }; | ||
139 | + 090C948C0EC23FCD003AEE25 /* RMMarkerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMarkerManager.m; sourceTree = "<group>"; }; | ||
137 | 1266929F0EB75C0A00E002D5 /* RMConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMConfiguration.h; sourceTree = "<group>"; }; | 140 | 1266929F0EB75C0A00E002D5 /* RMConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMConfiguration.h; sourceTree = "<group>"; }; |
138 | 126692A00EB75C0A00E002D5 /* RMConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMConfiguration.m; sourceTree = "<group>"; }; | 141 | 126692A00EB75C0A00E002D5 /* RMConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMConfiguration.m; sourceTree = "<group>"; }; |
139 | 1296F55F0EB8743500FF25E0 /* RMMarkerStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMarkerStyle.h; sourceTree = "<group>"; }; | 142 | 1296F55F0EB8743500FF25E0 /* RMMarkerStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMarkerStyle.h; sourceTree = "<group>"; }; |
@@ -517,6 +520,8 @@ | @@ -517,6 +520,8 @@ | ||
517 | B8C9740D0E8A196E007D16AD /* Map */ = { | 520 | B8C9740D0E8A196E007D16AD /* Map */ = { |
518 | isa = PBXGroup; | 521 | isa = PBXGroup; |
519 | children = ( | 522 | children = ( |
523 | + 090C948B0EC23FCD003AEE25 /* RMMarkerManager.h */, | ||
524 | + 090C948C0EC23FCD003AEE25 /* RMMarkerManager.m */, | ||
520 | B8C9740E0E8A198F007D16AD /* README.txt */, | 525 | B8C9740E0E8A198F007D16AD /* README.txt */, |
521 | B8C974690E8A1A50007D16AD /* RMMapView.h */, | 526 | B8C974690E8A1A50007D16AD /* RMMapView.h */, |
522 | B8C9746A0E8A1A50007D16AD /* RMMapView.m */, | 527 | B8C9746A0E8A1A50007D16AD /* RMMapView.m */, |
@@ -709,6 +714,7 @@ | @@ -709,6 +714,7 @@ | ||
709 | 126692A10EB75C0A00E002D5 /* RMConfiguration.m in Sources */, | 714 | 126692A10EB75C0A00E002D5 /* RMConfiguration.m in Sources */, |
710 | 1296F5610EB8743500FF25E0 /* RMMarkerStyle.m in Sources */, | 715 | 1296F5610EB8743500FF25E0 /* RMMarkerStyle.m in Sources */, |
711 | 1296F5640EB8745300FF25E0 /* RMMarkerStyles.m in Sources */, | 716 | 1296F5640EB8745300FF25E0 /* RMMarkerStyles.m in Sources */, |
717 | + 090C948D0EC23FCD003AEE25 /* RMMarkerManager.m in Sources */, | ||
712 | ); | 718 | ); |
713 | runOnlyForDeploymentPostprocessing = 0; | 719 | runOnlyForDeploymentPostprocessing = 0; |
714 | }; | 720 | }; |
-
Please register or login to post a comment