尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Thomas Rasch
Commit d5cdf5c9d636f20ac458e8d163c00e0a5f25b34a 1 parent ea5e6f60

MarkerMurder sampe app: 

o Added a circle annotation
o Added a scale
Inline Side-by-side
Showing 5 changed files with 197 additions and 61 deletions
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 14
15 @property (nonatomic, retain) IBOutlet RMMapView *mapView; 15 @property (nonatomic, retain) IBOutlet RMMapView *mapView;
16 @property (nonatomic, retain) IBOutlet UITextView *infoTextView; 16 @property (nonatomic, retain) IBOutlet UITextView *infoTextView;
  17 +@property (nonatomic, retain) IBOutlet UILabel *mppLabel;
17 18
18 - (void)updateInfo; 19 - (void)updateInfo;
19 20
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 #import "RMOpenStreetMapSource.h" 11 #import "RMOpenStreetMapSource.h"
12 #import "RMMapView.h" 12 #import "RMMapView.h"
13 #import "RMMarker.h" 13 #import "RMMarker.h"
  14 +#import "RMCircle.h"
14 #import "RMProjection.h" 15 #import "RMProjection.h"
15 #import "RMAnnotation.h" 16 #import "RMAnnotation.h"
16 #import "RMQuadTree.h" 17 #import "RMQuadTree.h"
@@ -22,6 +23,7 @@ @@ -22,6 +23,7 @@
22 23
23 @synthesize mapView; 24 @synthesize mapView;
24 @synthesize infoTextView; 25 @synthesize infoTextView;
  26 +@synthesize mppLabel;
25 27
26 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil 28 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
27 { 29 {
@@ -37,6 +39,8 @@ @@ -37,6 +39,8 @@
37 #define kNumberColumns 9 39 #define kNumberColumns 9
38 #define kSpacing 0.1 40 #define kSpacing 0.1
39 41
  42 +#define kCircleAnnotationType @"circleAnnotation"
  43 +
40 CLLocationCoordinate2D markerPosition; 44 CLLocationCoordinate2D markerPosition;
41 45
42 UIImage *redMarkerImage = [UIImage imageNamed:@"marker-red.png"]; 46 UIImage *redMarkerImage = [UIImage imageNamed:@"marker-red.png"];
@@ -71,6 +75,10 @@ @@ -71,6 +75,10 @@
71 75
72 markerPosition.latitude += kSpacing; 76 markerPosition.latitude += kSpacing;
73 } 77 }
  78 +
  79 + RMAnnotation *circleAnnotation = [RMAnnotation annotationWithMapView:mapView coordinate:CLLocationCoordinate2DMake(47.4, 10.0) andTitle:@"A Circle"];
  80 + circleAnnotation.annotationType = kCircleAnnotationType;
  81 + [mapView addAnnotation:circleAnnotation];
74 } 82 }
75 83
76 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib. 84 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
@@ -106,10 +114,17 @@ @@ -106,10 +114,17 @@
106 [self updateInfo]; 114 [self updateInfo];
107 } 115 }
108 116
  117 +- (void)viewDidUnload
  118 +{
  119 + [self setMppLabel:nil];
  120 + [super viewDidUnload];
  121 +}
  122 +
109 - (void)dealloc 123 - (void)dealloc
110 { 124 {
111 self.infoTextView = nil; 125 self.infoTextView = nil;
112 self.mapView = nil; 126 self.mapView = nil;
  127 + self.mppLabel = nil;
113 [super dealloc]; 128 [super dealloc];
114 } 129 }
115 130
@@ -123,6 +138,8 @@ @@ -123,6 +138,8 @@
123 mapView.zoom, 138 mapView.zoom,
124 [[mapView tileSource] shortAttribution] 139 [[mapView tileSource] shortAttribution]
125 ]]; 140 ]];
  141 +
  142 + [mppLabel setText:[NSString stringWithFormat:@"%.0f m", self.mapView.metersPerPixel * 55.0]];
