尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Thomas Rasch
Commit f0be5aaff3fd589e05c8029cac7e63cf3eeb7c7b 1 parent f0636b51

o Renamed RMLayerCollection to RMMarkerLayer

Inline Side-by-side
Showing 5 changed files with 21 additions and 21 deletions
@@ -119,7 +119,7 @@ enum { @@ -119,7 +119,7 @@ enum {
119 @class RMTileLoader; 119 @class RMTileLoader;
120 @class RMCoreAnimationRenderer; 120 @class RMCoreAnimationRenderer;
121 @class RMMapLayer; 121 @class RMMapLayer;
122 -@class RMLayerCollection; 122 +@class RMMarkerLayer;
123 @class RMMarker; 123 @class RMMarker;
124 @protocol RMMercatorToTileProjection; 124 @protocol RMMercatorToTileProjection;
125 @protocol RMTileSource; 125 @protocol RMTileSource;
@@ -142,7 +142,7 @@ enum { @@ -142,7 +142,7 @@ enum {
142 RMMercatorToScreenProjection *mercatorToScreenProjection; 142 RMMercatorToScreenProjection *mercatorToScreenProjection;
143 143
144 RMMarkerManager *markerManager; 144 RMMarkerManager *markerManager;
145 - RMLayerCollection *overlay; /// subview for markers and paths 145 + RMMarkerLayer *overlay; /// subview for markers and paths
146 RMCoreAnimationRenderer *renderer; 146 RMCoreAnimationRenderer *renderer;
147 RMTileImageSet *imagesOnScreen; 147 RMTileImageSet *imagesOnScreen;
148 RMTileLoader *tileLoader; 148 RMTileLoader *tileLoader;
@@ -212,7 +212,7 @@ enum { @@ -212,7 +212,7 @@ enum {
212 @property (nonatomic, assign) float maxZoom; 212 @property (nonatomic, assign) float maxZoom;
213 213
214 @property (nonatomic, readonly) RMMarkerManager *markerManager; 214 @property (nonatomic, readonly) RMMarkerManager *markerManager;
215 -@property (nonatomic, readonly) RMLayerCollection *overlay; 215 +@property (nonatomic, readonly) RMMarkerLayer *overlay;
216 216
217 @property (nonatomic, readonly) RMTileImageSet *imagesOnScreen; 217 @property (nonatomic, readonly) RMTileImageSet *imagesOnScreen;
218 @property (nonatomic, readonly) RMTileLoader *tileLoader; 218 @property (nonatomic, readonly) RMTileLoader *tileLoader;
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 #import "RMFoundation.h" 35 #import "RMFoundation.h"
36 #import "RMProjection.h" 36 #import "RMProjection.h"
37 #import "RMMarkerManager.h" 37 #import "RMMarkerManager.h"
38 -#import "RMLayerCollection.h" 38 +#import "RMMarkerLayer.h"
39 #import "RMMarker.h" 39 #import "RMMarker.h"
40 40
41 #import "RMMercatorToScreenProjection.h" 41 #import "RMMercatorToScreenProjection.h"
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 74
75 @interface RMMapView (PrivateMethods) 75 @interface RMMapView (PrivateMethods)
76 76
77 -@property (nonatomic, retain) RMLayerCollection *overlay; 77 +@property (nonatomic, retain) RMMarkerLayer *overlay;
78 78
79 // methods for post-touch deceleration 79 // methods for post-touch deceleration
80 - (void)startDecelerationWithDelta:(CGSize)delta; 80 - (void)startDecelerationWithDelta:(CGSize)delta;
@@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
199 199
200 /// \bug TODO: Make a nice background class 200 /// \bug TODO: Make a nice background class
201 [self setBackground:[[[CALayer alloc] init] autorelease]]; 201 [self setBackground:[[[CALayer alloc] init] autorelease]];
202 - [self setOverlay:[[[RMLayerCollection alloc] initWithView:self] autorelease]]; 202 + [self setOverlay:[[[RMMarkerLayer alloc] initWithView:self] autorelease]];
203 markerManager = [[RMMarkerManager alloc] initWithView:self]; 203 markerManager = [[RMMarkerManager alloc] initWithView:self];
204 204
205 [[NSNotificationCenter defaultCenter] addObserver:self 205 [[NSNotificationCenter defaultCenter] addObserver:self
@@ -1040,7 +1040,7 @@ @@ -1040,7 +1040,7 @@
1040 return [[background retain] autorelease]; 1040 return [[background retain] autorelease];
1041 } 1041 }
1042 1042
1043 -- (void)setOverlay:(RMLayerCollection *)aLayer 1043 +- (void)setOverlay:(RMMarkerLayer *)aLayer
1044 { 1044 {
1045 if (overlay == aLayer) 1045 if (overlay == aLayer)
1046 return; 1046 return;
@@ -1064,7 +1064,7 @@ @@ -1064,7 +1064,7 @@
1064 [self.layer insertSublayer:[renderer layer] atIndex:0]; 1064 [self.layer insertSublayer:[renderer layer] atIndex:0];
1065 } 1065 }
1066 1066
1067 -- (RMLayerCollection *)overlay 1067 +- (RMMarkerLayer *)overlay
1068 { 1068 {
1069 return [[overlay retain] autorelease]; 1069 return [[overlay retain] autorelease];
1070 } 1070 }
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 @class RMMapRenderer; 32 @class RMMapRenderer;
33 @class RMMapView; 33 @class RMMapView;
34 34
35 -@interface RMLayerCollection : RMMapLayer 35 +@interface RMMarkerLayer : RMMapLayer
36 { 36 {
37 /// The actual collection of all sublayers, including those offscreen. 37 /// The actual collection of all sublayers, including those offscreen.
38 /// It is ordered back to front. 38 /// It is ordered back to front.
@@ -26,12 +26,12 @@ @@ -26,12 +26,12 @@
26 // POSSIBILITY OF SUCH DAMAGE. 26 // POSSIBILITY OF SUCH DAMAGE.
27 27
28 #import "RMMapView.h" 28 #import "RMMapView.h"
29 -#import "RMLayerCollection.h" 29 +#import "RMMarkerLayer.h"
30 #import "RMMercatorToScreenProjection.h" 30 #import "RMMercatorToScreenProjection.h"
31 #import "RMMarker.h" 31 #import "RMMarker.h"
32 #import "RMPath.h" 32 #import "RMPath.h"
33 33
34 -@implementation RMLayerCollection 34 +@implementation RMMarkerLayer
35 35
36 - (id)initWithView:(RMMapView *)aMapView 36 - (id)initWithView:(RMMapView *)aMapView
37 { 37 {
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 2BEC60350F8AC713008FB858 /* RMDatabaseCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B8474B990EB40094006A0BC1 /* RMDatabaseCache.m */; }; 65 2BEC60350F8AC713008FB858 /* RMDatabaseCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B8474B990EB40094006A0BC1 /* RMDatabaseCache.m */; };
66 2BEC60370F8AC718008FB858 /* RMFoundation.c in Sources */ = {isa = PBXBuildFile; fileRef = 23A0AAE80EB90A99003A4521 /* RMFoundation.c */; }; 66 2BEC60370F8AC718008FB858 /* RMFoundation.c in Sources */ = {isa = PBXBuildFile; fileRef = 23A0AAE80EB90A99003A4521 /* RMFoundation.c */; };
67 2BEC60380F8AC71A008FB858 /* RMFractalTileProjection.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64EA0E80E73F001663B6 /* RMFractalTileProjection.m */; }; 67 2BEC60380F8AC71A008FB858 /* RMFractalTileProjection.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64EA0E80E73F001663B6 /* RMFractalTileProjection.m */; };
68 - 2BEC603A0F8AC71D008FB858 /* RMLayerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = B8FA92180E9315EC003A9FE6 /* RMLayerCollection.m */; }; 68 + 2BEC603A0F8AC71D008FB858 /* RMMarkerLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8FA92180E9315EC003A9FE6 /* RMMarkerLayer.m */; };
69 2BEC603C0F8AC71F008FB858 /* RMMapLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */; }; 69 2BEC603C0F8AC71F008FB858 /* RMMapLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */; };
70 2BEC603E0F8AC723008FB858 /* RMMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = B8C9746A0E8A1A50007D16AD /* RMMapView.m */; }; 70 2BEC603E0F8AC723008FB858 /* RMMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = B8C9746A0E8A1A50007D16AD /* RMMapView.m */; };
71 2BEC603F0F8AC724008FB858 /* RMMarker.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC630EA2E792004D8F85 /* RMMarker.m */; }; 71 2BEC603F0F8AC724008FB858 /* RMMarker.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC630EA2E792004D8F85 /* RMMarker.m */; };
@@ -146,8 +146,8 @@ @@ -146,8 +146,8 @@
146 B8F3FC610EA2B382004D8F85 /* RMMapLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */; }; 146 B8F3FC610EA2B382004D8F85 /* RMMapLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */; };
147 B8F3FC640EA2E792004D8F85 /* RMMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = B8F3FC620EA2E792004D8F85 /* RMMarker.h */; }; 147 B8F3FC640EA2E792004D8F85 /* RMMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = B8F3FC620EA2E792004D8F85 /* RMMarker.h */; };
148 B8F3FC650EA2E792004D8F85 /* RMMarker.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC630EA2E792004D8F85 /* RMMarker.m */; }; 148 B8F3FC650EA2E792004D8F85 /* RMMarker.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC630EA2E792004D8F85 /* RMMarker.m */; };
149 - B8FA92190E9315EC003A9FE6 /* RMLayerCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = B8FA92170E9315EC003A9FE6 /* RMLayerCollection.h */; };  
150 - B8FA921A0E9315EC003A9FE6 /* RMLayerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = B8FA92180E9315EC003A9FE6 /* RMLayerCollection.m */; }; 149 + B8FA92190E9315EC003A9FE6 /* RMMarkerLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = B8FA92170E9315EC003A9FE6 /* RMMarkerLayer.h */; };
  150 + B8FA921A0E9315EC003A9FE6 /* RMMarkerLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8FA92180E9315EC003A9FE6 /* RMMarkerLayer.m */; };
