Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Cleaned up some code. Made most of the project compile as a native ma…

…cosx app.

Still some work to do here though.
  • Loading branch information...
commit 3beebf67e7b222de2fa1fda577dd87a7fe0e9f9b 1 parent 355abc8
@josephg josephg authored
Showing with 4,768 additions and 1,028 deletions.
  1. +5 −0 MapView/Classes/AbstractMecatorWebSource.m
  2. +15 −0 MapView/Classes/Layer.h
  3. +13 −0 MapView/Classes/Layer.m
  4. +1 −1  MapView/Classes/RMCoreAnimationRenderer.h
  5. +3 −4 MapView/Classes/RMCoreAnimationRenderer.m
  6. +2 −1  MapView/Classes/RMDiskCache.h
  7. +1 −1  MapView/Classes/RMFileTileImage.h
  8. +1 −1  MapView/Classes/RMFractalTileProjection.h
  9. +48 −0 MapView/Classes/RMLatLong.h
  10. +1 −1  MapView/Classes/RMLayerToScreenProjection.h
  11. +3 −1 MapView/Classes/RMLayeredTileLoader.h
  12. +18 −5 MapView/Classes/RMMapRenderer.h
  13. +3 −4 MapView/Classes/RMMapRenderer.m
  14. +10 −1 MapView/Classes/RMMapView.h
  15. +12 −68 MapView/Classes/RMMapView.m
  16. +2 −3 MapView/Classes/RMMercator.h
  17. +2 −2 MapView/Classes/RMProjection.h
  18. +1 −3 MapView/Classes/RMQuartzRenderer.h
  19. +9 −2 MapView/Classes/RMQuartzRenderer.m
  20. +2 −2 MapView/Classes/RMScreenProjection.h
  21. +1 −0  MapView/Classes/RMTile.h
  22. +9 −2 MapView/Classes/RMTileImage.h
  23. +6 −1 MapView/Classes/RMTileImageSet.h
  24. +1 −1  MapView/Classes/RMTileLoader.h
  25. +2 −1  MapView/Classes/RMTileProxy.h
  26. +1 −2  MapView/Classes/RMTileSource.h
  27. +2 −2 MapView/Classes/RMTiledLayerController.h
  28. +2 −2 MapView/Classes/RMTransform.h
  29. +1 −1  MapView/Classes/RMWebTileImage.h
  30. +20 −0 MapView/DesktopMapView-Info.plist
  31. +242 −0 MapView/MapView.xcodeproj/project.pbxproj
  32. +304 −107 MapView/MapView.xcodeproj/sineltor.mode1v3
  33. +4,025 −809 MapView/MapView.xcodeproj/sineltor.pbxuser