126 } 143 }
127 144
128 #pragma mark - 145 #pragma mark -
@@ -141,25 +158,29 @@ @@ -141,25 +158,29 @@
141 - (void)tapOnAnnotation:(RMAnnotation *)annotation onMap:(RMMapView *)map 158 - (void)tapOnAnnotation:(RMAnnotation *)annotation onMap:(RMMapView *)map
142 { 159 {
143 if ([annotation.annotationType isEqualToString:kRMClusterAnnotationTypeName]) 160 if ([annotation.annotationType isEqualToString:kRMClusterAnnotationTypeName])
144 - {  
145 [map zoomInToNextNativeZoomAt:[map coordinateToPixel:annotation.coordinate] animated:YES]; 161 [map zoomInToNextNativeZoomAt:[map coordinateToPixel:annotation.coordinate] animated:YES];
146 - }  
147 } 162 }
148 163
149 -- (RMMapLayer *)mapView:(RMMapView *)mapView layerForAnnotation:(RMAnnotation *)annotation 164 +- (RMMapLayer *)mapView:(RMMapView *)aMapView layerForAnnotation:(RMAnnotation *)annotation
150 { 165 {
151 - RMMarker *marker = nil; 166 + RMMapLayer *marker = nil;
  167 +
152 if ([annotation.annotationType isEqualToString:kRMClusterAnnotationTypeName]) 168 if ([annotation.annotationType isEqualToString:kRMClusterAnnotationTypeName])
153 { 169 {
154 marker = [[[RMMarker alloc] initWithUIImage:[UIImage imageNamed:@"marker-blue.png"] anchorPoint:annotation.anchorPoint] autorelease]; 170 marker = [[[RMMarker alloc] initWithUIImage:[UIImage imageNamed:@"marker-blue.png"] anchorPoint:annotation.anchorPoint] autorelease];
155 if (annotation.title) 171 if (annotation.title)
156 - [marker changeLabelUsingText:annotation.title]; 172 + [(RMMarker *)marker changeLabelUsingText:annotation.title];
  173 + }
  174 + else if ([annotation.annotationType isEqualToString:kCircleAnnotationType])
  175 + {
  176 + marker = [[[RMCircle alloc] initWithView:aMapView radiusInMeters:10000.0] autorelease];
  177 + [(RMCircle *)marker setLineWidthInPixels:5.0];
157 } 178 }
158 else 179 else
159 { 180 {
160 marker = [[[RMMarker alloc] initWithUIImage:annotation.annotationIcon anchorPoint:annotation.anchorPoint] autorelease]; 181 marker = [[[RMMarker alloc] initWithUIImage:annotation.annotationIcon anchorPoint:annotation.anchorPoint] autorelease];
161 if (annotation.title) 182 if (annotation.title)
162 - [marker changeLabelUsingText:annotation.title]; 183 + [(RMMarker *)marker changeLabelUsingText:annotation.title];
163 } 184 }
164 185
165 return marker; 186 return marker;
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 -<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03"> 2 +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
3 <data> 3 <data>
4 <int key="IBDocument.SystemTarget">528</int> 4 <int key="IBDocument.SystemTarget">528</int>
5 - <string key="IBDocument.SystemVersion">9G55</string>  
6 - <string key="IBDocument.InterfaceBuilderVersion">677</string>  
7 - <string key="IBDocument.AppKitVersion">949.43</string>  
8 - <string key="IBDocument.HIToolboxVersion">353.00</string>  
9 - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 5 + <string key="IBDocument.SystemVersion">11D50</string>
  6 + <string key="IBDocument.InterfaceBuilderVersion">1938</string>
  7 + <string key="IBDocument.AppKitVersion">1138.32</string>
  8 + <string key="IBDocument.HIToolboxVersion">568.00</string>
  9 + <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
  10 + <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
  11 + <string key="NS.object.0">933</string>
  12 + </object>
  13 + <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
10 <bool key="EncodedWithXMLCoder">YES</bool> 14 <bool key="EncodedWithXMLCoder">YES</bool>
11 - <integer value="39"/> 15 + <string>IBUITextView</string>
  16 + <string>IBUIImageView</string>
  17 + <string>IBUIView</string>
  18 + <string>IBUILabel</string>
  19 + <string>IBProxyObject</string>
12 </object> 20 </object>
13 <object class="NSArray" key="IBDocument.PluginDependencies"> 21 <object class="NSArray" key="IBDocument.PluginDependencies">
14 <bool key="EncodedWithXMLCoder">YES</bool> 22 <bool key="EncodedWithXMLCoder">YES</bool>
15 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> 23 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
16 </object> 24 </object>
17 <object class="NSMutableDictionary" key="IBDocument.Metadata"> 25 <object class="NSMutableDictionary" key="IBDocument.Metadata">
18 - <bool key="EncodedWithXMLCoder">YES</bool>  
19 - <object class="NSArray" key="dict.sortedKeys">  
20 - <bool key="EncodedWithXMLCoder">YES</bool>  
21 - </object>  
22 - <object class="NSMutableArray" key="dict.values">  
23 - <bool key="EncodedWithXMLCoder">YES</bool>  
24 - </object> 26 + <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
  27 + <integer value="1" key="NS.object.0"/>
25 </object> 28 </object>
26 <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> 29 <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
27 <bool key="EncodedWithXMLCoder">YES</bool> 30 <bool key="EncodedWithXMLCoder">YES</bool>
28 <object class="IBProxyObject" id="372490531"> 31 <object class="IBProxyObject" id="372490531">
29 <string key="IBProxiedObjectIdentifier">IBFilesOwner</string> 32 <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
  33 + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
30 </object> 34 </object>
31 <object class="IBProxyObject" id="815241450"> 35 <object class="IBProxyObject" id="815241450">
32 <string key="IBProxiedObjectIdentifier">IBFirstResponder</string> 36 <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
  37 + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
33 </object> 38 </object>
34 <object class="IBUIView" id="702763708"> 39 <object class="IBUIView" id="702763708">
35 <reference key="NSNextResponder"/> 40 <reference key="NSNextResponder"/>
@@ -46,6 +51,8 @@ @@ -46,6 +51,8 @@
46 <int key="NSvFlags">274</int> 51 <int key="NSvFlags">274</int>
47 <string key="NSFrame">{{0, 367}, {320, 93}}</string> 52 <string key="NSFrame">{{0, 367}, {320, 93}}</string>
48 <reference key="NSSuperview" ref="79822186"/> 53 <reference key="NSSuperview" ref="79822186"/>
  54 + <reference key="NSWindow"/>
  55 + <reference key="NSNextKeyView"/>
49 <object class="NSColor" key="IBUIBackgroundColor"> 56 <object class="NSColor" key="IBUIBackgroundColor">
50 <int key="NSColorSpace">1</int> 57 <int key="NSColorSpace">1</int>
51 <bytes key="NSRGB">MC4wNDM0NzgyNTEgMC4wNDM0NzgyNTEgMC4wNDM0NzgyNTEgMC42OTk5OTk5OQA</bytes> 58 <bytes key="NSRGB">MC4wNDM0NzgyNTEgMC4wNDM0NzgyNTEgMC4wNDM0NzgyNTEgMC42OTk5OTk5OQA</bytes>
@@ -53,39 +60,72 @@ @@ -53,39 +60,72 @@
53 <bool key="IBUIOpaque">NO</bool> 60 <bool key="IBUIOpaque">NO</bool>
54 <bool key="IBUIClipsSubviews">YES</bool> 61 <bool key="IBUIClipsSubviews">YES</bool>
55 <bool key="IBUIMultipleTouchEnabled">YES</bool> 62 <bool key="IBUIMultipleTouchEnabled">YES</bool>
  63 + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
56 <bool key="IBUIShowsHorizontalScrollIndicator">NO</bool> 64 <bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
57 <bool key="IBUIDelaysContentTouches">NO</bool> 65 <bool key="IBUIDelaysContentTouches">NO</bool>
58 <bool key="IBUICanCancelContentTouches">NO</bool> 66 <bool key="IBUICanCancelContentTouches">NO</bool>
59 <bool key="IBUIBouncesZoom">NO</bool> 67 <bool key="IBUIBouncesZoom">NO</bool>
60 <bool key="IBUIEditable">NO</bool> 68 <bool key="IBUIEditable">NO</bool>
61 - <string type="base64-UTF8" key="IBUIText">Ly8KLy8gIE1haW5WaWV3Q29udHJvbGxlci5tCi8vICBTYW1wbGUyIDogRGlhZ25vc3RpYyBtYXAKLy8K  
62 -CiNpbXBvcnQgIk1haW5WaWV3Q29udHJvbGxlci5oIgojaW1wb3J0ICJNYWluVmlldy5oIgoKQGltcGxl  
63 -bWVudGF0aW9uIE1haW5WaWV3Q29udHJvbGxlcgoKQHN5bnRoZXNpemUgbWFwVmlldzsKQHN5bnRoZXNp  
64 -emUgdGV4dFZpZXc7CgotIChpZClpbml0V2l0aE5pYk5hbWU6KE5TU3RyaW5nICopbmliTmFtZU9yTmls  
65 -IGJ1bmRsZTooTlNCdW5kbGUgKiluaWJCdW5kbGVPck5pbCB7CiAgICBpZiAoc2VsZiA9IFtzdXBlciBp  
66 -bml0V2l0aE5pYk5hbWU6bmliTmFtZU9yTmlsIGJ1bmRsZTpuaWJCdW5kbGVPck5pbF0pIHsKICAgICAg  
67 -ICAvLyBDdXN0b20gaW5pdGlhbGl6YXRpb24KICAgIH0KICAgIHJldHVybiBzZWxmOwp9CgoKLy8gSW1w  
68 -bGVtZW50IHZpZXdEaWRMb2FkIHRvIGRvIGFkZGl0aW9uYWwgc2V0dXAgYWZ0ZXIgbG9hZGluZyB0aGUg  
69 -dmlldywgdHlwaWNhbGx5IGZyb20gYSBuaWIuCi0gKHZvaWQpdmlld0RpZExvYWQgewogICAgW3N1cGVy  
70 -IHZpZXdEaWRMb2FkXTsKICAgIFt0ZXh0VmlldyBzZXRUZXh0OkAidG90byBlc3QgZW4gdmFjYW5jZXMi  
71 -XTsKfQoKCi8qCiAvLyBPdmVycmlkZSB0byBhbGxvdyBvcmllbnRhdGlvbnMgb3RoZXIgdGhhbiB0aGUg  
72 -ZGVmYXVsdCBwb3J0cmFpdCBvcmllbnRhdGlvbi4KIC0gKEJPT0wpc2hvdWxkQXV0b3JvdGF0ZVRvSW50  
73 -ZXJmYWNlT3JpZW50YXRpb246KFVJSW50ZXJmYWNlT3JpZW50YXRpb24paW50ZXJmYWNlT3JpZW50YXRp  
74 -b24gewogLy8gUmV0dXJuIFlFUyBmb3Igc3VwcG9ydGVkIG9yaWVudGF0aW9ucwogcmV0dXJuIChpbnRl  
75 -cmZhY2VPcmllbnRhdGlvbiA9PSBVSUludGVyZmFjZU9yaWVudGF0aW9uUG9ydHJhaXQpOwogfQoqLwoK  
76 -Ci0gKHZvaWQpZGlkUmVjZWl2ZU1lbW9yeVdhcm5pbmcgewogICAgW3N1cGVyIGRpZFJlY2VpdmVNZW1v  
77 -cnlXYXJuaW5nXTsgLy8gUmVsZWFzZXMgdGhlIHZpZXcgaWYgaXQgZG9lc24ndCBoYXZlIGEgc3VwZXJ2  
78 -aWV3CiAgICAvLyBSZWxlYXNlIGFueXRoaW5nIHRoYXQncyBub3QgZXNzZW50aWFsLCBzdWNoIGFzIGNh  
79 -Y2hlZCBkYXRhCn0KCgotICh2b2lkKWRlYWxsb2MgewogICAgW3N1cGVyIGRlYWxsb2NdOwp9CgoKQGVu  
80 -ZAo</string>  
81 - <object class="NSColor" key="IBUITextColor"> 69 + <string key="IBUIText"/>
  70 + <object class="NSColor" key="IBUITextColor" id="866434376">
82 <int key="NSColorSpace">3</int> 71 <int key="NSColorSpace">3</int>
83 <bytes key="NSWhite">MQA</bytes> 72 <bytes key="NSWhite">MQA</bytes>
84 </object> 73 </object>
  74 + <object class="IBUITextInputTraits" key="IBUITextInputTraits">
  75 + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
  76 + </object>
  77 + <object class="IBUIFontDescription" key="IBUIFontDescription" id="758904252">
  78 + <int key="type">1</int>
  79 + <double key="pointSize">17</double>
  80 + </object>
  81 + <object class="NSFont" key="IBUIFont" id="421071503">
  82 + <string key="NSName">Helvetica</string>
  83 + <double key="NSSize">17</double>
  84 + <int key="NSfFlags">16</int>
  85 + </object>
  86 + </object>
  87 + <object class="IBUILabel" id="418528957">
  88 + <reference key="NSNextResponder" ref="79822186"/>
  89 + <int key="NSvFlags">292</int>
  90 + <string key="NSFrame">{{227, 379}, {91, 21}}</string>
  91 + <reference key="NSSuperview" ref="79822186"/>
  92 + <reference key="NSWindow"/>
  93 + <string key="NSReuseIdentifierKey">_NS:328</string>
  94 + <bool key="IBUIOpaque">NO</bool>
  95 + <bool key="IBUIClipsSubviews">YES</bool>
  96 + <int key="IBUIContentMode">7</int>
  97 + <bool key="IBUIUserInteractionEnabled">NO</bool>
  98 + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
  99 + <string key="IBUIText">Label</string>
  100 + <reference key="IBUITextColor" ref="866434376"/>
  101 + <nil key="IBUIHighlightedColor"/>
  102 + <int key="IBUIBaselineAdjustment">1</int>
  103 + <float key="IBUIMinimumFontSize">10</float>
  104 + <int key="IBUITextAlignment">1</int>
  105 + <reference key="IBUIFontDescription" ref="758904252"/>
  106 + <reference key="IBUIFont" ref="421071503"/>
  107 + </object>
  108 + <object class="IBUIImageView" id="142627727">
  109 + <reference key="NSNextResponder" ref="79822186"/>
  110 + <int key="NSvFlags">256</int>
  111 + <string key="NSFrame">{{245, 369}, {55, 11}}</string>
  112 + <reference key="NSSuperview" ref="79822186"/>
  113 + <reference key="NSWindow"/>
  114 + <bool key="IBUIOpaque">NO</bool>
  115 + <bool key="IBUIClipsSubviews">YES</bool>
  116 + <int key="IBUIContentMode">4</int>
  117 + <bool key="IBUIMultipleTouchEnabled">YES</bool>
  118 + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
  119 + <object class="NSCustomResource" key="IBUIImage">
  120 + <string key="NSClassName">NSImage</string>
  121 + <string key="NSResourceName">mpp.png</string>
  122 + </object>
85 </object> 123 </object>
86 </object> 124 </object>
87 <string key="NSFrameSize">{320, 460}</string> 125 <string key="NSFrameSize">{320, 460}</string>
88 <reference key="NSSuperview" ref="702763708"/> 126 <reference key="NSSuperview" ref="702763708"/>
  127 + <reference key="NSWindow"/>
  128 + <reference key="NSNextKeyView"/>
89 <object class="NSColor" key="IBUIBackgroundColor"> 129 <object class="NSColor" key="IBUIBackgroundColor">
90 <int key="NSColorSpace">3</int> 130 <int key="NSColorSpace">3</int>
91 <bytes key="NSWhite">MQA</bytes> 131 <bytes key="NSWhite">MQA</bytes>
@@ -95,16 +135,20 @@ ZAo</string> @@ -95,16 +135,20 @@ ZAo</string>
95 </object> 135 </object>
96 <bool key="IBUIClearsContextBeforeDrawing">NO</bool> 136 <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
97 <bool key="IBUIMultipleTouchEnabled">YES</bool> 137 <bool key="IBUIMultipleTouchEnabled">YES</bool>
  138 + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
98 </object> 139 </object>
99 </object> 140 </object>
100 <string key="NSFrameSize">{320, 460}</string> 141 <string key="NSFrameSize">{320, 460}</string>
101 <reference key="NSSuperview"/> 142 <reference key="NSSuperview"/>
  143 + <reference key="NSWindow"/>
  144 + <reference key="NSNextKeyView" ref="79822186"/>
102 <object class="NSColor" key="IBUIBackgroundColor"> 145 <object class="NSColor" key="IBUIBackgroundColor">
103 <int key="NSColorSpace">3</int> 146 <int key="NSColorSpace">3</int>
104 <bytes key="NSWhite">MQA</bytes> 147 <bytes key="NSWhite">MQA</bytes>
105 <reference key="NSCustomColorSpace" ref="298040433"/> 148 <reference key="NSCustomColorSpace" ref="298040433"/>
106 </object> 149 </object>
107 <bool key="IBUIClearsContextBeforeDrawing">NO</bool> 150 <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
  151 + <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
108 </object> 152 </object>
109 </object> 153 </object>
110 <object class="IBObjectContainer" key="IBDocument.Objects"> 154 <object class="IBObjectContainer" key="IBDocument.Objects">
@@ -134,6 +178,14 @@ ZAo</string> @@ -134,6 +178,14 @@ ZAo</string>
134 </object> 178 </object>
135 <int key="connectionID">46</int> 179 <int key="connectionID">46</int>
136 </object> 180 </object>
  181 + <object class="IBConnectionRecord">
  182 + <object class="IBCocoaTouchOutletConnection" key="connection">
  183 + <string key="label">mppLabel</string>
  184 + <reference key="source" ref="372490531"/>
  185 + <reference key="destination" ref="418528957"/>
  186 + </object>
  187 + <int key="connectionID">51</int>
  188 + </object>
137 </object> 189 </object>
138 <object class="IBMutableOrderedSet" key="objectRecords"> 190 <object class="IBMutableOrderedSet" key="objectRecords">
139 <object class="NSArray" key="orderedObjects"> 191 <object class="NSArray" key="orderedObjects">
@@ -150,7 +202,7 @@ ZAo</string> @@ -150,7 +202,7 @@ ZAo</string>
150 <int key="objectID">-1</int> 202 <int key="objectID">-1</int>
151 <reference key="object" ref="372490531"/> 203 <reference key="object" ref="372490531"/>
152 <reference key="parent" ref="360949347"/> 204 <reference key="parent" ref="360949347"/>
153 - <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> 205 + <string key="objectName">File's Owner</string>
154 </object> 206 </object>
155 <object class="IBObjectRecord"> 207 <object class="IBObjectRecord">
156 <int key="objectID">-2</int> 208 <int key="objectID">-2</int>
@@ -172,6 +224,8 @@ ZAo</string> @@ -172,6 +224,8 @@ ZAo</string>
172 <object class="NSMutableArray" key="children"> 224 <object class="NSMutableArray" key="children">
173 <bool key="EncodedWithXMLCoder">YES</bool> 225 <bool key="EncodedWithXMLCoder">YES</bool>
174 <reference ref="922595057"/> 226 <reference ref="922595057"/>
  227 + <reference ref="142627727"/>
  228 + <reference ref="418528957"/>
175 </object> 229 </object>
176 <reference key="parent" ref="702763708"/> 230 <reference key="parent" ref="702763708"/>
177 </object> 231 </object>
@@ -180,52 +234,60 @@ ZAo</string> @@ -180,52 +234,60 @@ ZAo</string>
180 <reference key="object" ref="922595057"/> 234 <reference key="object" ref="922595057"/>
181 <reference key="parent" ref="79822186"/> 235 <reference key="parent" ref="79822186"/>
182 </object> 236 </object>
  237 + <object class="IBObjectRecord">
  238 + <int key="objectID">49</int>
  239 + <reference key="object" ref="418528957"/>
  240 + <reference key="parent" ref="79822186"/>
  241 + </object>
  242 + <object class="IBObjectRecord">
  243 + <int key="objectID">48</int>
  244 + <reference key="object" ref="142627727"/>
  245 + <reference key="parent" ref="79822186"/>
  246 + </object>
183 </object> 247 </object>
184 </object> 248 </object>
185 <object class="NSMutableDictionary" key="flattenedProperties"> 249 <object class="NSMutableDictionary" key="flattenedProperties">
186 <bool key="EncodedWithXMLCoder">YES</bool> 250 <bool key="EncodedWithXMLCoder">YES</bool>
187 - <object class="NSMutableArray" key="dict.sortedKeys"> 251 + <object class="NSArray" key="dict.sortedKeys">
188 <bool key="EncodedWithXMLCoder">YES</bool> 252 <bool key="EncodedWithXMLCoder">YES</bool>
189 <string>-1.CustomClassName</string> 253 <string>-1.CustomClassName</string>
  254 + <string>-1.IBPluginDependency</string>
190 <string>-2.CustomClassName</string> 255 <string>-2.CustomClassName</string>
191 - <string>37.IBEditorWindowLastContentRect</string> 256 + <string>-2.IBPluginDependency</string>
192 <string>37.IBPluginDependency</string> 257 <string>37.IBPluginDependency</string>
193 <string>39.CustomClassName</string> 258 <string>39.CustomClassName</string>
194 <string>39.IBPluginDependency</string> 259 <string>39.IBPluginDependency</string>
195 <string>44.IBPluginDependency</string> 260 <string>44.IBPluginDependency</string>
  261 + <string>48.IBPluginDependency</string>
  262 + <string>49.IBPluginDependency</string>
196 </object> 263 </object>
197 <object class="NSMutableArray" key="dict.values"> 264 <object class="NSMutableArray" key="dict.values">
198 <bool key="EncodedWithXMLCoder">YES</bool> 265 <bool key="EncodedWithXMLCoder">YES</bool>
199 <string>MainViewController</string> 266 <string>MainViewController</string>
  267 + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
200 <string>UIResponder</string> 268 <string>UIResponder</string>
201 - <string>{{741, 489}, {320, 460}}</string> 269 + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
202 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> 270 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
203 <string>RMMapView</string> 271 <string>RMMapView</string>
204 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> 272 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
205 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> 273 <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
  274 + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
  275 + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
206 </object> 276 </object>
207 </object> 277 </object>
208 <object class="NSMutableDictionary" key="unlocalizedProperties"> 278 <object class="NSMutableDictionary" key="unlocalizedProperties">
209 <bool key="EncodedWithXMLCoder">YES</bool> 279 <bool key="EncodedWithXMLCoder">YES</bool>
210 - <object class="NSArray" key="dict.sortedKeys">  
211 - <bool key="EncodedWithXMLCoder">YES</bool>  
212 - </object>  
213 - <object class="NSMutableArray" key="dict.values">  
214 - <bool key="EncodedWithXMLCoder">YES</bool>  
215 - </object> 280 + <reference key="dict.sortedKeys" ref="360949347"/>
  281 + <reference key="dict.values" ref="360949347"/>
216 </object> 282 </object>
217 <nil key="activeLocalization"/> 283 <nil key="activeLocalization"/>
218 <object class="NSMutableDictionary" key="localizations"> 284 <object class="NSMutableDictionary" key="localizations">
219 <bool key="EncodedWithXMLCoder">YES</bool> 285 <bool key="EncodedWithXMLCoder">YES</bool>
220 - <object class="NSArray" key="dict.sortedKeys">  
221 - <bool key="EncodedWithXMLCoder">YES</bool>  
222 - </object>  
223 - <object class="NSMutableArray" key="dict.values">  
224 - <bool key="EncodedWithXMLCoder">YES</bool>  
225 - </object> 286 + <reference key="dict.sortedKeys" ref="360949347"/>
  287 + <reference key="dict.values" ref="360949347"/>
226 </object> 288 </object>
227 <nil key="sourceID"/> 289 <nil key="sourceID"/>
228 - <int key="maxID">46</int> 290 + <int key="maxID">51</int>
229 </object> 291 </object>
230 <object class="IBClassDescriber" key="IBDocument.Classes"> 292 <object class="IBClassDescriber" key="IBDocument.Classes">
231 <object class="NSMutableArray" key="referencedPartialClassDescriptions"> 293 <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -235,26 +297,74 @@ ZAo</string> @@ -235,26 +297,74 @@ ZAo</string>
235 <string key="superclassName">UIViewController</string> 297 <string key="superclassName">UIViewController</string>
236 <object class="NSMutableDictionary" key="outlets"> 298 <object class="NSMutableDictionary" key="outlets">
237 <bool key="EncodedWithXMLCoder">YES</bool> 299 <bool key="EncodedWithXMLCoder">YES</bool>
238 - <object class="NSMutableArray" key="dict.sortedKeys"> 300 + <object class="NSArray" key="dict.sortedKeys">
239 <bool key="EncodedWithXMLCoder">YES</bool> 301 <bool key="EncodedWithXMLCoder">YES</bool>
240 <string>infoTextView</string> 302 <string>infoTextView</string>
241 <string>mapView</string> 303 <string>mapView</string>
  304 + <string>mppLabel</string>
242 </object> 305 </object>
243 <object class="NSMutableArray" key="dict.values"> 306 <object class="NSMutableArray" key="dict.values">
244 <bool key="EncodedWithXMLCoder">YES</bool> 307 <bool key="EncodedWithXMLCoder">YES</bool>
245 <string>UITextView</string> 308 <string>UITextView</string>
246 <string>RMMapView</string> 309 <string>RMMapView</string>
  310 + <string>UILabel</string>
  311 + </object>
  312 + </object>
  313 + <object class="NSMutableDictionary" key="toOneOutletInfosByName">
  314 + <bool key="EncodedWithXMLCoder">YES</bool>
  315 + <object class="NSArray" key="dict.sortedKeys">
  316 + <bool key="EncodedWithXMLCoder">YES</bool>
  317 + <string>infoTextView</string>
  318 + <string>mapView</string>
  319 + <string>mppLabel</string>
  320 + </object>
  321 + <object class="NSMutableArray" key="dict.values">
  322 + <bool key="EncodedWithXMLCoder">YES</bool>
  323 + <object class="IBToOneOutletInfo">
  324 + <string key="name">infoTextView</string>
  325 + <string key="candidateClassName">UITextView</string>
  326 + </object>
  327 + <object class="IBToOneOutletInfo">
  328 + <string key="name">mapView</string>
  329 + <string key="candidateClassName">RMMapView</string>
  330 + </object>
  331 + <object class="IBToOneOutletInfo">
  332 + <string key="name">mppLabel</string>
  333 + <string key="candidateClassName">UILabel</string>
  334 + </object>
247 </object> 335 </object>
248 </object> 336 </object>
249 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 337 <object class="IBClassDescriptionSource" key="sourceIdentifier">
250 <string key="majorKey">IBProjectSource</string> 338 <string key="majorKey">IBProjectSource</string>
251 - <string key="minorKey">Classes/MainViewController.h</string> 339 + <string key="minorKey">./Classes/MainViewController.h</string>
  340 + </object>
  341 + </object>
  342 + <object class="IBPartialClassDescription">
  343 + <string key="className">RMMapView</string>
  344 + <string key="superclassName">UIView</string>
  345 + <object class="IBClassDescriptionSource" key="sourceIdentifier">
  346 + <string key="majorKey">IBProjectSource</string>
  347 + <string key="minorKey">./Classes/RMMapView.h</string>
252 </object> 348 </object>
253 </object> 349 </object>
254 </object> 350 </object>
255 </object> 351 </object>
256 <int key="IBDocument.localizationMode">0</int> 352 <int key="IBDocument.localizationMode">0</int>
257 - <string key="IBDocument.LastKnownRelativeProjectPath">MarkerMurder.xcodeproj</string> 353 + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
  354 + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
  355 + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
  356 + <integer value="528" key="NS.object.0"/>
  357 + </object>
  358 + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
  359 + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
  360 + <integer value="3000" key="NS.object.0"/>
  361 + </object>
  362 + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
258 <int key="IBDocument.defaultPropertyAccessControl">3</int> 363 <int key="IBDocument.defaultPropertyAccessControl">3</int>
  364 + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
  365 + <string key="NS.key.0">mpp.png</string>
  366 + <string key="NS.object.0">{55, 11}</string>
  367 + </object>
  368 + <string key="IBCocoaTouchPluginVersion">933</string>
259 </data> 369 </data>
260 </archive> 370 </archive>
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
  10 + 16BFBA3714E912DF00F8D07E /* mpp.png in Resources */ = {isa = PBXBuildFile; fileRef = 16BFBA3614E912DF00F8D07E /* mpp.png */; };
10 1D3623260D0F684500981E51 /* MarkerMurderAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* MarkerMurderAppDelegate.m */; }; 11 1D3623260D0F684500981E51 /* MarkerMurderAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* MarkerMurderAppDelegate.m */; };
11 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; 12 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
12 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 13 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
@@ -55,6 +56,7 @@ @@ -55,6 +56,7 @@
55 /* End PBXContainerItemProxy section */ 56 /* End PBXContainerItemProxy section */
56 57
57 /* Begin PBXFileReference section */ 58 /* Begin PBXFileReference section */
  59 + 16BFBA3614E912DF00F8D07E /* mpp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mpp.png; sourceTree = "<group>"; };
58 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 60 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
59 1D3623240D0F684500981E51 /* MarkerMurderAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkerMurderAppDelegate.h; sourceTree = "<group>"; }; 61 1D3623240D0F684500981E51 /* MarkerMurderAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkerMurderAppDelegate.h; sourceTree = "<group>"; };
60 1D3623250D0F684500981E51 /* MarkerMurderAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MarkerMurderAppDelegate.m; sourceTree = "<group>"; }; 62 1D3623250D0F684500981E51 /* MarkerMurderAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MarkerMurderAppDelegate.m; sourceTree = "<group>"; };
@@ -178,6 +180,7 @@ @@ -178,6 +180,7 @@
178 2B12B8670F84ADA5003AE2BF /* marker-red.png */, 180 2B12B8670F84ADA5003AE2BF /* marker-red.png */,
179 2B580E490F8D236100D495B2 /* marker-blue.png */, 181 2B580E490F8D236100D495B2 /* marker-blue.png */,
180 2B70CB790F856A46002BAF97 /* loading.png */, 182 2B70CB790F856A46002BAF97 /* loading.png */,
  183 + 16BFBA3614E912DF00F8D07E /* mpp.png */,
