Merge commit '403ee90e' into halset-403ee90e

Conflicts:
	MapView/Map/RMMapContents.m
	MapView/Map/RMPath.m

@@ -48,4 +48,6 @@
 -(void) setCapacity: (NSUInteger) theCapacity;
 -(void) setCapacity: (NSUInteger) theCapacity;
 -(void) setMinimalPurge: (NSUInteger) thePurgeMinimum;
 -(void) setMinimalPurge: (NSUInteger) thePurgeMinimum;
 
 
+-(void) purgeTilesFromBefore: (NSDate*) date;
+
 @end
 @end

@@ -162,6 +162,14 @@
 	return image;
 	return image;
 }
 }
 
 
+-(void) purgeTilesFromBefore: (NSDate*) date
+{
+    @synchronized(self)
+    {
+        [dao purgeTilesFromBefore:date];
+    }
+}
+
 -(void)didReceiveMemoryWarning
 -(void)didReceiveMemoryWarning
 {
 {
         @synchronized(self) 
         @synchronized(self) 

@@ -41,6 +41,7 @@
 -(void) touchTile: (uint64_t) tileHash withDate: (NSDate*) date;
 -(void) touchTile: (uint64_t) tileHash withDate: (NSDate*) date;
 -(void) addData: (NSData*) data LastUsed: (NSDate*)date ForTile: (uint64_t) tileHash;
 -(void) addData: (NSData*) data LastUsed: (NSDate*)date ForTile: (uint64_t) tileHash;
 -(void) purgeTiles: (NSUInteger) count;
 -(void) purgeTiles: (NSUInteger) count;
+-(void) purgeTilesFromBefore: (NSDate*) date;
 -(void) removeAllCachedImages;
 -(void) removeAllCachedImages;
 -(void)didReceiveMemoryWarning;
 -(void)didReceiveMemoryWarning;
 
 

@@ -37,6 +37,9 @@
 {
 {
 	[db executeUpdate:@"CREATE TABLE IF NOT EXISTS ZCACHE (ztileHash INTEGER PRIMARY KEY, zlastUsed DOUBLE, zdata BLOB)"];
 	[db executeUpdate:@"CREATE TABLE IF NOT EXISTS ZCACHE (ztileHash INTEGER PRIMARY KEY, zlastUsed DOUBLE, zdata BLOB)"];
     [db executeUpdate:@"CREATE INDEX IF NOT EXISTS zlastUsedIndex ON ZCACHE(zLastUsed)"];
     [db executeUpdate:@"CREATE INDEX IF NOT EXISTS zlastUsedIndex ON ZCACHE(zLastUsed)"];
+    // adding more than once does not seem to break anything
+    [db executeUpdate:@"ALTER TABLE ZCACHE ADD COLUMN zInserted DOUBLE"];
+    [db executeUpdate:@"CREATE INDEX IF NOT EXISTS zInsertedIndex ON ZCACHE(zInserted)"];
 }
 }
 
 
 -(id) initWithDatabase: (NSString*)path
 -(id) initWithDatabase: (NSString*)path
@@ -123,6 +126,27 @@
 	
 	
 }
 }
 
 
+-(void) purgeTilesFromBefore: (NSDate*) date;
+{
+    NSUInteger count = 0;
+    FMResultSet *results = [db executeQuery:@"SELECT COUNT(ztileHash) FROM ZCACHE WHERE zInserted < ?", date];
+	if ([results next]) {
+        count = [results intForColumnIndex:0];
+        RMLog(@"Will purge %i tile(s) from before %@", count, date);
+    }
+	[results close];
+    
+    if (count == 0) {
+        return;
+    }
+    
+	BOOL result = [db executeUpdate: @"DELETE FROM ZCACHE WHERE zInserted < ?", 
+				   date];
+	if (result == NO) {
+		RMLog(@"Error purging cache");
+	}
+}
+
 -(void) removeAllCachedImages 
 -(void) removeAllCachedImages 
 {
 {
 	BOOL result = [db executeUpdate: @"DELETE FROM ZCACHE"];
 	BOOL result = [db executeUpdate: @"DELETE FROM ZCACHE"];
@@ -145,8 +169,8 @@
 {
 {
 	// Fixme
 	// Fixme
 //	RMLog(@"addData\t%d", tileHash);
 //	RMLog(@"addData\t%d", tileHash);
-	BOOL result = [db executeUpdate:@"INSERT OR IGNORE INTO ZCACHE (ztileHash, zlastUsed, zdata) VALUES (?, ?, ?)", 
-		[NSNumber numberWithUnsignedLongLong:tileHash], date, data];
+	BOOL result = [db executeUpdate:@"INSERT OR REPLACE INTO ZCACHE (ztileHash, zlastUsed, zInserted, zdata) VALUES (?, ?, ?, ?)", 
+		[NSNumber numberWithUnsignedLongLong:tileHash], date, [NSDate date], data];
 	if (result == NO)
 	if (result == NO)
 	{
 	{
 		RMLog(@"Error occured adding data");
 		RMLog(@"Error occured adding data");