Merge branch 'mapview-abstraction'

Conflicts:
	Classes/LocationService/SGLocationService.m
	Classes/LocationService/SGLocationTypes.m
	Classes/Model/SGRecord.h
	Classes/Model/SGRecord.m
	Classes/SGClient.h
	Classes/Utilities/SGGeoJSON.h
	Classes/Utilities/SGGeoJSON.m
	Classes/Utilities/SGPointHelper.h
	SGClient.xcodeproj/project.pbxproj
	Tests/SGBackgroundLocationTests.m
	Tests/SGRecordTests.m

Classes/LocationService/Queries/SGHistoryQuery.h

@@ -34,6 +34,7 @@
 
 #import <Foundation/Foundation.h>
 #import "SGQuery.h"
+#import "SGRecordAnnotation.h"
 
 /*!
 * @class SGHistoryQuery 

Classes/LocationService/SGLocationService.m

@@ -423,7 +423,8 @@ - (void) stopTrackingRecords
         locationManager.delegate = nil;
         [locationManager release];
         locationManager = nil;
-    }    
+    }
+
 }
 
 #pragma mark -
@@ -453,30 +454,28 @@ - (void) locationManager:(CLLocationManager*)manager didUpdateToLocation:(CLLoca
         }
 
 #if __IPHONE_4_0 >= __IPHONE_OS_VERSION_MAX_ALLOWED
-
-        NSMutableArray* totalCachedRecords = [NSMutableArray array];
-        if(backgroundTask) {
-            NSArray* records = nil;
-            for(id<SGLocationServiceDelegate> delegate in delegates) {
-                if([delegate respondsToSelector:@selector(locationService:recordsForBackgroundLocationUpdate:)]) {
-                    records = [delegate locationService:self recordsForBackgroundLocationUpdate:newLocation];
-                    if(records)
-                        [totalUpdatedRecords addObjectsFromArray:records];
-                }
+
+    NSMutableArray* totalCachedRecords = [NSMutableArray array];
+        NSArray* records = nil;
+        for(id<SGLocationServiceDelegate> delegate in delegates) {
+            if([delegate respondsToSelector:@selector(locationService:recordsForBackgroundLocationUpdate:)]) {
+                records = [delegate locationService:self recordsForBackgroundLocationUpdate:newLocation];
+                if(records)
+                    [totalUpdatedRecords addObjectsFromArray:records];
             }
-            
-            for(id<SGLocationServiceDelegate> delegate in delegates) {
-                if([delegate respondsToSelector:@selector(locationService:shouldCacheRecord:)]) {
-                    for(id<SGRecordAnnotation> record in totalUpdatedRecords)
-                        if([delegate locationService:self shouldCacheRecord:record])
-                            [totalCachedRecords addObject:record];
-                }
+        }
+
+        for(id<SGLocationServiceDelegate> delegate in delegates) {
+            if([delegate respondsToSelector:@selector(locationService:shouldCacheRecord:)]) {
+                for(id<SGRecordAnnotation> record in totalUpdatedRecords)
+                    if([delegate locationService:self shouldCacheRecord:record])
+                        [totalCachedRecords addObject:record];
             }
-
-            [totalUpdatedRecords removeObjectsInArray:totalCachedRecords];
-            [self cacheBackgroundRecords:totalCachedRecords];
         }
 
+        [totalUpdatedRecords removeObjectsInArray:totalCachedRecords];
+        [self cacheBackgroundRecords:totalCachedRecords];
+
 #endif
 
         [self updateBackgroundRecords:totalUpdatedRecords];
@@ -491,8 +490,6 @@ - (void) locationManager:(CLLocationManager*)manager didFailWithError:(NSError*)
 #pragma mark -
 #pragma mark SGLocationService delegate methods 
 
-#if __IPHONE_4_0 >= __IPHONE_OS_VERSION_MAX_ALLOWED
-
 - (void) locationService:(SGLocationService*)service succeededForResponseId:(NSString*)requestId responseObject:(NSObject*)responseObject
 {
     if([cachedResponseIds containsObject:requestId]) {
@@ -510,8 +507,6 @@ - (void) locationService:(SGLocationService*)service failedForResponseId:(NSStri
     }
 }
 
-#endif
-
 #pragma mark -
 #pragma mark Record Information 
 

Classes/Model/SGRecord.h

@@ -32,7 +32,6 @@
 //  Created by Derek Smith.
 //
 
-#import <MapKit/MapKit.h>
 #import "SGRecordAnnotation.h"
 
 @class SGHistoryQuery;
@@ -48,7 +47,7 @@
 * It is recommended that this class be subclassed because most records stored in SimpleGeo will have user-defined properties. See 
 * @link //simplegeo/ooc/cl/SGGeoJSONEncoder SGGeoJSONEncoder @/link.
 */
