Authored by Hal Mueller

a few more Doxygen tags

@@ -29,12 +29,13 @@ @@ -29,12 +29,13 @@
29 #define _RMLATLONG_H_ 29 #define _RMLATLONG_H_
30 30
31 #import <TargetConditionals.h> 31 #import <TargetConditionals.h>
32 -#if TARGET_OS_IPHONE  
33 #import <CoreLocation/CoreLocation.h> 32 #import <CoreLocation/CoreLocation.h>
34 33
35 /*! \struct RMLatLongBounds 34 /*! \struct RMLatLongBounds
36 - Specifies a region by northwest and southeast corners.  
37 - Note: northWest and southEast will change to northeast and southwest (note spelling and corner changes) after 0.5 to keep right-handed coordinate system 35 +
  36 + \brief Specifies a rectangle by northwest and southeast corners, given as CLLocationCoordinate2D.
  37 +
  38 + \deprecated Note: northWest and southEast will change to northeast and southwest (note spelling and corner changes) after 0.5 to keep right-handed coordinate system
38 */ 39 */
39 typedef struct { 40 typedef struct {
40 CLLocationCoordinate2D northWest; 41 CLLocationCoordinate2D northWest;
@@ -71,8 +72,6 @@ typedef struct { @@ -71,8 +72,6 @@ typedef struct {
71 } CLLocationCoordinate2D; 72 } CLLocationCoordinate2D;
72 73
73 74
74 -#endif  
75 -  
76 typedef CLLocationCoordinate2D RMLatLong; 75 typedef CLLocationCoordinate2D RMLatLong;
77 76
78 static const double kRMMinLatitude = -90.0f; 77 static const double kRMMinLatitude = -90.0f;
@@ -97,8 +97,8 @@ enum { @@ -97,8 +97,8 @@ enum {
97 RMMapRenderer *renderer; 97 RMMapRenderer *renderer;
98 NSUInteger boundingMask; 98 NSUInteger boundingMask;
99 99
100 - // These should probably not be here. Instead equivalent functions  
101 - // should just fetch them when needed from the tileosurce. 100 + /// \bug These should probably not be here. Instead equivalent functions
  101 + /// should just fetch them when needed from the tileosurce.
102 float minZoom, maxZoom; 102 float minZoom, maxZoom;
103 103
104 id<RMTilesUpdateDelegate> tilesUpdateDelegate; 104 id<RMTilesUpdateDelegate> tilesUpdateDelegate;
@@ -113,7 +113,7 @@ enum { @@ -113,7 +113,7 @@ enum {
113 "Scale" is how many meters in 1 pixel. Larger scale means bigger things are smaller on the screen. 113 "Scale" is how many meters in 1 pixel. Larger scale means bigger things are smaller on the screen.
114 "Scale" of 1 means 1 pixel == 1 meter. 114 "Scale" of 1 means 1 pixel == 1 meter.
115 "Scale" of 10 means 1 pixel == 10 meters. 115 "Scale" of 10 means 1 pixel == 10 meters.
116 - \deprecated will be renamed appropriately and a new -scale method introduced, using cartographic scale (e.g. 1:24000). 116 + \deprecated will be renamed metersPerPixel/setMetersPerPixel
117 */ 117 */
118 @property (readwrite) float scale; 118 @property (readwrite) float scale;
119 @property (readwrite) float zoom; 119 @property (readwrite) float zoom;
@@ -135,6 +135,7 @@ enum { @@ -135,6 +135,7 @@ enum {
135 @property (retain, readwrite) RMMapLayer *background; 135 @property (retain, readwrite) RMMapLayer *background;
136 @property (retain, readwrite) RMLayerSet *overlay; 136 @property (retain, readwrite) RMLayerSet *overlay;
137 @property (retain, readonly) RMMarkerManager *markerManager; 137 @property (retain, readonly) RMMarkerManager *markerManager;
  138 +/// \bug probably shouldn't be retaining this delegate
138 @property (nonatomic, retain) id<RMTilesUpdateDelegate> tilesUpdateDelegate; 139 @property (nonatomic, retain) id<RMTilesUpdateDelegate> tilesUpdateDelegate;
139 @property (readwrite) NSUInteger boundingMask; 140 @property (readwrite) NSUInteger boundingMask;
140 141
@@ -202,6 +203,7 @@ enum { @@ -202,6 +203,7 @@ enum {
202 - (void) tilesUpdatedRegion:(CGRect)region; 203 - (void) tilesUpdatedRegion:(CGRect)region;
203 204
204 /// the denominator in a cartographic scale like 1/24000, 1/50000, 1/2000000 205 /// the denominator in a cartographic scale like 1/24000, 1/50000, 1/2000000
  206 +/// \deprecated will be renamed scaleDenominator after 0.5
205 - (double)trueScaleDenominator; 207 - (double)trueScaleDenominator;
206 208
207 @end 209 @end
@@ -60,6 +60,7 @@ @@ -60,6 +60,7 @@
60 60
61 -(void) removeTile: (RMTile) tile 61 -(void) removeTile: (RMTile) tile
62 { 62 {
  63 + NSAssert(!RMTileIsDummy(tile), @"attempted to remove dummy tile");
63 if (RMTileIsDummy(tile)) 64 if (RMTileIsDummy(tile))
64 { 65 {
65 RMLog(@"attempted to remove dummy tile...??"); 66 RMLog(@"attempted to remove dummy tile...??");