We now look at GSM and CDMA Cell Locations

iPhoneTrackingAppDelegate.m

@@ -149,18 +149,13 @@ - (BOOL)tryToLoadLocationDB:(NSString*) locationDBPath forDevice:(NSString*) dev
   const float precision = 100;
   NSMutableDictionary* buckets = [NSMutableDictionary dictionary];
 
-  // Default query is for GSM iPhone
-  NSString* queries[] = {@"SELECT * FROM CellLocation;", @"SELECT * FROM WifiLocation;"};
-
-  // Determine if CDMA or GSM iPhone.
-  BOOL isCDMAiPhone = [database tableExists:@"CdmaCellLocation"];
-  if (isCDMAiPhone) {
-	//  Adjust first query for CDMA Cell Locations
-	queries[0] = @"SELECT * from CdmaCellLocation;";	
-  }	
+  NSString* queries[] = {
+		@"SELECT * FROM CellLocation;", // GSM iPhone
+		@"SELECT * FROM CdmaCellLocation;", // CDMA iPhone
+	    @"SELECT * FROM WifiLocation;"};
 
   // Temporarily disabled WiFi location pulling, since it's so dodgy. Change to 
-  for (int pass=0; pass<1; /*pass<2;*/ pass+=1) {
+  for (int pass=0; pass<2; /*pass<3;*/ pass+=1) {
 
     FMResultSet* results = [database executeQuery:queries[pass]];