151 D1437B36122869E400888DAE /* RMDBMapSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D1437B32122869E400888DAE /* RMDBMapSource.m */; }; 151 D1437B36122869E400888DAE /* RMDBMapSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D1437B32122869E400888DAE /* RMDBMapSource.m */; };
152 D1437B37122869E400888DAE /* RMDBMapSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D1437B33122869E400888DAE /* RMDBMapSource.h */; }; 152 D1437B37122869E400888DAE /* RMDBMapSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D1437B33122869E400888DAE /* RMDBMapSource.h */; };
153 /* End PBXBuildFile section */ 153 /* End PBXBuildFile section */
@@ -290,8 +290,8 @@ @@ -290,8 +290,8 @@
290 B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapLayer.m; sourceTree = "<group>"; }; 290 B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapLayer.m; sourceTree = "<group>"; };
291 B8F3FC620EA2E792004D8F85 /* RMMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMarker.h; sourceTree = "<group>"; }; 291 B8F3FC620EA2E792004D8F85 /* RMMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMarker.h; sourceTree = "<group>"; };
292 B8F3FC630EA2E792004D8F85 /* RMMarker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMarker.m; sourceTree = "<group>"; }; 292 B8F3FC630EA2E792004D8F85 /* RMMarker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMarker.m; sourceTree = "<group>"; };
293 - B8FA92170E9315EC003A9FE6 /* RMLayerCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMLayerCollection.h; sourceTree = "<group>"; };  
294 - B8FA92180E9315EC003A9FE6 /* RMLayerCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMLayerCollection.m; sourceTree = "<group>"; }; 293 + B8FA92170E9315EC003A9FE6 /* RMMarkerLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMarkerLayer.h; sourceTree = "<group>"; };
  294 + B8FA92180E9315EC003A9FE6 /* RMMarkerLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMarkerLayer.m; sourceTree = "<group>"; };
295 D1437B32122869E400888DAE /* RMDBMapSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMDBMapSource.m; sourceTree = "<group>"; }; 295 D1437B32122869E400888DAE /* RMDBMapSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMDBMapSource.m; sourceTree = "<group>"; };
296 D1437B33122869E400888DAE /* RMDBMapSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMDBMapSource.h; sourceTree = "<group>"; }; 296 D1437B33122869E400888DAE /* RMDBMapSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMDBMapSource.h; sourceTree = "<group>"; };
297 /* End PBXFileReference section */ 297 /* End PBXFileReference section */
@@ -580,8 +580,8 @@ @@ -580,8 +580,8 @@
580 160EEDAE13D41DEC007C5501 /* RMAnnotation.m */, 580 160EEDAE13D41DEC007C5501 /* RMAnnotation.m */,
581 B86F26AC0E87442C007A3773 /* RMMapLayer.h */, 581 B86F26AC0E87442C007A3773 /* RMMapLayer.h */,
582 B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */, 582 B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */,
583 - B8FA92170E9315EC003A9FE6 /* RMLayerCollection.h */,  
584 - B8FA92180E9315EC003A9FE6 /* RMLayerCollection.m */, 583 + B8FA92170E9315EC003A9FE6 /* RMMarkerLayer.h */,
  584 + B8FA92180E9315EC003A9FE6 /* RMMarkerLayer.m */,
