minor edits, mostly to documentation

Hal Mueller
Commit ade244290aac297609c5213b7e79b5261a5ade4b 1 parent b268921c
Showing 7 changed files with 46 additions and 32 deletions
MapView/Map/RMMapContents.m
MapView/Map/RMMapView.h
MapView/Map/RMMarker.h
MapView/Map/RMVirtualEarthSource.h
MapView/routeme.doxygen
samples/MarkerMurder/Classes/MainViewController.m
samples/MarkerMurder/MarkerMurder.xcodeproj/project.pbxproj
--- a/MapView/Map/RMMapContents.m
View file @ade2442
+++ b/MapView/Map/RMMapContents.m
View file @ade2442
@@ -112,7 +112,6 @@
 	NSAssert1([newView isKindOfClass:[RMMapView class]], @"view %@ must be a subclass of RMMapView", newView);
 	[(RMMapView *)newView setContents:self];
-	renderer = [[RMCoreAnimationRenderer alloc] initWithContent:self];
 	boundingMask = RMMapMinWidthBound;
 	mercatorToScreenProjection = [[RMMercatorToScreenProjection alloc] initFromProjection:[newTilesource projection] ToScreenBounds:[newView bounds]];
--- a/MapView/Map/RMMapView.h
View file @ade2442
+++ b/MapView/Map/RMMapView.h
View file @ade2442
@@ -103,6 +103,7 @@ typedef struct {
 /*! 
  \brief Wrapper around RMMapContents for the iPhone.
+ 
  It implements event handling; but that's about it. All the interesting map
  logic is done by RMMapContents. There is exactly one RMMapView instance for each RMMapContents instance.
--- a/MapView/Map/RMMarker.h
View file @ade2442
+++ b/MapView/Map/RMMarker.h
View file @ade2442
@@ -59,12 +59,12 @@ extern NSString * const RMMarkerRedKey;
 - (id) initWithCGImage: (CGImageRef) image anchorPoint: (CGPoint) anchorPoint;
 - (id) initWithCGImage: (CGImageRef) image;
-/// \deprecated Deprecated at any moment after 0.5.
+/// \deprecated Deprecated at any moment after 0.5. Use initWithUIImage:.
 - (id) initWithKey: (NSString*) key;
 - (id) initWithUIImage: (UIImage*) image;
-/// \deprecated Deprecated at any moment after 0.5.
+/// \deprecated Deprecated at any moment after 0.5. Use initWithUIImage:.
 - (id) initWithStyle: (RMMarkerStyle*) style;
-/// \deprecated Deprecated at any moment after 0.5.
+/// \deprecated Deprecated at any moment after 0.5. Use initWithUIImage:.
 - (id) initWithNamedStyle: (NSString*) styleName;
 - (void) setLabel: (UIView*)aView;
--- a/MapView/Map/RMVirtualEarthSource.h
View file @ade2442
+++ b/MapView/Map/RMVirtualEarthSource.h
View file @ade2442
@@ -33,7 +33,20 @@
  Provides access to USA map tiles from Microsoft Virtual Earth. This implementation is incomplete. It
  requires a SOAP transaction to validate an access key and obtain a session token. Contact Microsoft
  Virtual Earth for further assistance; see contact information in RMVirtualEarthSource.m.
- */
+
+ To obtain a Virtual Earth key, see this blog post:
+ http://blogs.msdn.com/virtualearth/archive/2008/04/29/tracking-virtual-earth-tile-usage.aspx
+
+ Microsoft Virtual Earth evangelist: Chris Pendleton, chris.pendleton@microsoft.com
+ 
+ Microsoft Virtual Earth sales: Chris Longo, chris.longo@microsoft.com
+ 
+ This source code sample does not comply with VE terms of service as of March, 2009. To get
+ into compliance, you'll have to translate the SOAP call described in the above blog post
+ into Objective-C, and modify the URL template in RMVirtualEarthSource.m. If you manage to get
+ that working, please contribute your code back to the Route-Me project. When Microsoft was
+ invited to submit "blessed" sample code in March, 2009, they declined.
+*/
 @interface RMVirtualEarthSource : RMAbstractMercatorWebSource <RMAbstractMercatorWebSource> {
 	NSString *maptypeFlag;
 	NSString *accessKey;
@@ -41,16 +54,6 @@
 	NSString *_shortName;
 }
-// to obtain a Virtual Earth key, see this blog post:
-// http://blogs.msdn.com/virtualearth/archive/2008/04/29/tracking-virtual-earth-tile-usage.aspx
-// Microsoft Virtual Earth evangelist: Chris Pendleton, chris.pendleton@microsoft.com
-// Microsoft Virtual Earth sales: Chris Longo, chris.longo@microsoft.com
-//
-// This source code sample does not comply with VE terms of service as of March, 2009. To get
-// into compliance, you'll have to translate the SOAP call described in the above blog post
-// into Objective-C, and modify the URL template in RMVirtualEarthSource.m. If you manage to get
-// that working, please contribute your code back to the Route-Me project. When Microsoft was
-// invited to submit "blessed" sample code in March, 2009, they declined.
 - (id) initWithAerialThemeUsingAccessKey:(NSString *)developerAccessKey;
 - (id) initWithRoadThemeUsingAccessKey:(NSString *)developerAccessKey;
 - (id) initWithHybridThemeUsingAccessKey:(NSString *)developerAccessKey;
--- a/MapView/routeme.doxygen
View file @ade2442
+++ b/MapView/routeme.doxygen
View file @ade2442
@@ -317,7 +317,7 @@ EXTRACT_PRIVATE        = NO
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation.
-EXTRACT_STATIC         = NO
+EXTRACT_STATIC         = YES
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
 # defined locally in source files will be included in the documentation. 
@@ -330,7 +330,7 @@ EXTRACT_LOCAL_CLASSES  = YES
 # the interface are included in the documentation. 
 # If set to NO (the default) only methods in the interface are included.
-EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_LOCAL_METHODS  = YES
 # If this flag is set to YES, the members of anonymous namespaces will be 
 # extracted and appear in the documentation as a namespace called 
@@ -413,13 +413,13 @@ SORT_MEMBER_DOCS       = YES
 # by member name. If set to NO (the default) the members will appear in 
 # declaration order.
-SORT_BRIEF_DOCS        = NO
+SORT_BRIEF_DOCS        = YES
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
 # hierarchy of group names into alphabetical order. If set to NO (the default) 
 # the group names will appear in their defined order.
-SORT_GROUP_NAMES       = NO
+SORT_GROUP_NAMES       = YES
 # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
 # sorted by fully-qualified names, including namespaces. If set to 
@@ -1277,7 +1277,7 @@ INCLUDE_FILE_PATTERNS  =
 # undefined via #undef or recursively expanded use the := operator 
 # instead of the = operator.
-PREDEFINED             = 
+PREDEFINED             = TARGET_OS_IPHONE
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded. 
--- a/samples/MarkerMurder/Classes/MainViewController.m
View file @ade2442
+++ b/samples/MarkerMurder/Classes/MainViewController.m
View file @ade2442
@@ -25,21 +25,11 @@
     return self;
 }