-@interface SGRecord : NSObject <SGRecordAnnotation>
+@interface SGRecord : NSObject <SGRecordAnnotation, SGHistoricRecordAnnoation>
 {
     NSString* recordId;
 
@@ -65,18 +64,7 @@
     NSString* selfLink;
 
     NSMutableDictionary* properties;
-
     NSDictionary* history;
-    SGHistoryQuery* historyQuery;
-
-    @private
-    BOOL historyChanged;
-
-#if __IPHONE_4_0 >= __IPHONE_OS_VERSION_MAX_ALLOWED
-
-    MKPolyline* polyline;
-
-#endif
 }
 
 /*!
@@ -147,65 +135,37 @@
 @property (nonatomic, retain) NSMutableDictionary* properties;
 
 /*!
-* @method 
-* @abstract 
-* @discussion 
+* @property
+* @abstract The history of this record.
+>>>>>>> mapview-abstraction
 */
 @property (nonatomic, retain) NSDictionary* history;
 
-/*!
-* @method 
-* @abstract 
-* @discussion 
-*/
-@property (nonatomic, readonly) SGHistoryQuery* historyQuery;
-
 /*!
 * @method updateRecordWithGeoJSONObject:
 * @abstract Updates the record using the GeoJSONOBject. 
 * See @link //simplegeo/ooc/instm/SGRecordAnnotation/updateRecordWithGeoJSONObject: updateRecordWithGeoJSONObject: @/link. 
 */
 - (void) updateRecordWithGeoJSONObject:(NSDictionary*)dictionary;
 
-/*!
-* @method getHistory:cursor:
-* @abstract 
-* @discussion 
-* @param limit 
-* @param cursor 
-* @result 
-*/
-- (NSString*) getHistory:(int)limit cursor:(NSString*)cursor;
-
 /*!
 * @method updateHistory:
-* @abstract 
-* @discussion 
+* @abstract Appends the new history with the current history.
+>>>>>>> mapview-abstraction
 * @param newHistory 
 */
 - (void) updateHistory:(NSDictionary*)newHistory;
 
 /*!
 * @method updateCoordinate:
-* @abstract 
-* @discussion 
+* @abstract Updates the history and @link coordinate coordinate @/link while sending
+* a request an update to SimpleGeo.
+>>>>>>> mapview-abstraction
 * @param coord 
 * @result 
 */
 - (NSString*) updateCoordinate:(CLLocationCoordinate2D)coord;
 
-#if __IPHONE_4_0 >= __IPHONE_OS_VERSION_MAX_ALLOWED
-
-/*!
-* @method  historyPolyline
-* @abstract 
-* @discussion 
-* @result 
-*/
-- (MKPolyline*) historyPolyline;
-
-#endif
-
 @end
 
 

Classes/Model/SGRecord.m

@@ -34,7 +34,6 @@
 
 #import "SGRecord.h"
 
-#import "SGPointHelper.h"
 #import "SGLocationService.h"
 #import "SGLocationTypes.h"
 #import "SGGeoJSONEncoder.h"
@@ -49,7 +48,7 @@ - (BOOL) _isValid:(NSObject *)object;
 @end
 
 @implementation SGRecord
-@synthesize longitude, latitude, created, expires, layer, recordId, properties, layerLink, selfLink, history, historyQuery;
+@synthesize longitude, latitude, created, expires, layer, recordId, properties, layerLink, selfLink, history;
 @dynamic type;
 
 - (id) init