181 280E754A0DD40C5E005A515E /* FlipsideView.xib */, 184 280E754A0DD40C5E005A515E /* FlipsideView.xib */,
182 280E754B0DD40C5E005A515E /* MainView.xib */, 185 280E754B0DD40C5E005A515E /* MainView.xib */,
183 280E754C0DD40C5E005A515E /* MainWindow.xib */, 186 280E754C0DD40C5E005A515E /* MainWindow.xib */,
@@ -292,6 +295,7 @@ @@ -292,6 +295,7 @@
292 2B70CB7A0F856A46002BAF97 /* loading.png in Resources */, 295 2B70CB7A0F856A46002BAF97 /* loading.png in Resources */,
293 2B580E4A0F8D236100D495B2 /* marker-blue.png in Resources */, 296 2B580E4A0F8D236100D495B2 /* marker-blue.png in Resources */,
294 2B2BADDB0FA3B48A00EE37AA /* marker-X.png in Resources */, 297 2B2BADDB0FA3B48A00EE37AA /* marker-X.png in Resources */,
  298 + 16BFBA3714E912DF00F8D07E /* mpp.png in Resources */,
295 ); 299 );
296 runOnlyForDeploymentPostprocessing = 0; 300 runOnlyForDeploymentPostprocessing = 0;
297 }; 301 };