Authored by Thomas Rasch

o Renamed RMLayerCollection to RMMarkerLayer

... ... @@ -119,7 +119,7 @@ enum {
@class RMTileLoader;
@class RMCoreAnimationRenderer;
@class RMMapLayer;
@class RMLayerCollection;
@class RMMarkerLayer;
@class RMMarker;
@protocol RMMercatorToTileProjection;
@protocol RMTileSource;
... ... @@ -142,7 +142,7 @@ enum {
RMMercatorToScreenProjection *mercatorToScreenProjection;
RMMarkerManager *markerManager;
RMLayerCollection *overlay; /// subview for markers and paths
RMMarkerLayer *overlay; /// subview for markers and paths
RMCoreAnimationRenderer *renderer;
RMTileImageSet *imagesOnScreen;
RMTileLoader *tileLoader;
... ... @@ -212,7 +212,7 @@ enum {
@property (nonatomic, assign) float maxZoom;
@property (nonatomic, readonly) RMMarkerManager *markerManager;
@property (nonatomic, readonly) RMLayerCollection *overlay;
@property (nonatomic, readonly) RMMarkerLayer *overlay;
@property (nonatomic, readonly) RMTileImageSet *imagesOnScreen;
@property (nonatomic, readonly) RMTileLoader *tileLoader;
... ...
... ... @@ -35,7 +35,7 @@
#import "RMFoundation.h"
#import "RMProjection.h"
#import "RMMarkerManager.h"
#import "RMLayerCollection.h"
#import "RMMarkerLayer.h"
#import "RMMarker.h"
#import "RMMercatorToScreenProjection.h"
... ... @@ -74,7 +74,7 @@
@interface RMMapView (PrivateMethods)
@property (nonatomic, retain) RMLayerCollection *overlay;
@property (nonatomic, retain) RMMarkerLayer *overlay;
// methods for post-touch deceleration
- (void)startDecelerationWithDelta:(CGSize)delta;
... ... @@ -199,7 +199,7 @@
/// \bug TODO: Make a nice background class
[self setBackground:[[[CALayer alloc] init] autorelease]];
[self setOverlay:[[[RMLayerCollection alloc] initWithView:self] autorelease]];
[self setOverlay:[[[RMMarkerLayer alloc] initWithView:self] autorelease]];
markerManager = [[RMMarkerManager alloc] initWithView:self];
[[NSNotificationCenter defaultCenter] addObserver:self
... ... @@ -1040,7 +1040,7 @@
return [[background retain] autorelease];
}
- (void)setOverlay:(RMLayerCollection *)aLayer
- (void)setOverlay:(RMMarkerLayer *)aLayer
{
if (overlay == aLayer)
return;
... ... @@ -1064,7 +1064,7 @@
[self.layer insertSublayer:[renderer layer] atIndex:0];
}
- (RMLayerCollection *)overlay
- (RMMarkerLayer *)overlay
{
return [[overlay retain] autorelease];
}
... ...
... ... @@ -32,7 +32,7 @@
@class RMMapRenderer;
@class RMMapView;
@interface RMLayerCollection : RMMapLayer
@interface RMMarkerLayer : RMMapLayer
{
/// The actual collection of all sublayers, including those offscreen.
/// It is ordered back to front.
... ...
... ... @@ -26,12 +26,12 @@
// POSSIBILITY OF SUCH DAMAGE.
#import "RMMapView.h"
#import "RMLayerCollection.h"
#import "RMMarkerLayer.h"
#import "RMMercatorToScreenProjection.h"
#import "RMMarker.h"
#import "RMPath.h"
@implementation RMLayerCollection
@implementation RMMarkerLayer
- (id)initWithView:(RMMapView *)aMapView
{
... ...
... ... @@ -65,7 +65,7 @@
2BEC60350F8AC713008FB858 /* RMDatabaseCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B8474B990EB40094006A0BC1 /* RMDatabaseCache.m */; };
2BEC60370F8AC718008FB858 /* RMFoundation.c in Sources */ = {isa = PBXBuildFile; fileRef = 23A0AAE80EB90A99003A4521 /* RMFoundation.c */; };
2BEC60380F8AC71A008FB858 /* RMFractalTileProjection.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64EA0E80E73F001663B6 /* RMFractalTileProjection.m */; };
2BEC603A0F8AC71D008FB858 /* RMLayerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = B8FA92180E9315EC003A9FE6 /* RMLayerCollection.m */; };
2BEC603A0F8AC71D008FB858 /* RMMarkerLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8FA92180E9315EC003A9FE6 /* RMMarkerLayer.m */; };
2BEC603C0F8AC71F008FB858 /* RMMapLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */; };
2BEC603E0F8AC723008FB858 /* RMMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = B8C9746A0E8A1A50007D16AD /* RMMapView.m */; };
2BEC603F0F8AC724008FB858 /* RMMarker.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC630EA2E792004D8F85 /* RMMarker.m */; };
... ... @@ -146,8 +146,8 @@
B8F3FC610EA2B382004D8F85 /* RMMapLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */; };
B8F3FC640EA2E792004D8F85 /* RMMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = B8F3FC620EA2E792004D8F85 /* RMMarker.h */; };
B8F3FC650EA2E792004D8F85 /* RMMarker.m in Sources */ = {isa = PBXBuildFile; fileRef = B8F3FC630EA2E792004D8F85 /* RMMarker.m */; };
B8FA92190E9315EC003A9FE6 /* RMLayerCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = B8FA92170E9315EC003A9FE6 /* RMLayerCollection.h */; };
B8FA921A0E9315EC003A9FE6 /* RMLayerCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = B8FA92180E9315EC003A9FE6 /* RMLayerCollection.m */; };
B8FA92190E9315EC003A9FE6 /* RMMarkerLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = B8FA92170E9315EC003A9FE6 /* RMMarkerLayer.h */; };
B8FA921A0E9315EC003A9FE6 /* RMMarkerLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = B8FA92180E9315EC003A9FE6 /* RMMarkerLayer.m */; };
D1437B36122869E400888DAE /* RMDBMapSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D1437B32122869E400888DAE /* RMDBMapSource.m */; };
D1437B37122869E400888DAE /* RMDBMapSource.h in Headers */ = {isa = PBXBuildFile; fileRef = D1437B33122869E400888DAE /* RMDBMapSource.h */; };
/* End PBXBuildFile section */
... ... @@ -290,8 +290,8 @@
B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapLayer.m; sourceTree = "<group>"; };
B8F3FC620EA2E792004D8F85 /* RMMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMarker.h; sourceTree = "<group>"; };
B8F3FC630EA2E792004D8F85 /* RMMarker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMarker.m; sourceTree = "<group>"; };
B8FA92170E9315EC003A9FE6 /* RMLayerCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMLayerCollection.h; sourceTree = "<group>"; };
B8FA92180E9315EC003A9FE6 /* RMLayerCollection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMLayerCollection.m; sourceTree = "<group>"; };
B8FA92170E9315EC003A9FE6 /* RMMarkerLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMarkerLayer.h; sourceTree = "<group>"; };
B8FA92180E9315EC003A9FE6 /* RMMarkerLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMarkerLayer.m; sourceTree = "<group>"; };
D1437B32122869E400888DAE /* RMDBMapSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMDBMapSource.m; sourceTree = "<group>"; };
D1437B33122869E400888DAE /* RMDBMapSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMDBMapSource.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
... ... @@ -580,8 +580,8 @@
160EEDAE13D41DEC007C5501 /* RMAnnotation.m */,
B86F26AC0E87442C007A3773 /* RMMapLayer.h */,
B8F3FC600EA2B382004D8F85 /* RMMapLayer.m */,
B8FA92170E9315EC003A9FE6 /* RMLayerCollection.h */,
B8FA92180E9315EC003A9FE6 /* RMLayerCollection.m */,
B8FA92170E9315EC003A9FE6 /* RMMarkerLayer.h */,
B8FA92180E9315EC003A9FE6 /* RMMarkerLayer.m */,
B8F3FC620EA2E792004D8F85 /* RMMarker.h */,
B8F3FC630EA2E792004D8F85 /* RMMarker.m */,
B8CEB1C30ED5A3480014C431 /* RMPath.h */,
... ... @@ -660,7 +660,7 @@
B8C974620E8A19E8007D16AD /* RMTileSource.h in Headers */,
B8C9746B0E8A1A50007D16AD /* RMMapView.h in Headers */,
B8C974B00E8A1F08007D16AD /* RMMercatorToTileProjection.h in Headers */,
B8FA92190E9315EC003A9FE6 /* RMLayerCollection.h in Headers */,
B8FA92190E9315EC003A9FE6 /* RMMarkerLayer.h in Headers */,
B8F3FC640EA2E792004D8F85 /* RMMarker.h in Headers */,
B8474B9A0EB40094006A0BC1 /* FMDatabase.h in Headers */,
B8474B9C0EB40094006A0BC1 /* FMDatabaseAdditions.h in Headers */,
... ... @@ -836,7 +836,7 @@
2BEC60350F8AC713008FB858 /* RMDatabaseCache.m in Sources */,
2BEC60370F8AC718008FB858 /* RMFoundation.c in Sources */,
2BEC60380F8AC71A008FB858 /* RMFractalTileProjection.m in Sources */,
2BEC603A0F8AC71D008FB858 /* RMLayerCollection.m in Sources */,
2BEC603A0F8AC71D008FB858 /* RMMarkerLayer.m in Sources */,
2BEC603C0F8AC71F008FB858 /* RMMapLayer.m in Sources */,
2BEC603E0F8AC723008FB858 /* RMMapView.m in Sources */,
2BEC603F0F8AC724008FB858 /* RMMarker.m in Sources */,
... ... @@ -883,7 +883,7 @@
B8C9745D0E8A19E6007D16AD /* RMTileImageSet.m in Sources */,
B8C9745F0E8A19E7007D16AD /* RMTileLoader.m in Sources */,
B8C9746C0E8A1A50007D16AD /* RMMapView.m in Sources */,
B8FA921A0E9315EC003A9FE6 /* RMLayerCollection.m in Sources */,
B8FA921A0E9315EC003A9FE6 /* RMMarkerLayer.m in Sources */,
B8F3FC610EA2B382004D8F85 /* RMMapLayer.m in Sources */,
B8F3FC650EA2E792004D8F85 /* RMMarker.m in Sources */,
B8474B9B0EB40094006A0BC1 /* FMDatabase.m in Sources */,
... ...