View
5 MapView/Classes/AbstractMecatorWebSource.m
@@ -36,6 +36,11 @@ -(void) dealloc
[super dealloc];
}
+-(NSString*) tileURL: (RMTile) tile
+{
+ @throw [NSException exceptionWithName:@"RMAbstractMethodInvocation" reason:@"tileURL invoked on AbstractMercatorWebSource. Override this method when instantiating abstract class." userInfo:nil];
+}
+
-(RMTileImage *) tileImage: (RMTile)tile
{
RMTileImage* image = [RMTileImage imageWithTile: tile FromURL:[self tileURL:tile]];
View
15 MapView/Classes/Layer.h
@@ -0,0 +1,15 @@
+//
+// Layer.h
+// MapView
+//
+// Created by Joseph Gentle on 22/09/08.
+// Copyright 2008 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface Layer : NSObject {
+
+}
+
+@end
View
13 MapView/Classes/Layer.m
@@ -0,0 +1,13 @@
+//
+// Layer.m
+// MapView
+//
+// Created by Joseph Gentle on 22/09/08.
+// Copyright 2008 __MyCompanyName__. All rights reserved.
+//
+
+#import "Layer.h"
+
+@implementation Layer
+
+@end
View
2  MapView/Classes/RMCoreAnimationRenderer.h
@@ -6,7 +6,7 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMMapRenderer.h"
@class RMLayeredTileLoader;
View
7 MapView/Classes/RMCoreAnimationRenderer.m
@@ -7,7 +7,6 @@
//
#import "RMCoreAnimationRenderer.h"
-#import "RMMapView.h"
#import <QuartzCore/QuartzCore.h>
#import "RMLayeredTileLoader.h"
#import "RMMathUtils.h"
@@ -15,9 +14,9 @@
@implementation RMCoreAnimationRenderer
-- (id) initWithView: (RMMapView *)_view
+- (id) initWithView: (id<RenderingTarget>)_view
{
- RMScreenProjection *_proj = [[RMScreenProjection alloc] initWithBounds:[_view bounds]];
+ RMScreenProjection *_proj = [[RMScreenProjection alloc] initWithBounds:[_view cgBounds]];
//[[LayerToScreenProjection alloc] initWithBounds:[_view bounds] InLayer:[_view layer]];
if (![super initWithView:_view ProjectingIn:_proj])
@@ -36,7 +35,7 @@ - (id) initWithView: (RMMapView *)_view
// [layer addSublayer:sublayer];
- [view.layer addSublayer:[tileLoader layer]];
+ [[view layer] addSublayer:[tileLoader layer]];
return self;
}
View
3  MapView/Classes/RMDiskCache.h
@@ -6,7 +6,8 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+
+#import <Foundation/Foundation.h>
#import "RMTileCache.h"
@interface RMDiskCache : NSObject<RMTileCache>
View
2  MapView/Classes/RMFileTileImage.h
@@ -6,7 +6,7 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMTileImage.h"
@interface RMFileTileImage : RMTileImage {
View
2  MapView/Classes/RMFractalTileProjection.h
@@ -6,7 +6,7 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMMercator.h"
#import "RMTile.h"
View
48 MapView/Classes/RMLatLong.h
@@ -0,0 +1,48 @@
+/*
+ * RMLatLong.h
+ * MapView
+ *
+ * Created by Joseph Gentle on 22/09/08.
+ * Copyright 2008 __MyCompanyName__. All rights reserved.
+ *
+ */
+
+#ifndef _RMLATLONG_H_
+#define _RMLATLONG_H_
+
+#import <TargetConditionals.h>
+#if TARGET_OS_IPHONE
+#import <CoreLocation/CoreLocation.h>
+#else
+
+/* From CoreLocation by Apple inc. Copyright 2008 Apple Computer, Inc. All rights reserved. */
+
+/*
+ * CLLocationDegrees
+ *
+ * Discussion:
+ * Type used to represent a latitude or longitude coordinate in degrees under the WGS 84 reference
+ * frame. The degree can be positive (North and East) or negative (South and West).
+ */
+typedef double CLLocationDegrees;
+/*
+ * CLLocationCoordinate2D
+ *
+ * Discussion:
+ * A structure that contains a geographical coordinate.
+ *
+ * Fields:
+ * latitude:
+ * The latitude in degrees.
+ * longitude:
+ * The longitude in degrees.
+ */
+typedef struct {
+ CLLocationDegrees latitude;
+ CLLocationDegrees longitude;
+} CLLocationCoordinate2D;
+
+
+#endif
+
+#endif
View
2  MapView/Classes/RMLayerToScreenProjection.h
@@ -6,7 +6,7 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMScreenProjection.h"
@class CALayer;
View
4 MapView/Classes/RMLayeredTileLoader.h
@@ -6,11 +6,13 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMTileLoader.h"
#import "RMMercator.h"
+@class CALayer;
+
@interface RMLayeredTileLoader : RMTileLoader {
CALayer *layer;
}
View
23 MapView/Classes/RMMapRenderer.h
@@ -6,22 +6,35 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMMercator.h"
-@class RMMapView;
+@class CALayer;
+@protocol RMTileSource;
+
+@protocol RenderingTarget<NSObject>
+
+-(void) setNeedsDisplay;
+-(CGRect) cgBounds;
+-(id<RMTileSource>) tileSource;
+@optional
+-(CALayer*) layer;
+
+@end
+
+
@class RMScreenProjection;
@interface RMMapRenderer : NSObject
{
RMScreenProjection *screenProjection;
- RMMapView *view;
+ id<RenderingTarget> view;
}
// Designated initialiser
-- (id) initWithView: (RMMapView *)_view ProjectingIn: (RMScreenProjection*) _screenProjection;
+- (id) initWithView: (id<RenderingTarget>)_view ProjectingIn: (RMScreenProjection*) _screenProjection;
// This makes a screen projection from the view
-- (id) initWithView: (RMMapView *)view;
+- (id) initWithView: (id<RenderingTarget>)view;
- (void)drawRect:(CGRect)rect;
View
7 MapView/Classes/RMMapRenderer.m
@@ -9,7 +9,6 @@
#import "RMMapRenderer.h"
#import "RMScreenProjection.h"
#import "RMFractalTileProjection.h"
-#import "RMMapView.h"
#import "RMTileSource.h"
#import "RMTileImage.h"
@@ -19,7 +18,7 @@ @implementation RMMapRenderer
@synthesize screenProjection;
// Designated initialiser
-- (id) initWithView: (RMMapView *)_view ProjectingIn: (RMScreenProjection*) _screenProjection
+- (id) initWithView: (id<RenderingTarget>)_view ProjectingIn: (RMScreenProjection*) _screenProjection
{
if (![super init])
return nil;
@@ -32,9 +31,9 @@ - (id) initWithView: (RMMapView *)_view ProjectingIn: (RMScreenProjection*) _scr
return self;
}
-- (id) initWithView: (RMMapView *)_view
+- (id) initWithView: (id<RenderingTarget>)_view
{
- RMScreenProjection *_screenProjection = [[RMScreenProjection alloc] initWithBounds:[_view bounds]];
+ RMScreenProjection *_screenProjection = [[RMScreenProjection alloc] initWithBounds:[_view cgBounds]];
return [self initWithView:_view ProjectingIn:_screenProjection];
}
View
11 MapView/Classes/RMMapView.h
@@ -6,7 +6,15 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
+#import <TargetConditionals.h>
+
+///// This class is only valid for the iphone.
+#if !TARGET_OS_IPHONE
+#error This is only valid on the iphone.
+#endif
+
#import <UIKit/UIKit.h>
+
#import "RMMercator.h"
//#import "MapRenderer.h"
//#import "TileSource.h"
@@ -22,7 +30,7 @@ typedef struct {
//@class TileSource;
//@class TileImageSet;
-@interface RMMapView : UIView {
+@interface RMMapView<RenderingTarget> : UIView {
id<RMTileSource> tileSource;
RMMapRenderer *renderer;
@@ -46,3 +54,4 @@ typedef struct {
@property (retain, readwrite, nonatomic) id<RMTileSource> tileSource;
@end
+
View
80 MapView/Classes/RMMapView.m
@@ -6,6 +6,8 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
+#if TARGET_OS_IPHONE
+
#import "RMMapView.h"
#import "RMVirtualEarthSource.h"
#import "RMOpenStreetMapsSource.h"
@@ -47,25 +49,6 @@ -(void) makeRenderer
renderer = [[RMCoreAnimationRenderer alloc] initWithView:self];
}
-/*
--(void) makeProjection
-{
- if (tileSource == nil)
- [self makeTileSource];
-
- screenProjection = [[TiledLayerController alloc] initWithTileSource: tileSource];
- [self layer].masksToBounds = YES;
- [[self layer] addSublayer:[screenProjection layer]];
- [[self layer] setNeedsDisplay];
-
- CLLocationCoordinate2D here;
-// here.latitude = -33.9264;
- here.latitude = -33.9464;
- here.longitude = 151.2381;
- [screenProjection setScale:[[tileSource tileProjection] calculateScaleFromZoom:18]];
- [screenProjection centerLatLong:here Animate: NO];
-}*/
-
-(void) configureCaching
{
// Unfortunately, the iPhone doesn't seem to support disk caches using NSURLCache. This works fine in the
@@ -96,13 +79,7 @@ -(void) initValues
here.longitude = 151.2381;
[self setScale:10];
[self setLocation:here];
-
-// NSLog(@"set to %f %f", here.latitude, here.longitude);
-//
-// here = [self location];
-// NSLog(@"set to %f %f", here.latitude, here.longitude);
-
-
+
// [screenProjection setScale:[[[view tileSource] tileProjection] calculateScaleFromZoom:16]];
// imageSet = [[TileImageSet alloc] init];
@@ -184,37 +161,9 @@ - (void) setScale: (float) scale
}
- (void)drawRect:(CGRect)rect {
-// imageSet = [tileSource tileImagesForScreen: screenProjection];
-// if ([imageSet needsRedraw])
- {
-// [self recalculateImageSet];
-// NSLog(@"WARNING - Image set needs redraw and we're in drawRect.");
- }
[renderer drawRect:rect];
-
-// [self setNeedsDisplay];
}
-/*
-- (NSSet*) touchesOnScreenIn: (UIEvent *)event
-{
- NSSet *allTouches = [event allTouches];
-
- NSMutableSet *interestingTouches = [[[NSMutableSet alloc] init] autorelease];
-
- for (UITouch *touch in allTouches)
- {
- if ([touch phase] == UITouchPhaseBegan
- || [touch phase] == UITouchPhaseMoved
- || [touch phase] == UITouchPhaseStationary)
- {
- [interestingTouches addObject:touch];
- }
- }
-
- return interestingTouches;
-}*/
-
- (RMGestureDetails) getGestureDetails: (NSSet*) touches
{
RMGestureDetails gesture;
@@ -306,9 +255,6 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
if (enableDragging && newGesture.numTouches == lastGesture.numTouches)
{
-
-// NSLog(@"newGesture at %f, %f", newGesture.center.x, newGesture.center.y);
-
CGSize delta;
delta.width = newGesture.center.x - lastGesture.center.x;
delta.height = newGesture.center.y - lastGesture.center.y;
@@ -318,28 +264,26 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
NSAssert (lastGesture.averageDistanceFromCenter > 0.0f && newGesture.averageDistanceFromCenter > 0.0f,
@"Distance from center is zero despite >1 touches on the screen");
-// NSLog(@"delta %f %f", delta.width, delta.height);
- [renderer moveBy:delta];
-
double zoomFactor = newGesture.averageDistanceFromCenter / lastGesture.averageDistanceFromCenter;
-// lastZoomDistance = gesture.averageDistanceFromCenter;
-// NSLog(@"zoom by %f", zoomFactor);
- [renderer zoomByFactor: zoomFactor Near: newGesture.center];
+ [self moveBy:delta];
+ [self zoomByFactor: zoomFactor Near: newGesture.center];
}
else
{
-// NSLog(@"delta %f %f", delta.width, delta.height);
-// [self dragBy: delta TrySlideImages: YES];
- [renderer moveBy:delta];
+ [self moveBy:delta];
}
}
lastGesture = newGesture;
-
-// NSLog(@"touchesMoved %d ... lastgesture at %f, %f", [[event allTouches] count], lastGesture.center.x, lastGesture.center.y);
+}
+CGRect cgBounds
+{
+ return [self bounds];
}
@end
+
+#endif
View
5 MapView/Classes/RMMercator.h
@@ -6,9 +6,8 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
-#import <CoreLocation/CoreLocation.h>
-//#import <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
+#import "RMLatLong.h"
typedef struct {
double x, y;
View
4 MapView/Classes/RMProjection.h
@@ -6,8 +6,8 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
-#import <CoreLocation/CoreLocation.h>
+#import <Foundation/Foundation.h>
+#import "RMLatLong.h"
#import "proj_api.h"
@interface RMProjection : NSObject {
View
4 MapView/Classes/RMQuartzRenderer.h
@@ -6,11 +6,9 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMMapRenderer.h"
-@class RMScreenProjection;
-@class RMMapView;
@class RMTileLoader;
@interface RMQuartzRenderer : RMMapRenderer {
View
11 MapView/Classes/RMQuartzRenderer.m
@@ -7,8 +7,15 @@
//
#import "RMQuartzRenderer.h"
+
+#import <TargetConditionals.h>
+#if TARGET_OS_IPHONE
+#import <UIKit/UIKit.h>
+#else
+#import <Cocoa/Cocoa.h>
+#endif
+
#import "RMTileLoader.h"
-#import "RMMapView.h"
#import "RMFractalTileProjection.h"
#import "RMTileSource.h"
@@ -17,7 +24,7 @@
@implementation RMQuartzRenderer
-- (id) initWithView: (RMMapView *)_view
+- (id) initWithView: (id<RenderingTarget>)_view
{
if (![super initWithView:_view])
return nil;
View
4 MapView/Classes/RMScreenProjection.h
@@ -6,9 +6,9 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMMercator.h"
-#import <CoreLocation/CoreLocation.h>
+#import "RMLatLong.h"
@interface RMScreenProjection : NSObject {
RMMercatorPoint topLeft;
View
1  MapView/Classes/RMTile.h
@@ -11,6 +11,7 @@
#define _TILE_H_
#include <CoreGraphics/CGGeometry.h>
+//#include <Quartz/Quartz.h>
#include <stdint.h>
typedef struct{
View
11 MapView/Classes/RMTileImage.h
@@ -6,9 +6,16 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <TargetConditionals.h>
+#if TARGET_OS_IPHONE
+ #import <UIKit/UIKit.h>
+#else
+ #import <Cocoa/Cocoa.h>
+typedef NSImage UIImage;
+#endif
+
//#import <CoreGraphics/CoreGraphics.h>
-#import <CoreLocation/CoreLocation.h>
+#import "RMLatLong.h"
#import "RMTile.h"
@class RMTileImage;
View
7 MapView/Classes/RMTileImageSet.h
@@ -6,7 +6,12 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <TargetConditionals.h>
+#if TARGET_OS_IPHONE
+# import <UIKit/UIKit.h>
+#else
+# import <Cocoa/Cocoa.h>
+#endif
#import "RMTile.h"
@class RMTileImage;
View
2  MapView/Classes/RMTileLoader.h
@@ -6,7 +6,7 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMTile.h"
#import "RMTileImageSet.h"
View
3  MapView/Classes/RMTileProxy.h
@@ -6,8 +6,9 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMTile.h"
+
@class RMTileImage;
@interface RMTileProxy : NSObject {
View
3  MapView/Classes/RMTileSource.h
@@ -6,7 +6,6 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-//#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
#import "RMTile.h"
#import "RMMercator.h"
@@ -18,7 +17,7 @@
@class RMTileCache;
@protocol RMTileSource <NSObject>
-
+
-(RMTileImage *) tileImage: (RMTile) tile;
-(RMFractalTileProjection*) tileProjection;
View
4 MapView/Classes/RMTiledLayerController.h
@@ -6,9 +6,9 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMMercator.h"
-#import <CoreLocation/CoreLocation.h>
+#import "RMLatLong.h"
#import <QuartzCore/QuartzCore.h>
@protocol RMTileSource;
View
4 MapView/Classes/RMTransform.h
@@ -6,8 +6,8 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
-#import <CoreLocation/CoreLocation.h>
+#import <Foundation/Foundation.h>
+#import "RMLatLong.h"
@class RMProjection;
@interface RMTransform : NSObject {
View
2  MapView/Classes/RMWebTileImage.h
@@ -6,7 +6,7 @@
// Copyright 2008 __MyCompanyName__. All rights reserved.
//
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
#import "RMTileImage.h"
@interface RMWebTileImage : RMTileImage {
View
20 MapView/DesktopMapView-Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+</dict>
+</plist>
View
242 MapView/MapView.xcodeproj/project.pbxproj
@@ -71,6 +71,64 @@
B83E66C30E80F053001663B6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B83E65680E80E830001663B6 /* QuartzCore.framework */; };
B83E66C50E80F06D001663B6 /* libProj4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B83E654F0E80E7A8001663B6 /* libProj4.a */; };
B83E67170E80F1CE001663B6 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = B83E670F0E80F1B5001663B6 /* loading.png */; };
+ B86F26AE0E87442C007A3773 /* Layer.h in Headers */ = {isa = PBXBuildFile; fileRef = B86F26AC0E87442C007A3773 /* Layer.h */; };
+ B86F26AF0E87442C007A3773 /* Layer.m in Sources */ = {isa = PBXBuildFile; fileRef = B86F26AD0E87442C007A3773 /* Layer.m */; };
+ B8D27AFC0E8780CD00F596FE /* RMLatLong.h in Headers */ = {isa = PBXBuildFile; fileRef = B8D27AFB0E8780CD00F596FE /* RMLatLong.h */; };
+ B8D27C8E0E8796FF00F596FE /* RMWebTileImage.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64DD0E80E73F001663B6 /* RMWebTileImage.m */; };
+ B8D27C8F0E8796FF00F596FE /* RMWebTileImage.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64DC0E80E73F001663B6 /* RMWebTileImage.h */; };
+ B8D27C900E8796FF00F596FE /* RMVirtualEarthSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C7A9675D0E84134B0031BA75 /* RMVirtualEarthSource.m */; };
+ B8D27C910E87970000F596FE /* RMVirtualEarthSource.h in Headers */ = {isa = PBXBuildFile; fileRef = C7A9675C0E84134B0031BA75 /* RMVirtualEarthSource.h */; };
+ B8D27C920E87970100F596FE /* RMTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64E50E80E73F001663B6 /* RMTransform.h */; };
+ B8D27C930E87970200F596FE /* RMTransform.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64E60E80E73F001663B6 /* RMTransform.m */; };
+ B8D27C940E87970200F596FE /* RMTileSource.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64EC0E80E73F001663B6 /* RMTileSource.h */; };
+ B8D27C950E87970400F596FE /* RMTileProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64DB0E80E73F001663B6 /* RMTileProxy.m */; };
+ B8D27C960E87970400F596FE /* RMTileProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64DA0E80E73F001663B6 /* RMTileProxy.h */; };
+ B8D27C970E87970500F596FE /* RMTileLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64C70E80E73F001663B6 /* RMTileLoader.m */; };
+ B8D27C980E87970600F596FE /* RMTileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64C60E80E73F001663B6 /* RMTileLoader.h */; };
+ B8D27C990E87970600F596FE /* RMTileImageSet.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64E10E80E73F001663B6 /* RMTileImageSet.m */; };
+ B8D27C9A0E87970600F596FE /* RMTileImageSet.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64E00E80E73F001663B6 /* RMTileImageSet.h */; };
+ B8D27C9B0E87970700F596FE /* RMTileImage.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64D90E80E73F001663B6 /* RMTileImage.m */; };
+ B8D27C9C0E87970700F596FE /* RMTileImage.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64D80E80E73F001663B6 /* RMTileImage.h */; };
+ B8D27C9D0E87970800F596FE /* RMTiledLayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64C50E80E73F001663B6 /* RMTiledLayerController.m */; };
+ B8D27C9E0E87970800F596FE /* RMTiledLayerController.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64C40E80E73F001663B6 /* RMTiledLayerController.h */; };
+ B8D27C9F0E87970900F596FE /* RMTileCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64D10E80E73F001663B6 /* RMTileCache.m */; };
+ B8D27CA00E87970A00F596FE /* RMTileCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64D00E80E73F001663B6 /* RMTileCache.h */; };
+ B8D27CA10E87970B00F596FE /* RMTile.c in Sources */ = {isa = PBXBuildFile; fileRef = B83E64D70E80E73F001663B6 /* RMTile.c */; };
+ B8D27CA20E87970B00F596FE /* RMTile.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64D60E80E73F001663B6 /* RMTile.h */; };
+ B8D27CA30E87970C00F596FE /* RMScreenProjection.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64C90E80E73F001663B6 /* RMScreenProjection.m */; };
+ B8D27CA40E87970C00F596FE /* RMScreenProjection.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64C80E80E73F001663B6 /* RMScreenProjection.h */; };
+ B8D27CA50E87970D00F596FE /* RMQuartzRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64BB0E80E73F001663B6 /* RMQuartzRenderer.m */; };
+ B8D27CA60E87970E00F596FE /* RMQuartzRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64BA0E80E73F001663B6 /* RMQuartzRenderer.h */; };
+ B8D27CA70E87970F00F596FE /* RMProjection.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64E40E80E73F001663B6 /* RMProjection.m */; };
+ B8D27CA80E87971000F596FE /* RMProjection.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64E30E80E73F001663B6 /* RMProjection.h */; };
+ B8D27CA90E87971000F596FE /* RMOpenStreetMapsSource.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64EE0E80E73F001663B6 /* RMOpenStreetMapsSource.m */; };
+ B8D27CAA0E87971000F596FE /* RMOpenStreetMapsSource.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64ED0E80E73F001663B6 /* RMOpenStreetMapsSource.h */; };
+ B8D27CAB0E87971100F596FE /* RMMercator.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64E80E80E73F001663B6 /* RMMercator.m */; };
+ B8D27CAC0E87971100F596FE /* RMMercator.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64E70E80E73F001663B6 /* RMMercator.h */; };
+ B8D27CAD0E87971200F596FE /* RMMemoryCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64D30E80E73F001663B6 /* RMMemoryCache.m */; };
+ B8D27CAE0E87971400F596FE /* RMMemoryCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64D20E80E73F001663B6 /* RMMemoryCache.h */; };
+ B8D27CAF0E87971400F596FE /* RMMathUtils.c in Sources */ = {isa = PBXBuildFile; fileRef = B83E64B70E80E73F001663B6 /* RMMathUtils.c */; };
+ B8D27CB00E87971500F596FE /* RMMathUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64B60E80E73F001663B6 /* RMMathUtils.h */; };
+ B8D27CB30E87971600F596FE /* RMMapRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64CB0E80E73F001663B6 /* RMMapRenderer.m */; };
+ B8D27CB40E87971700F596FE /* RMMapRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64CA0E80E73F001663B6 /* RMMapRenderer.h */; };
+ B8D27CB50E87971700F596FE /* RMLayerToScreenProjection.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64C10E80E73F001663B6 /* RMLayerToScreenProjection.h */; };
+ B8D27CB60E87971700F596FE /* RMLayerToScreenProjection.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64C20E80E73F001663B6 /* RMLayerToScreenProjection.m */; };
+ B8D27CB70E87971800F596FE /* RMLayeredTileLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64C00E80E73F001663B6 /* RMLayeredTileLoader.m */; };
+ B8D27CB80E87971900F596FE /* RMLayeredTileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64BF0E80E73F001663B6 /* RMLayeredTileLoader.h */; };
+ B8D27CB90E87971A00F596FE /* RMLatLong.h in Headers */ = {isa = PBXBuildFile; fileRef = B8D27AFB0E8780CD00F596FE /* RMLatLong.h */; };
+ B8D27CBA0E87971A00F596FE /* RMFractalTileProjection.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64EA0E80E73F001663B6 /* RMFractalTileProjection.m */; };
+ B8D27CBB0E87971B00F596FE /* RMFractalTileProjection.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64E90E80E73F001663B6 /* RMFractalTileProjection.h */; };
+ B8D27CBC0E87971B00F596FE /* RMFileTileImage.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64DF0E80E73F001663B6 /* RMFileTileImage.m */; };
+ B8D27CBD0E87971D00F596FE /* RMFileTileImage.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64DE0E80E73F001663B6 /* RMFileTileImage.h */; };
+ B8D27CBE0E87971E00F596FE /* RMDiskCache.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64D50E80E73F001663B6 /* RMDiskCache.m */; };
+ B8D27CBF0E87971E00F596FE /* RMDiskCache.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64D40E80E73F001663B6 /* RMDiskCache.h */; };
+ B8D27CC00E87971F00F596FE /* RMCoreAnimationRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64BE0E80E73F001663B6 /* RMCoreAnimationRenderer.m */; };
+ B8D27CC10E87971F00F596FE /* RMCoreAnimationRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = B83E64BD0E80E73F001663B6 /* RMCoreAnimationRenderer.h */; };
+ B8D27CC20E87972000F596FE /* Layer.m in Sources */ = {isa = PBXBuildFile; fileRef = B86F26AD0E87442C007A3773 /* Layer.m */; };
+ B8D27CC30E87972000F596FE /* Layer.h in Headers */ = {isa = PBXBuildFile; fileRef = B86F26AC0E87442C007A3773 /* Layer.h */; };
+ B8D27CC40E87972100F596FE /* AbstractMecatorWebSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C7A967510E8412930031BA75 /* AbstractMecatorWebSource.m */; };
+ B8D27CC50E87972100F596FE /* AbstractMecatorWebSource.h in Headers */ = {isa = PBXBuildFile; fileRef = C7A967500E8412930031BA75 /* AbstractMecatorWebSource.h */; };
+ B8D27CF90E8797A400F596FE /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8D27CF80E8797A400F596FE /* Cocoa.framework */; };
C7A967520E8412930031BA75 /* AbstractMecatorWebSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C7A967510E8412930031BA75 /* AbstractMecatorWebSource.m */; };
C7A9675E0E84134B0031BA75 /* RMVirtualEarthSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C7A9675D0E84134B0031BA75 /* RMVirtualEarthSource.m */; };
/* End PBXBuildFile section */
@@ -97,6 +155,13 @@
remoteGlobalIDString = B83E65530E80E7D8001663B6;
remoteInfo = MapView;
};
+ B8D27D0D0E87987C00F596FE /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = B83E654A0E80E7A8001663B6 /* Proj4.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = D2AAC07D0554694100DB518D /* Proj4 */;
+ remoteInfo = Proj4;
+ };
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
@@ -168,6 +233,11 @@
B83E65680E80E830001663B6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
B83E670F0E80F1B5001663B6 /* loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = loading.png; path = ApplicationSupport/loading.png; sourceTree = "<group>"; };
B83E673E0E80F332001663B6 /* MapView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MapView.app; sourceTree = BUILT_PRODUCTS_DIR; };
+ B86F26AC0E87442C007A3773 /* Layer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Layer.h; sourceTree = "<group>"; };
+ B86F26AD0E87442C007A3773 /* Layer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Layer.m; sourceTree = "<group>"; };
+ B86F26E10E877802007A3773 /* DesktopMapView-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "DesktopMapView-Info.plist"; sourceTree = "<group>"; };
+ B8D27AFB0E8780CD00F596FE /* RMLatLong.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMLatLong.h; sourceTree = "<group>"; };
+ B8D27CF80E8797A400F596FE /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
C7A967500E8412930031BA75 /* AbstractMecatorWebSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractMecatorWebSource.h; sourceTree = "<group>"; };
C7A967510E8412930031BA75 /* AbstractMecatorWebSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AbstractMecatorWebSource.m; sourceTree = "<group>"; };
C7A9675C0E84134B0031BA75 /* RMVirtualEarthSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMVirtualEarthSource.h; sourceTree = "<group>"; };
@@ -200,12 +270,21 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ B86F26DF0E877802007A3773 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ B8D27CF90E8797A400F596FE /* Cocoa.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
+ B86F26A80E8742ED007A3773 /* Layer */,
B83E64EB0E80E73F001663B6 /* Tile Source */,
B83E64E20E80E73F001663B6 /* Projections */,
B83E64CE0E80E73F001663B6 /* Tile Management */,
@@ -234,6 +313,7 @@
080E96DDFE201D6D7F000001 /* Classes */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
+ B86F26E10E877802007A3773 /* DesktopMapView-Info.plist */,
);
name = CustomTemplate;
sourceTree = "<group>";
@@ -258,6 +338,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
+ B8D27CF80E8797A400F596FE /* Cocoa.framework */,
B83E65590E80E7EB001663B6 /* CoreFoundation.framework */,
B83E65630E80E81C001663B6 /* CoreLocation.framework */,
B83E65680E80E830001663B6 /* QuartzCore.framework */,
@@ -382,6 +463,7 @@
B83E64E80E80E73F001663B6 /* RMMercator.m */,
B83E64E90E80E73F001663B6 /* RMFractalTileProjection.h */,
B83E64EA0E80E73F001663B6 /* RMFractalTileProjection.m */,
+ B8D27AFB0E8780CD00F596FE /* RMLatLong.h */,
);
name = Projections;
sourceTree = "<group>";
@@ -418,6 +500,15 @@
name = Resources;
sourceTree = "<group>";
};
+ B86F26A80E8742ED007A3773 /* Layer */ = {
+ isa = PBXGroup;
+ children = (
+ B86F26AC0E87442C007A3773 /* Layer.h */,
+ B86F26AD0E87442C007A3773 /* Layer.m */,
+ );
+ name = Layer;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@@ -449,6 +540,43 @@
B83E660F0E80EA26001663B6 /* RMTileSource.h in Headers */,
B83E66110E80EA27001663B6 /* RMFractalTileProjection.h in Headers */,
B83E66140E80EA29001663B6 /* RMMercator.h in Headers */,
+ B86F26AE0E87442C007A3773 /* Layer.h in Headers */,
+ B8D27AFC0E8780CD00F596FE /* RMLatLong.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ B86F26DC0E877802007A3773 /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ B8D27C8F0E8796FF00F596FE /* RMWebTileImage.h in Headers */,
+ B8D27C910E87970000F596FE /* RMVirtualEarthSource.h in Headers */,
+ B8D27C920E87970100F596FE /* RMTransform.h in Headers */,
+ B8D27C940E87970200F596FE /* RMTileSource.h in Headers */,
+ B8D27C960E87970400F596FE /* RMTileProxy.h in Headers */,
+ B8D27C980E87970600F596FE /* RMTileLoader.h in Headers */,
+ B8D27C9A0E87970600F596FE /* RMTileImageSet.h in Headers */,
+ B8D27C9C0E87970700F596FE /* RMTileImage.h in Headers */,
+ B8D27C9E0E87970800F596FE /* RMTiledLayerController.h in Headers */,
+ B8D27CA00E87970A00F596FE /* RMTileCache.h in Headers */,
+ B8D27CA20E87970B00F596FE /* RMTile.h in Headers */,
+ B8D27CA40E87970C00F596FE /* RMScreenProjection.h in Headers */,
+ B8D27CA60E87970E00F596FE /* RMQuartzRenderer.h in Headers */,
+ B8D27CA80E87971000F596FE /* RMProjection.h in Headers */,
+ B8D27CAA0E87971000F596FE /* RMOpenStreetMapsSource.h in Headers */,
+ B8D27CAC0E87971100F596FE /* RMMercator.h in Headers */,
+ B8D27CAE0E87971400F596FE /* RMMemoryCache.h in Headers */,
+ B8D27CB00E87971500F596FE /* RMMathUtils.h in Headers */,
+ B8D27CB40E87971700F596FE /* RMMapRenderer.h in Headers */,
+ B8D27CB50E87971700F596FE /* RMLayerToScreenProjection.h in Headers */,
+ B8D27CB80E87971900F596FE /* RMLayeredTileLoader.h in Headers */,
+ B8D27CB90E87971A00F596FE /* RMLatLong.h in Headers */,
+ B8D27CBB0E87971B00F596FE /* RMFractalTileProjection.h in Headers */,
+ B8D27CBD0E87971D00F596FE /* RMFileTileImage.h in Headers */,
+ B8D27CBF0E87971E00F596FE /* RMDiskCache.h in Headers */,
+ B8D27CC10E87971F00F596FE /* RMCoreAnimationRenderer.h in Headers */,
+ B8D27CC30E87972000F596FE /* Layer.h in Headers */,
+ B8D27CC50E87972100F596FE /* AbstractMecatorWebSource.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -491,6 +619,24 @@
productReference = B83E65540E80E7D8001663B6 /* libMapView.a */;
productType = "com.apple.product-type.library.static";
};
+ B86F26E00E877802007A3773 /* DesktopMapView */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = B86F26E50E877803007A3773 /* Build configuration list for PBXNativeTarget "DesktopMapView" */;
+ buildPhases = (
+ B86F26DC0E877802007A3773 /* Headers */,
+ B86F26DD0E877802007A3773 /* Resources */,
+ B86F26DE0E877802007A3773 /* Sources */,
+ B86F26DF0E877802007A3773 /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ B8D27D0E0E87987C00F596FE /* PBXTargetDependency */,
+ );
+ name = DesktopMapView;
+ productName = DesktopMapView;
+ productType = "com.apple.product-type.framework";
+ };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -511,6 +657,7 @@
targets = (
1D6058900D05DD3D006BFB54 /* SimpleMap */,
B83E65530E80E7D8001663B6 /* MapView */,
+ B86F26E00E877802007A3773 /* DesktopMapView */,
);
};
/* End PBXProject section */
@@ -536,6 +683,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ B86F26DD0E877802007A3773 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -578,6 +732,40 @@
B83E66130E80EA28001663B6 /* RMMercator.m in Sources */,
B83E66150E80EA29001663B6 /* RMProjection.m in Sources */,
B83E66160E80EA2A001663B6 /* RMWebTileImage.m in Sources */,
+ B86F26AF0E87442C007A3773 /* Layer.m in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ B86F26DE0E877802007A3773 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ B8D27C8E0E8796FF00F596FE /* RMWebTileImage.m in Sources */,
+ B8D27C900E8796FF00F596FE /* RMVirtualEarthSource.m in Sources */,
+ B8D27C930E87970200F596FE /* RMTransform.m in Sources */,
+ B8D27C950E87970400F596FE /* RMTileProxy.m in Sources */,
+ B8D27C970E87970500F596FE /* RMTileLoader.m in Sources */,
+ B8D27C990E87970600F596FE /* RMTileImageSet.m in Sources */,
+ B8D27C9B0E87970700F596FE /* RMTileImage.m in Sources */,
+ B8D27C9D0E87970800F596FE /* RMTiledLayerController.m in Sources */,
+ B8D27C9F0E87970900F596FE /* RMTileCache.m in Sources */,
+ B8D27CA10E87970B00F596FE /* RMTile.c in Sources */,
+ B8D27CA30E87970C00F596FE /* RMScreenProjection.m in Sources */,
+ B8D27CA50E87970D00F596FE /* RMQuartzRenderer.m in Sources */,
+ B8D27CA70E87970F00F596FE /* RMProjection.m in Sources */,
+ B8D27CA90E87971000F596FE /* RMOpenStreetMapsSource.m in Sources */,
+ B8D27CAB0E87971100F596FE /* RMMercator.m in Sources */,
+ B8D27CAD0E87971200F596FE /* RMMemoryCache.m in Sources */,
+ B8D27CAF0E87971400F596FE /* RMMathUtils.c in Sources */,
+ B8D27CB30E87971600F596FE /* RMMapRenderer.m in Sources */,
+ B8D27CB60E87971700F596FE /* RMLayerToScreenProjection.m in Sources */,
+ B8D27CB70E87971800F596FE /* RMLayeredTileLoader.m in Sources */,
+ B8D27CBA0E87971A00F596FE /* RMFractalTileProjection.m in Sources */,
+ B8D27CBC0E87971B00F596FE /* RMFileTileImage.m in Sources */,
+ B8D27CBE0E87971E00F596FE /* RMDiskCache.m in Sources */,
+ B8D27CC00E87971F00F596FE /* RMCoreAnimationRenderer.m in Sources */,
+ B8D27CC20E87972000F596FE /* Layer.m in Sources */,
+ B8D27CC40E87972100F596FE /* AbstractMecatorWebSource.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -594,6 +782,11 @@
target = B83E65530E80E7D8001663B6 /* MapView */;
targetProxy = B83E65A50E80E84E001663B6 /* PBXContainerItemProxy */;
};
+ B8D27D0E0E87987C00F596FE /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = Proj4;
+ targetProxy = B8D27D0D0E87987C00F596FE /* PBXContainerItemProxy */;
+ };
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
@@ -650,6 +843,46 @@
};
name = Release;
};
+ B86F26E20E877803007A3773 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ "CODE_SIGN_IDENTITY[sdk=macosx10.5]" = "iPhone Developer";
+ COPY_PHASE_STRIP = NO;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ FRAMEWORK_VERSION = A;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ INFOPLIST_FILE = "DesktopMapView-Info.plist";
+ INSTALL_PATH = "$(HOME)/Library/Frameworks";
+ PREBINDING = NO;
+ PRODUCT_NAME = DesktopMapView;
+ SDKROOT = macosx10.5;
+ };
+ name = Debug;
+ };
+ B86F26E30E877803007A3773 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ "CODE_SIGN_IDENTITY[sdk=macosx10.5]" = "iPhone Developer";
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ FRAMEWORK_VERSION = A;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ INFOPLIST_FILE = "DesktopMapView-Info.plist";
+ INSTALL_PATH = "$(HOME)/Library/Frameworks";
+ PREBINDING = NO;
+ PRODUCT_NAME = DesktopMapView;
+ SDKROOT = macosx10.5;
+ ZERO_LINK = NO;
+ };
+ name = Release;
+ };
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -698,6 +931,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ B86F26E50E877803007A3773 /* Build configuration list for PBXNativeTarget "DesktopMapView" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ B86F26E20E877803007A3773 /* Debug */,
+ B86F26E30E877803007A3773 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapView" */ = {
isa = XCConfigurationList;
buildConfigurations = (
View
411 MapView/MapView.xcodeproj/sineltor.mode1v3
@@ -258,7 +258,7 @@
<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
<array>
<real>22</real>
- <real>241</real>
+ <real>263</real>
</array>
<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
<array>
@@ -272,12 +272,17 @@
<array>
<string>29B97314FDCFA39411CA2CEA</string>
<string>080E96DDFE201D6D7F000001</string>
+ <string>B86F26A80E8742ED007A3773</string>
<string>B83E64EB0E80E73F001663B6</string>
<string>B83E64E20E80E73F001663B6</string>
<string>B83E64CE0E80E73F001663B6</string>
<string>B83E64CF0E80E73F001663B6</string>
<string>B83E64B80E80E73F001663B6</string>
+ <string>B83E64C30E80E73F001663B6</string>
+ <string>B83E64BC0E80E73F001663B6</string>
+ <string>B83E64B90E80E73F001663B6</string>
<string>B83E64B50E80E73F001663B6</string>
+ <string>29B97323FDCFA39411CA2CEA</string>
<string>1C37FBAC04509CD000000102</string>
<string>1C37FAAC04509CD000000102</string>
<string>1C37FABC05509CD000000102</string>
@@ -285,15 +290,13 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>32</integer>
- <integer>30</integer>
- <integer>17</integer>
+ <integer>45</integer>
<integer>3</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 24}, {263, 786}}</string>
+ <string>{{0, 624}, {285, 914}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -305,21 +308,21 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {280, 804}}</string>
+ <string>{{0, 0}, {302, 932}}</string>
<key>GroupTreeTableConfiguration</key>
<array>
<string>SCMStatusColumn</string>
<real>22</real>
<string>MainColumn</string>
- <real>241</real>
+ <real>263</real>
</array>
<key>RubberWindowFrame</key>
- <string>1939 355 1404 845 1920 300 1440 900 </string>
+ <string>4 203 1916 973 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
<key>Proportion</key>
- <string>280pt</string>
+ <string>302pt</string>
</dict>
<dict>
<key>Dock</key>
@@ -332,7 +335,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>RMTileCache.m</string>
+ <string>RMMapView.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -340,59 +343,79 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>RMTileCache.m</string>
+ <string>RMMapView.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>B8A732140E82E1D300DB975F</string>
+ <string>B8D27D260E87A8C300F596FE</string>
<key>history</key>
<array>
- <string>B83E66540E80EACF001663B6</string>
- <string>B83E665B0E80EACF001663B6</string>
<string>B83E67330E80F2CB001663B6</string>
- <string>B83E68540E81ED09001663B6</string>
- <string>B83E68560E81ED09001663B6</string>
- <string>B83E68580E81ED09001663B6</string>
- <string>B83E68590E81ED09001663B6</string>
- <string>B83E685A0E81ED09001663B6</string>
<string>B83E685B0E81ED09001663B6</string>
- <string>B83E685C0E81ED09001663B6</string>
<string>B83E68600E81ED09001663B6</string>
- <string>B83E68610E81ED09001663B6</string>
- <string>B83E68630E81ED09001663B6</string>
- <string>B83E68640E81ED09001663B6</string>
- <string>B83E68650E81ED09001663B6</string>
- <string>B83E68670E81ED09001663B6</string>
- <string>B83E68680E81ED09001663B6</string>
- <string>B83E686C0E81ED09001663B6</string>
- <string>B83E686D0E81ED09001663B6</string>
- <string>B83E686E0E81ED09001663B6</string>
- <string>B83E68700E81ED09001663B6</string>
- <string>B83E68710E81ED09001663B6</string>
<string>B83E68720E81ED09001663B6</string>
- <string>B83E68730E81ED09001663B6</string>
<string>B8A7306A0E81F5F800DB975F</string>
<string>B8A730950E82004600DB975F</string>
- <string>B8A730B70E821C2700DB975F</string>
- <string>B8A730B90E821C2700DB975F</string>
- <string>B8A730C40E821D1D00DB975F</string>
- <string>B8A730DB0E82280900DB975F</string>
- <string>B8A730DC0E82280900DB975F</string>
<string>B8A730DD0E82280900DB975F</string>
- <string>B8A730DE0E82280900DB975F</string>
- <string>B8A731E50E82DD2800DB975F</string>
- <string>B8A731E70E82DD2800DB975F</string>
- <string>B8A731E80E82DD2800DB975F</string>
- <string>B8A731E90E82DD2800DB975F</string>
- <string>B8A731EA0E82DD2800DB975F</string>
- <string>B8A731EB0E82DD2800DB975F</string>
- <string>B8A731EC0E82DD2800DB975F</string>
- <string>B8A732070E82E1D300DB975F</string>
- <string>B8A732080E82E1D300DB975F</string>
- <string>B8A732090E82E1D300DB975F</string>
- <string>B8A7320A0E82E1D300DB975F</string>
- <string>B8A7320B0E82E1D300DB975F</string>
- <string>B8A7320C0E82E1D300DB975F</string>
+ <string>B8D27B3E0E87895C00F596FE</string>
+ <string>B8D27B400E87895C00F596FE</string>
+ <string>B8D27B420E87895C00F596FE</string>
+ <string>B8D27B440E87895C00F596FE</string>
+ <string>B8D27B460E87895C00F596FE</string>
+ <string>B8D27B480E87895C00F596FE</string>
+ <string>B8D27B4A0E87895C00F596FE</string>
+ <string>B8D27B4D0E87895C00F596FE</string>
+ <string>B8D27B4E0E87895C00F596FE</string>
+ <string>B8D27B4F0E87895C00F596FE</string>
+ <string>B8D27B500E87895C00F596FE</string>
+ <string>B8D27B510E87895C00F596FE</string>
+ <string>B8D27B520E87895C00F596FE</string>
+ <string>B8D27B530E87895C00F596FE</string>
+ <string>B8D27B540E87895C00F596FE</string>
+ <string>B8D27B550E87895C00F596FE</string>
+ <string>B8D27B560E87895C00F596FE</string>
+ <string>B8D27B570E87895C00F596FE</string>
+ <string>B8D27B580E87895C00F596FE</string>
+ <string>B8D27B590E87895C00F596FE</string>
+ <string>B8D27B5A0E87895C00F596FE</string>
+ <string>B8D27B5B0E87895C00F596FE</string>
+ <string>B8D27B5C0E87895C00F596FE</string>
+ <string>B8D27B5D0E87895C00F596FE</string>
+ <string>B8D27B5E0E87895C00F596FE</string>
+ <string>B8D27B5F0E87895C00F596FE</string>
+ <string>B8D27B600E87895C00F596FE</string>
+ <string>B8D27B610E87895C00F596FE</string>
+ <string>B8D27B620E87895C00F596FE</string>
+ <string>B8D27B640E87895C00F596FE</string>
+ <string>B8D27B650E87895C00F596FE</string>
+ <string>B8D27B660E87895C00F596FE</string>
+ <string>B8D27B680E87895C00F596FE</string>
+ <string>B8D27B690E87895C00F596FE</string>
+ <string>B8D27B6A0E87895C00F596FE</string>
+ <string>B8D27B6B0E87895C00F596FE</string>
+ <string>B8D27B6E0E87895C00F596FE</string>
+ <string>B8D27B700E87895C00F596FE</string>
+ <string>B8D27B710E87895C00F596FE</string>
+ <string>B8D27B720E87895C00F596FE</string>
+ <string>B8D27C0E0E878A1000F596FE</string>
+ <string>B8D27C110E878A1000F596FE</string>
+ <string>B8D27C120E878A1000F596FE</string>
+ <string>B8D27C130E878A1000F596FE</string>
+ <string>B8D27C150E878A1000F596FE</string>
+ <string>B8D27CC60E87972400F596FE</string>
+ <string>B8D27CC80E87972400F596FE</string>
+ <string>B8D27CCB0E87972400F596FE</string>
+ <string>B8D27CCC0E87972400F596FE</string>
+ <string>B8D27CCD0E87972400F596FE</string>
+ <string>B8D27CCE0E87972400F596FE</string>
+ <string>B8D27CD00E87972400F596FE</string>
+ <string>B8D27D190E87A8C300F596FE</string>
+ <string>B8D27D1A0E87A8C300F596FE</string>
+ <string>B8D27D1B0E87A8C300F596FE</string>
+ <string>B8D27D1C0E87A8C300F596FE</string>
+ <string>B8D27D1D0E87A8C300F596FE</string>
+ <string>B8D27D1E0E87A8C300F596FE</string>
+ <string>B8D27CC70E87972400F596FE</string>
</array>
<key>prevStack</key>
<array>
@@ -404,7 +427,6 @@
<string>B83E66720E80EACF001663B6</string>
<string>B83E66730E80EACF001663B6</string>
<string>B83E66740E80EACF001663B6</string>
- <string>B83E66750E80EACF001663B6</string>
<string>B83E66760E80EACF001663B6</string>
<string>B83E66770E80EACF001663B6</string>
<string>B83E66780E80EACF001663B6</string>
@@ -418,7 +440,6 @@
<string>B83E68780E81ED09001663B6</string>
<string>B83E68790E81ED09001663B6</string>
<string>B83E687A0E81ED09001663B6</string>
- <string>B83E687E0E81ED09001663B6</string>
<string>B83E68810E81ED09001663B6</string>
<string>B83E68820E81ED09001663B6</string>
<string>B83E68830E81ED09001663B6</string>
@@ -431,7 +452,6 @@
<string>B83E68950E81ED09001663B6</string>
<string>B83E68970E81ED09001663B6</string>
<string>B83E689B0E81ED09001663B6</string>
- <string>B83E689C0E81ED09001663B6</string>
<string>B83E689E0E81ED09001663B6</string>
<string>B83E689F0E81ED09001663B6</string>
<string>B83E68A00E81ED09001663B6</string>
@@ -440,27 +460,202 @@
<string>B8A730C50E821D1D00DB975F</string>
<string>B8A730E00E82280900DB975F</string>
<string>B8A730E40E82280900DB975F</string>
- <string>B8A731EE0E82DD2800DB975F</string>
- <string>B8A731EF0E82DD2800DB975F</string>
- <string>B8A731F00E82DD2800DB975F</string>
- <string>B8A731F10E82DD2800DB975F</string>
- <string>B8A731F20E82DD2800DB975F</string>
- <string>B8A731F30E82DD2800DB975F</string>
- <string>B8A731F40E82DD2800DB975F</string>
- <string>B8A731F50E82DD2800DB975F</string>
- <string>B8A731F60E82DD2800DB975F</string>
- <string>B8A731F70E82DD2800DB975F</string>
- <string>B8A731F80E82DD2800DB975F</string>
- <string>B8A731F90E82DD2800DB975F</string>
- <string>B8A731FA0E82DD2800DB975F</string>
- <string>B8A731FB0E82DD2800DB975F</string>
- <string>B8A7320D0E82E1D300DB975F</string>
- <string>B8A7320E0E82E1D300DB975F</string>
- <string>B8A7320F0E82E1D300DB975F</string>
- <string>B8A732100E82E1D300DB975F</string>
- <string>B8A732110E82E1D300DB975F</string>
- <string>B8A732120E82E1D300DB975F</string>
- <string>B8A732130E82E1D300DB975F</string>
+ <string>B86F27100E877996007A3773</string>
+ <string>B8D27B730E87895C00F596FE</string>
+ <string>B8D27B740E87895C00F596FE</string>
+ <string>B8D27B750E87895C00F596FE</string>
+ <string>B8D27B760E87895C00F596FE</string>
+ <string>B8D27B770E87895C00F596FE</string>
+ <string>B8D27B790E87895C00F596FE</string>
+ <string>B8D27B7A0E87895C00F596FE</string>
+ <string>B8D27B7B0E87895C00F596FE</string>
+ <string>B8D27B7C0E87895C00F596FE</string>
+ <string>B8D27B7D0E87895C00F596FE</string>
+ <string>B8D27B7E0E87895C00F596FE</string>
+ <string>B8D27B7F0E87895C00F596FE</string>
+ <string>B8D27B810E87895C00F596FE</string>
+ <string>B8D27B820E87895C00F596FE</string>
+ <string>B8D27B830E87895C00F596FE</string>
+ <string>B8D27B840E87895C00F596FE</string>
+ <string>B8D27B850E87895C00F596FE</string>
+ <string>B8D27B860E87895C00F596FE</string>
+ <string>B8D27B870E87895C00F596FE</string>
+ <string>B8D27B880E87895C00F596FE</string>
+ <string>B8D27B890E87895C00F596FE</string>
+ <string>B8D27B8A0E87895C00F596FE</string>
+ <string>B8D27B8B0E87895C00F596FE</string>
+ <string>B8D27B8C0E87895C00F596FE</string>
+ <string>B8D27B8D0E87895C00F596FE</string>
+ <string>B8D27B8E0E87895C00F596FE</string>
+ <string>B8D27B8F0E87895C00F596FE</string>
+ <string>B8D27B900E87895C00F596FE</string>
+ <string>B8D27B910E87895C00F596FE</string>
+ <string>B8D27B920E87895C00F596FE</string>
+ <string>B8D27B930E87895C00F596FE</string>
+ <string>B8D27B940E87895C00F596FE</string>
+ <string>B8D27B950E87895C00F596FE</string>
+ <string>B8D27B960E87895C00F596FE</string>
+ <string>B8D27B970E87895C00F596FE</string>
+ <string>B8D27B990E87895C00F596FE</string>
+ <string>B8D27B9A0E87895C00F596FE</string>
+ <string>B8D27B9B0E87895C00F596FE</string>
+ <string>B8D27B9C0E87895C00F596FE</string>
+ <string>B8D27B9D0E87895C00F596FE</string>
+ <string>B8D27B9E0E87895C00F596FE</string>
+ <string>B8D27B9F0E87895C00F596FE</string>
+ <string>B8D27BA00E87895C00F596FE</string>
+ <string>B8D27BA10E87895C00F596FE</string>
+ <string>B8D27BA20E87895C00F596FE</string>
+ <string>B8D27BA30E87895C00F596FE</string>
+ <string>B8D27BA40E87895C00F596FE</string>
+ <string>B8D27BA50E87895C00F596FE</string>
+ <string>B8D27BA60E87895C00F596FE</string>
+ <string>B8D27BA70E87895C00F596FE</string>
+ <string>B8D27BA80E87895C00F596FE</string>
+ <string>B8D27BA90E87895C00F596FE</string>
+ <string>B8D27BAA0E87895C00F596FE</string>
+ <string>B8D27BAB0E87895C00F596FE</string>
+ <string>B8D27BAC0E87895C00F596FE</string>
+ <string>B8D27BAD0E87895C00F596FE</string>
+ <string>B8D27BAE0E87895C00F596FE</string>
+ <string>B8D27BAF0E87895C00F596FE</string>
+ <string>B8D27BB00E87895C00F596FE</string>
+ <string>B8D27BB10E87895C00F596FE</string>
+ <string>B8D27BB20E87895C00F596FE</string>
+ <string>B8D27BB30E87895C00F596FE</string>
+ <string>B8D27BB40E87895C00F596FE</string>
+ <string>B8D27BB50E87895C00F596FE</string>
+ <string>B8D27BB60E87895C00F596FE</string>
+ <string>B8D27BB70E87895C00F596FE</string>
+ <string>B8D27BB80E87895C00F596FE</string>
+ <string>B8D27BB90E87895C00F596FE</string>
+ <string>B8D27BBA0E87895C00F596FE</string>
+ <string>B8D27BBB0E87895C00F596FE</string>
+ <string>B8D27BBC0E87895C00F596FE</string>
+ <string>B8D27BBD0E87895C00F596FE</string>
+ <string>B8D27BBE0E87895C00F596FE</string>
+ <string>B8D27BBF0E87895C00F596FE</string>
+ <string>B8D27BC00E87895C00F596FE</string>
+ <string>B8D27BC10E87895C00F596FE</string>
+ <string>B8D27BC20E87895C00F596FE</string>
+ <string>B8D27BC30E87895C00F596FE</string>
+ <string>B8D27BC40E87895C00F596FE</string>
+ <string>B8D27BC50E87895C00F596FE</string>
+ <string>B8D27BC60E87895C00F596FE</string>
+ <string>B8D27BC70E87895C00F596FE</string>
+ <string>B8D27BC80E87895C00F596FE</string>
+ <string>B8D27BC90E87895C00F596FE</string>
+ <string>B8D27BCA0E87895C00F596FE</string>
+ <string>B8D27BCB0E87895C00F596FE</string>
+ <string>B8D27BCC0E87895C00F596FE</string>
+ <string>B8D27BCD0E87895C00F596FE</string>
+ <string>B8D27BCE0E87895C00F596FE</string>
+ <string>B8D27BCF0E87895C00F596FE</string>
+ <string>B8D27BD00E87895C00F596FE</string>
+ <string>B8D27BD10E87895C00F596FE</string>
+ <string>B8D27BD20E87895C00F596FE</string>
+ <string>B8D27BD30E87895C00F596FE</string>
+ <string>B8D27BD40E87895C00F596FE</string>
+ <string>B8D27BD50E87895C00F596FE</string>
+ <string>B8D27BD60E87895C00F596FE</string>
+ <string>B8D27BD70E87895C00F596FE</string>
+ <string>B8D27BD80E87895C00F596FE</string>
+ <string>B8D27BD90E87895C00F596FE</string>
+ <string>B8D27BDA0E87895C00F596FE</string>
+ <string>B8D27BDB0E87895C00F596FE</string>
+ <string>B8D27BDC0E87895C00F596FE</string>
+ <string>B8D27BDD0E87895C00F596FE</string>
+ <string>B8D27BDE0E87895C00F596FE</string>
+ <string>B8D27BDF0E87895C00F596FE</string>
+ <string>B8D27BE00E87895C00F596FE</string>
+ <string>B8D27BE10E87895C00F596FE</string>
+ <string>B8D27BE20E87895C00F596FE</string>
+ <string>B8D27BE30E87895C00F596FE</string>
+ <string>B8D27BE40E87895C00F596FE</string>
+ <string>B8D27BE50E87895C00F596FE</string>
+ <string>B8D27BE60E87895C00F596FE</string>
+ <string>B8D27BE70E87895C00F596FE</string>
+ <string>B8D27BE80E87895C00F596FE</string>
+ <string>B8D27BE90E87895C00F596FE</string>
+ <string>B8D27BEA0E87895C00F596FE</string>
+ <string>B8D27BEB0E87895C00F596FE</string>
+ <string>B8D27BEC0E87895C00F596FE</string>
+ <string>B8D27BED0E87895C00F596FE</string>
+ <string>B8D27BEE0E87895C00F596FE</string>
+ <string>B8D27BEF0E87895C00F596FE</string>
+ <string>B8D27BF00E87895C00F596FE</string>
+ <string>B8D27BF10E87895C00F596FE</string>
+ <string>B8D27BF20E87895C00F596FE</string>
+ <string>B8D27BF30E87895C00F596FE</string>
+ <string>B8D27BF40E87895C00F596FE</string>
+ <string>B8D27BF50E87895C00F596FE</string>
+ <string>B8D27BF60E87895C00F596FE</string>
+ <string>B8D27BF70E87895C00F596FE</string>
+ <string>B8D27BF80E87895C00F596FE</string>
+ <string>B8D27BF90E87895C00F596FE</string>
+ <string>B8D27BFA0E87895C00F596FE</string>
+ <string>B8D27BFB0E87895C00F596FE</string>
+ <string>B8D27BFC0E87895C00F596FE</string>
+ <string>B8D27BFD0E87895C00F596FE</string>
+ <string>B8D27BFE0E87895C00F596FE</string>
+ <string>B8D27BFF0E87895C00F596FE</string>
+ <string>B8D27C000E87895C00F596FE</string>
+ <string>B8D27C010E87895C00F596FE</string>
+ <string>B8D27C020E87895C00F596FE</string>
+ <string>B8D27C030E87895C00F596FE</string>
+ <string>B8D27C040E87895C00F596FE</string>
+ <string>B8D27C050E87895C00F596FE</string>
+ <string>B8D27C160E878A1000F596FE</string>
+ <string>B8D27C170E878A1000F596FE</string>
+ <string>B8D27C180E878A1000F596FE</string>
+ <string>B8D27C190E878A1000F596FE</string>
+ <string>B8D27C1A0E878A1000F596FE</string>
+ <string>B8D27C1B0E878A1000F596FE</string>
+ <string>B8D27C1C0E878A1000F596FE</string>
+ <string>B8D27C1D0E878A1000F596FE</string>
+ <string>B8D27CD10E87972400F596FE</string>
+ <string>B8D27CD20E87972400F596FE</string>
+ <string>B8D27CD30E87972400F596FE</string>
+ <string>B8D27CD40E87972400F596FE</string>
+ <string>B8D27CD50E87972400F596FE</string>
+ <string>B8D27CD60E87972400F596FE</string>
+ <string>B8D27CD70E87972400F596FE</string>
+ <string>B8D27CD80E87972400F596FE</string>
+ <string>B8D27CD90E87972400F596FE</string>
+ <string>B8D27CDA0E87972400F596FE</string>
+ <string>B8D27CDB0E87972400F596FE</string>
+ <string>B8D27CDC0E87972400F596FE</string>
+ <string>B8D27CDD0E87972400F596FE</string>
+ <string>B8D27CDE0E87972400F596FE</string>
+ <string>B8D27CDF0E87972400F596FE</string>
+ <string>B8D27CE00E87972400F596FE</string>
+ <string>B8D27CE10E87972400F596FE</string>
+ <string>B8D27CE20E87972400F596FE</string>
+ <string>B8D27CE30E87972400F596FE</string>
+ <string>B8D27CE40E87972400F596FE</string>
+ <string>B8D27CE50E87972400F596FE</string>
+ <string>B8D27CE60E87972400F596FE</string>
+ <string>B8D27CE70E87972400F596FE</string>
+ <string>B8D27CE80E87972400F596FE</string>
+ <string>B8D27CE90E87972400F596FE</string>
+ <string>B8D27CEA0E87972400F596FE</string>
+ <string>B8D27CEB0E87972400F596FE</string>
+ <string>B8D27CEC0E87972400F596FE</string>
+ <string>B8D27CED0E87972400F596FE</string>
+ <string>B8D27CEE0E87972400F596FE</string>
+ <string>B8D27CEF0E87972400F596FE</string>
+ <string>B8D27CF00E87972400F596FE</string>
+ <string>B8D27CF10E87972400F596FE</string>
+ <string>B8D27CF20E87972400F596FE</string>
+ <string>B8D27CF30E87972400F596FE</string>
+ <string>B8D27CF50E87972400F596FE</string>
+ <string>B8D27D1F0E87A8C300F596FE</string>
+ <string>B8D27D200E87A8C300F596FE</string>
+ <string>B8D27D210E87A8C300F596FE</string>
+ <string>B8D27D220E87A8C300F596FE</string>
+ <string>B8D27D230E87A8C300F596FE</string>
+ <string>B8D27D240E87A8C300F596FE</string>
+ <string>B8D27D250E87A8C300F596FE</string>
</array>
</dict>
<key>SplitCount</key>
@@ -472,14 +667,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {1119, 724}}</string>
+ <string>{{0, 0}, {1609, 609}}</string>
<key>RubberWindowFrame</key>
- <string>1939 355 1404 845 1920 300 1440 900 </string>
+ <string>4 203 1916 973 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>724pt</string>
+ <string>609pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -492,18 +687,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 729}, {1119, 75}}</string>
+ <string>{{0, 614}, {1609, 318}}</string>
<key>RubberWindowFrame</key>
- <string>1939 355 1404 845 1920 300 1440 900 </string>
+ <string>4 203 1916 973 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
- <string>75pt</string>
+ <string>318pt</string>
</dict>
</array>
<key>Proportion</key>
- <string>1119pt</string>
+ <string>1609pt</string>
</dict>
</array>
<key>Name</key>
@@ -518,9 +713,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>B8A731FD0E82DD2800DB975F</string>
+ <string>B8D27C070E87895C00F596FE</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>B8A731FE0E82DD2800DB975F</string>
+ <string>B8D27C080E87895C00F596FE</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -654,13 +849,13 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>1C78EAAD065D492600B07095</string>
- <string>B83E64750E80E6C8001663B6</string>
<string>1CD10A99069EF8BA00B06720</string>
+ <string>B83E64750E80E6C8001663B6</string>
<string>/Users/sineltor/src/catchme/Project/MapView/MapView.xcodeproj</string>
+ <string>1C78EAAD065D492600B07095</string>
</array>
<key>WindowString</key>
- <string>1939 355 1404 845 1920 300 1440 900 </string>
+ <string>4 203 1916 973 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
@@ -676,26 +871,28 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CD0528F0623707200166675</string>
<key>PBXProjectModuleLabel</key>
- <string></string>
+ <string>RMCoreAnimationRenderer.m</string>
<key>StatusBarVisibility</key>
<true/>
</dict>
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {740, 385}}</string>
+ <string>{{0, 0}, {997, 478}}</string>
<key>RubberWindowFrame</key>
- <string>846 76 740 689 0 0 1920 1178 </string>
+ <string>468 133 997 844 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>385pt</string>
+ <string>478pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@@ -712,18 +909,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 390}, {740, 258}}</string>
+ <string>{{0, 483}, {997, 320}}</string>
<key>RubberWindowFrame</key>
- <string>846 76 740 689 0 0 1920 1178 </string>
+ <string>468 133 997 844 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
<key>Proportion</key>
- <string>258pt</string>
+ <string>320pt</string>
</dict>
</array>
<key>Proportion</key>
- <string>648pt</string>
+ <string>803pt</string>
</dict>
</array>
<key>Name</key>
@@ -737,18 +934,18 @@
<key>TableOfContents</key>
<array>
<string>B83E64750E80E6C8001663B6</string>
- <string>B8A731FF0E82DD2800DB975F</string>
+ <string>B8D27B0E0E8782B800F596FE</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.buildV3</string>
<key>WindowString</key>
- <string>846 76 740 689 0 0 1920 1178 </string>
+ <string>468 133 997 844 0 0 1920 1178 </string>
<key>WindowToolGUID</key>
<string>B83E64750E80E6C8001663B6</string>
<key>WindowToolIsVisible</key>
- <false/>
+ <true/>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>
@@ -857,13 +1054,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>B8A731170E82283F00DB975F</string>
+ <string>B8D27B360E87887200F596FE</string>
<string>1C162984064C10D400B95A72</string>
- <string>B8A731180E82283F00DB975F</string>
- <string>B8A731190E82283F00DB975F</string>
- <string>B8A7311A0E82283F00DB975F</string>
- <string>B8A7311B0E82283F00DB975F</string>
- <string>B8A7311C0E82283F00DB975F</string>
+ <string>B8D27B370E87887200F596FE</string>
+ <string>B8D27B380E87887200F596FE</string>
+ <string>B8D27B390E87887200F596FE</string>
+ <string>B8D27B3A0E87887200F596FE</string>
+ <string>B8D27B3B0E87887200F596FE</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -1019,7 +1216,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>B8A732000E82DD2800DB975F</string>
+ <string>B8D27B3C0E87887200F596FE</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
@@ -1029,7 +1226,7 @@
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
- <false/>
+ <true/>
</dict>
<dict>
<key>Identifier</key>
@@ -1518,7 +1715,7 @@
<key>TableOfContents</key>
<array>
<string>B83E67DB0E80F959001663B6</string>
- <string>B83E67DC0E80F959001663B6</string>
+ <string>B8A733490E83736B00DB975F</string>
<string>B83E67DA0E80F959001663B6</string>
</array>
<key>WindowString</key>
View
4,834 MapView/MapView.xcodeproj/sineltor.pbxuser
4,025 additions, 809 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.