尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Joseph G
Commit a16949ea3bf67bb8695603b43db149bda0d45d05 1 parent 7f9fae59

Added Pascals patch

Inline Side-by-side
Showing 3 changed files with 108 additions and 12 deletions
... ... @@ -7,9 +7,10 @@
//
#import <UIKit/UIKit.h>
#import "RMMapView.h"
@interface MapViewViewController : UIViewController {
IBOutlet RMMapView * mapView;
}
@end
... ...
... ... @@ -8,7 +8,6 @@
#import "MapViewViewController.h"
#import "RMMapView.h"
#import "RMMapContents.h"
#import "RMFoundation.h"
#import "RMMarker.h"
... ... @@ -38,16 +37,15 @@
/* RMMarker *marker = [[RMMarker alloc] initWithKey:RMMarkerBlueKey];
RMMercatorRect loc = [[(RMMapView*)[self view] contents] mercatorBounds];
RMMercatorRect loc = [[mapView contents] mercatorBounds];
loc.origin.x += loc.size.width / 2;
loc.origin.y += loc.size.height / 2;
marker.location = loc.origin;
[[[(RMMapView*)[self view] contents] overlay] addSublayer:marker];
[[[mapView contents] overlay] addSublayer:marker];
NSLog(@"marker added to %f %f", loc.origin.x, loc.origin.y);*/
RMMapView *view = (RMMapView*)[self view];
[(RMMapView*)view addDefaultMarkerAt:[[(RMMapView*)view contents] mapCenter]];
[mapView addDefaultMarkerAt:[[mapView contents] mapCenter]];
}
... ...
... ... @@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">352.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="8"/>
<integer value="17"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
... ... @@ -25,14 +25,55 @@
<object class="IBUIView" id="666917941">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIView" id="905624595">
<reference key="NSNextResponder" ref="666917941"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 44}, {320, 372}}</string>
<reference key="NSSuperview" ref="666917941"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace" id="107457756">
<int key="NSID">2</int>
</object>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
</object>
<object class="IBUIToolbar" id="8084443">
<reference key="NSNextResponder" ref="666917941"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 416}, {320, 44}}</string>
<reference key="NSSuperview" ref="666917941"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<object class="NSMutableArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="IBUINavigationBar" id="1056741668">
<reference key="NSNextResponder" ref="666917941"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{320, 44}</string>
<reference key="NSSuperview" ref="666917941"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<object class="NSArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUINavigationItem" id="424037744">
<reference key="IBUINavigationBar" ref="1056741668"/>
<string key="IBUITitle">Map View Demo</string>
</object>
</object>
</object>
</object>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
<reference key="NSCustomColorSpace" ref="107457756"/>
</object>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
</object>
... ... @@ -48,6 +89,14 @@
</object>
<int key="connectionID">9</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">mapView</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="905624595"/>
</object>
<int key="connectionID">12</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
... ... @@ -74,8 +123,44 @@
<object class="IBObjectRecord">
<int key="objectID">8</int>
<reference key="object" ref="666917941"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="905624595"/>
<reference ref="8084443"/>
<reference ref="1056741668"/>
</object>
<reference key="parent" ref="360949347"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="905624595"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="parent" ref="666917941"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">15</int>
<reference key="object" ref="8084443"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="parent" ref="666917941"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="1056741668"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="424037744"/>
</object>
<reference key="parent" ref="666917941"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
<reference key="object" ref="424037744"/>
<reference key="parent" ref="1056741668"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
... ... @@ -84,7 +169,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>-1.CustomClassName</string>
<string>-2.CustomClassName</string>
<string>8.CustomClassName</string>
<string>11.CustomClassName</string>
<string>11.IBPluginDependency</string>
<string>15.IBPluginDependency</string>
<string>17.IBPluginDependency</string>
<string>18.IBPluginDependency</string>
<string>8.IBEditorWindowLastContentRect</string>
<string>8.IBPluginDependency</string>
</object>
... ... @@ -93,6 +182,10 @@
<string>MapViewViewController</string>
<string>UIResponder</string>
<string>RMMapView</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>{{14, 685}, {320, 460}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
... ... @@ -117,7 +210,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">9</int>
<int key="maxID">18</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
... ... @@ -125,6 +218,10 @@
<object class="IBPartialClassDescription">
<string key="className">MapViewViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">mapView</string>
<string key="NS.object.0">RMMapView</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">ApplicationSupport/MapViewViewController.h</string>
... ...