-
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    [mapView setDelegate:self];
-	id myTilesource = [[[RMOpenAerialMapSource alloc] init] autorelease];
-    
-	// have to initialize the RMMapContents object explicitly if we want it to use a particular tilesource
-	[[[RMMapContents alloc] initWithView:mapView 
-							  tilesource:myTilesource] autorelease];
-
+- (void)addMarkers
+{
 	CLLocationCoordinate2D center;
 	center.latitude = 47.592;
 	center.longitude = -122.333;
-	[mapView moveToLatLong:center];
 	int i, j;
 	double startLongitude = center.longitude;
@@ -52,7 +42,24 @@
 		}
 	}
+}
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [mapView setDelegate:self];
+	id myTilesource = [[[RMOpenAerialMapSource alloc] init] autorelease];
+    
+	// have to initialize the RMMapContents object explicitly if we want it to use a particular tilesource
+	[[[RMMapContents alloc] initWithView:mapView 
+							  tilesource:myTilesource] autorelease];
+
+	CLLocationCoordinate2D center;
+	center.latitude = 47.592;
+	center.longitude = -122.333;
+	[mapView moveToLatLong:center];
 	[self updateInfo];
+	[self performSelector:@selector(addMarkers) withObject:nil afterDelay:10.0];
 }
--- a/samples/MarkerMurder/MarkerMurder.xcodeproj/project.pbxproj
View file @ade2442
+++ b/samples/MarkerMurder/MarkerMurder.xcodeproj/project.pbxproj
View file @ade2442
@@ -21,6 +21,7 @@
 		289233AF0DB2D0DB0083E9F9 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233AB0DB2D0DB0083E9F9 /* RootViewController.m */; };
 		289233B00DB2D0DB0083E9F9 /* FlipsideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233AD0DB2D0DB0083E9F9 /* FlipsideViewController.m */; };
 		2B12B8680F84ADA5003AE2BF /* marker-red.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B12B8670F84ADA5003AE2BF /* marker-red.png */; };
+		2B70CB7A0F856A46002BAF97 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = 2B70CB790F856A46002BAF97 /* loading.png */; };
 		EBDDE0E00F649CE100377FFE /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBDDE0DF0F649CE100377FFE /* CoreLocation.framework */; };
 		EBDDE0E20F649CE100377FFE /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBDDE0E10F649CE100377FFE /* QuartzCore.framework */; };
 		EBDDE0E40F649CE100377FFE /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EBDDE0E30F649CE100377FFE /* libsqlite3.dylib */; };
@@ -66,6 +67,7 @@
 		289233AD0DB2D0DB0083E9F9 /* FlipsideViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FlipsideViewController.m; path = Classes/FlipsideViewController.m; sourceTree = "<group>"; };
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		2B12B8670F84ADA5003AE2BF /* marker-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red.png"; sourceTree = "<group>"; };
+		2B70CB790F856A46002BAF97 /* loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.png; sourceTree = "<group>"; };
 		32CA4F630368D1EE00C91783 /* MarkerMurder_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MarkerMurder_Prefix.pch; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EBDDE0DF0F649CE100377FFE /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -162,6 +164,7 @@
 			isa = PBXGroup;
 			children = (
 				2B12B8670F84ADA5003AE2BF /* marker-red.png */,
+				2B70CB790F856A46002BAF97 /* loading.png */,
 				280E754A0DD40C5E005A515E /* FlipsideView.xib */,
 				280E754B0DD40C5E005A515E /* MainView.xib */,
 				280E754C0DD40C5E005A515E /* MainWindow.xib */,
@@ -261,6 +264,7 @@
 				280E754E0DD40C5E005A515E /* MainView.xib in Resources */,
 				280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */,
 				2B12B8680F84ADA5003AE2BF /* marker-red.png in Resources */,
+				2B70CB7A0F856A46002BAF97 /* loading.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};