585 B8F3FC620EA2E792004D8F85 /* RMMarker.h */, 585 B8F3FC620EA2E792004D8F85 /* RMMarker.h */,
586 B8F3FC630EA2E792004D8F85 /* RMMarker.m */, 586 B8F3FC630EA2E792004D8F85 /* RMMarker.m */,
587 B8CEB1C30ED5A3480014C431 /* RMPath.h */, 587 B8CEB1C30ED5A3480014C431 /* RMPath.h */,
@@ -660,7 +660,7 @@ @@ -660,7 +660,7 @@
660 B8C974620E8A19E8007D16AD /* RMTileSource.h in Headers */, 660 B8C974620E8A19E8007D16AD /* RMTileSource.h in Headers */,
661 B8C9746B0E8A1A50007D16AD /* RMMapView.h in Headers */, 661 B8C9746B0E8A1A50007D16AD /* RMMapView.h in Headers */,
662 B8C974B00E8A1F08007D16AD /* RMMercatorToTileProjection.h in Headers */, 662 B8C974B00E8A1F08007D16AD /* RMMercatorToTileProjection.h in Headers */,
663 - B8FA92190E9315EC003A9FE6 /* RMLayerCollection.h in Headers */, 663 + B8FA92190E9315EC003A9FE6 /* RMMarkerLayer.h in Headers */,
664 B8F3FC640EA2E792004D8F85 /* RMMarker.h in Headers */, 664 B8F3FC640EA2E792004D8F85 /* RMMarker.h in Headers */,
665 B8474B9A0EB40094006A0BC1 /* FMDatabase.h in Headers */, 665 B8474B9A0EB40094006A0BC1 /* FMDatabase.h in Headers */,
666 B8474B9C0EB40094006A0BC1 /* FMDatabaseAdditions.h in Headers */, 666 B8474B9C0EB40094006A0BC1 /* FMDatabaseAdditions.h in Headers */,
@@ -836,7 +836,7 @@ @@ -836,7 +836,7 @@
836 2BEC60350F8AC713008FB858 /* RMDatabaseCache.m in Sources */, 836 2BEC60350F8AC713008FB858 /* RMDatabaseCache.m in Sources */,
837 2BEC60370F8AC718008FB858 /* RMFoundation.c in Sources */, 837 2BEC60370F8AC718008FB858 /* RMFoundation.c in Sources */,
838 2BEC60380F8AC71A008FB858 /* RMFractalTileProjection.m in Sources */, 838 2BEC60380F8AC71A008FB858 /* RMFractalTileProjection.m in Sources */,
839 - 2BEC603A0F8AC71D008FB858 /* RMLayerCollection.m in Sources */, 839 + 2BEC603A0F8AC71D008FB858 /* RMMarkerLayer.m in Sources */,
840 2BEC603C0F8AC71F008FB858 /* RMMapLayer.m in Sources */, 840 2BEC603C0F8AC71F008FB858 /* RMMapLayer.m in Sources */,
841 2BEC603E0F8AC723008FB858 /* RMMapView.m in Sources */, 841 2BEC603E0F8AC723008FB858 /* RMMapView.m in Sources */,
842 2BEC603F0F8AC724008FB858 /* RMMarker.m in Sources */, 842 2BEC603F0F8AC724008FB858 /* RMMarker.m in Sources */,
@@ -883,7 +883,7 @@ @@ -883,7 +883,7 @@
883 B8C9745D0E8A19E6007D16AD /* RMTileImageSet.m in Sources */, 883 B8C9745D0E8A19E6007D16AD /* RMTileImageSet.m in Sources */,
884 B8C9745F0E8A19E7007D16AD /* RMTileLoader.m in Sources */, 884 B8C9745F0E8A19E7007D16AD /* RMTileLoader.m in Sources */,
885 B8C9746C0E8A1A50007D16AD /* RMMapView.m in Sources */, 885 B8C9746C0E8A1A50007D16AD /* RMMapView.m in Sources */,
886 - B8FA921A0E9315EC003A9FE6 /* RMLayerCollection.m in Sources */, 886 + B8FA921A0E9315EC003A9FE6 /* RMMarkerLayer.m in Sources */,
887 B8F3FC610EA2B382004D8F85 /* RMMapLayer.m in Sources */, 887 B8F3FC610EA2B382004D8F85 /* RMMapLayer.m in Sources */,
888 B8F3FC650EA2E792004D8F85 /* RMMarker.m in Sources */, 888 B8F3FC650EA2E792004D8F85 /* RMMarker.m in Sources */,
889 B8474B9B0EB40094006A0BC1 /* FMDatabase.m in Sources */, 889 B8474B9B0EB40094006A0BC1 /* FMDatabase.m in Sources */,