@@ -61,18 +60,15 @@ - (id) init
         recordId = nil;
         created = [[NSDate date] timeIntervalSince1970];
         expires = 0;
-        type = nil;
+        type = @"object";
         layerLink = nil;
         selfLink = nil;
         properties = [[NSMutableDictionary alloc] init];
         layer = nil;
         history = nil;
-        historyQuery = nil;
 
         if(!layer)
             layer = @"";
-
-        historyChanged = NO;
     }
 
     return self;
@@ -101,7 +97,6 @@ - (NSString*) type
 
 - (void) updateHistory:(NSDictionary*)newHistory
 {
-    historyChanged = YES;
     if(history)
         newHistory = SGGeometryCollectionAppend(history, newHistory);
 
@@ -163,20 +158,12 @@ - (NSString*) description
             self.layer, self.latitude, self.longitude, (int)self.expires, (int)self.created];
 }
 
-- (NSString*) getHistory:(int)limit cursor:(NSString*)cursor
-{
-    historyQuery = [[SGHistoryQuery alloc] initWithRecord:self];
-    historyQuery.cursor = cursor;
-    historyQuery.limit = limit;
-    return [[SGLocationService sharedLocationService] history:historyQuery];
-}
-
 - (NSString*) updateCoordinate:(CLLocationCoordinate2D)coord
 {
     NSString* updateResponseId = nil;
     double newLatitude = coord.latitude;
     double newLongitude = coord.longitude;
-    if(longitude && latitude && (newLatitude != latitude && newLongitude != longitude)) {
+    if(newLatitude != latitude && newLongitude != longitude) {
         SGLog(@"SGRecord - Updating record coordinates to %f,%f from %f,%f", newLatitude, newLongitude, latitude, longitude);
         if(!history) {
             NSMutableDictionary* geometryCollection = SGGeometryCollectionCreate();
@@ -194,27 +181,6 @@ - (NSString*) updateCoordinate:(CLLocationCoordinate2D)coord
     return updateResponseId;
 }
 
-#if __IPHONE_4_0 >= __IPHONE_OS_VERSION_MAX_ALLOWED
-
-- (MKPolyline*) historyPolyline
-{
-    if(history && historyChanged) {
-        NSMutableArray* coords = [NSMutableArray array];
-        for(NSDictionary* geometry in [history geometries])
-            [coords addObject:[geometry coordinates]];
-
-        if(polyline)
-            [polyline release];
-
-        polyline = [[MKPolyline polylineWithCoordinates:SGLonLatArrayToCLLocationCoordArray(coords) 
-                                                 count:[coords count]] retain];
-    }
-
-    return polyline;
-}
-
-#endif
-
 #pragma mark -
 #pragma mark Helper methods 
 

Classes/Model/SGRecordAnnotation.h

@@ -109,4 +109,29 @@
 */
 - (void) updateRecordWithGeoJSONObject:(NSDictionary*)dictionary;
 
+@end
+
+/*!
+* @protocol SGHistoricalRecordAnnoation
+* @abstract 
+* @discussion 
+*/
+@protocol SGHistoricRecordAnnoation <SGRecordAnnotation>
+
+/*!
+* @method updateHistory:
+* @abstract 
+* @discussion 
+* @param history 
+*/
+- (void) updateHistory:(NSDictionary*)history;
+
+/*!
+ * @method  history
+ * @abstract 
+ * @discussion 
+ * @result 
+ */
+- (NSDictionary*) history;
+
 @end

Classes/SGClient.h

@@ -18,7 +18,6 @@
 
 #import "SGCacheHandler.h"
 #import "SGCommitLog.h"
-#import "SGPointHelper.h"
 
 #import "SGAuthorization.h"
 #import "SGGeoJSONEncoder.h"

Classes/Utilities/SGGeoJSON.h → Classes/Utilities/GeoJSON/SGGeoJSON.h

@@ -32,6 +32,9 @@
 //  Created by Derek Smith.
 //
 
+#import "GeoJSON+NSArray.h"
+#import "GeoJSON+NSDictionary.h"
+
 /*!
 * @function SGGeometryCollectionCreate()
 * @abstract Creates a new GeoJSON geometry collection object.