From bdfb6bc41b96bd5a545bc10141a2e338ec6f7400 Mon Sep 17 00:00:00 2001
From: Jakob Obkircher <jakob.obkircher@gmail.com>
Date: Fri, 23 Sep 2011 16:57:18 +0200
Subject: [PATCH] some little changes

---
 Classes/MixareAppDelegate.m      | 179 ++++++------
 Classes/data/JsonHandler.m       |   1 +
 Classes/reality/PoiItem.m        |   2 +-
 MainWindow.xib                   | 456 +++++++++++++++++++------------
 Mixare.xcodeproj/project.pbxproj |  15 +-
 5 files changed, 393 insertions(+), 260 deletions(-)

diff --git a/Classes/MixareAppDelegate.m b/Classes/MixareAppDelegate.m
index 09c6dcf..f949176 100644
--- a/Classes/MixareAppDelegate.m
+++ b/Classes/MixareAppDelegate.m
@@ -42,11 +42,12 @@ @implementation MixareAppDelegate
 #pragma mark -
 #pragma  mark URL Handler
 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
-	NSLog(@"the url: %@", [url absoluteString]);
+	NSLog(@"the url: %@", [url absoluteURL]);
 	if (!url) {  return NO; }
     NSString *URLString = [url absoluteString];
     [[NSUserDefaults standardUserDefaults] setObject:URLString forKey:@"extern_url"];
     [[NSUserDefaults standardUserDefaults] synchronize];
+	[self downloadData];
     return YES;
 }
 #pragma mark -
@@ -103,7 +104,7 @@ -(void) didRotate:(NSNotification *)notification{
         [self setViewToPortrait:augViewController.view];
         beforeWasLandscape = NO;
     }
-    NSLog(@"DID ROTATE");
+//    deletNSLog(@"DID ROTATE");
     
 }
 
@@ -269,7 +270,7 @@ -(BOOL)checkIfDataSourceIsEanabled: (NSString *)source{
     return ret;
 }
 -(void)downloadData{
-	//NSAutoreleasePool * pool = [[NSAutoreleasePool alloc]init];
+	//Adding logic if mixare is called outside by specific url
 	jHandler = [[JsonHandler alloc]init];
 	CLLocation * pos = _locManager.location;
 	NSString * wikiData;
@@ -280,87 +281,101 @@ -(void)downloadData{
     if(_slider != nil){
         radius = _slider.value;
     }
-    
-    if([self checkIfDataSourceIsEanabled:@"Wikipedia"]){
-        NSLog(@"Downloading WIki data");
-        NSString   *language = [[NSLocale preferredLanguages] objectAtIndex:0];
-        NSLog(@"Language: %@",language);
-        wikiData = [[NSString alloc]initWithContentsOfURL:[NSURL URLWithString:[DataSource createRequestURLFromDataSource:@"WIKIPEDIA" Lat:pos.coordinate.latitude Lon:pos.coordinate.longitude Alt:pos.altitude radius:radius Lang:language]] encoding:NSUTF8StringEncoding error:nil];
-        NSLog(@"Download done");
-    }else {
-        wikiData = nil;
-    }
-    if([self checkIfDataSourceIsEanabled:@"Buzz"]){
-        NSLog(@"Downloading Buzz data");
-        buzzData = [[NSString alloc]initWithContentsOfURL:[NSURL URLWithString:[DataSource createRequestURLFromDataSource:@"BUZZ" Lat:pos.coordinate.latitude Lon:pos.coordinate.longitude Alt:700 radius:radius Lang:@"de"]]encoding:NSUTF8StringEncoding error:nil];
-        NSLog(@"Download done");
-    }else {
-        buzzData = nil;
-    }
-    if([self checkIfDataSourceIsEanabled:@"Twitter"]){
-        NSLog(@"Downloading Twitter data");
-        twitterData = [[NSString alloc]initWithContentsOfURL:[NSURL URLWithString:[DataSource createRequestURLFromDataSource:@"TWITTER" Lat:pos.coordinate.latitude Lon:pos.coordinate.longitude Alt:700 radius:radius Lang:@"de"]]encoding:NSUTF8StringEncoding error:nil];
-        NSLog(@"Download done");
-    }else {
-        twitterData = nil;
-    }
-    //User specific Sources .. 
-    if(_sourceViewController != nil && [_sourceViewController.dataSourceArray count]>3){
-        //datasource contains sources added by the user
-        NSLog(@"Downloading Mixare data");
-        //mixareData = [[NSString alloc]initWithContentsOfURL:[NSURL URLWithString:@"http://www.suedtirolerland.it/api/map/getARData/?client%5Blat%5D=46.47895932197436&client%5Blng%5D=11.295661926269203&client%5Brad%5D=100&lang_id=1&project_id=15&showTypes=13%2C14&key=51016f95291ef145e4b260c51b06af61"] encoding:NSUTF8StringEncoding error:nil];
-        //getting selected Source
-        NSString * customURL;
-        for(int i=3;i< [_sourceViewController.dataSourceArray count];i++){
-            if([self checkIfDataSourceIsEanabled:[_sourceViewController.dataSourceArray objectAtIndex:i]]){
-                customURL = [NSString stringWithFormat:@"http://%@",[_sourceViewController.dataSourceArray objectAtIndex:i]];
-            }
-        }
-        NSURL * customDsURL;
-        @try {
-            customDsURL = [NSURL URLWithString:customURL];
-            mixareData = [[NSString alloc]initWithContentsOfURL:customDsURL];
-            NSLog(@"Download done");
-        }
-        @catch (NSException *exception) {
-            NSLog(@"ERROR Downloading custom ds");
-        }
-        @finally {
-            
-        }
-        
-        
-    }else {
-        mixareData = nil;
-    }
- 
-    [_data removeAllObjects];
-    if(wikiData != nil){
-        _data= [jHandler processWikipediaJSONData:wikiData];
-        NSLog(@"data count: %d", [_data count]);
-        [wikiData release];
-    }
-    if(buzzData != nil){
-        [_data addObjectsFromArray:[jHandler processBuzzJSONData:buzzData]];
-        NSLog(@"data count: %d", [_data count]);
-        [buzzData release];
-    }
-    if(twitterData != nil && ![twitterData isEqualToString:@""]){
-       [_data addObjectsFromArray:[jHandler processTwitterJSONData:twitterData]]; 
-        NSLog(@"data count: %d", [_data count]);
-        [twitterData release];
-    }
-    if(mixareData != nil && ![mixareData isEqualToString:@""]){
-        [_data addObjectsFromArray:[jHandler processMixareJSONData:mixareData]];
-        NSLog(@"data count: %d", [_data count]);
-        [mixareData release];
-    }
-	
-    
-    
+   // NSString * external_url;
+//	NSString * external_url = [[NSUserDefaults standardUserDefaults] objectForKey:@"extern_url"];
+//	//NSLog(@"EXTERNAL URL IN DOWNLOAD: %@", external_url);
+//	
+//	if(external_url != nil){
+//		//Application is called with a url starting with mixare://
+//		NSLog(@"Downloading Mixare data");
+//		NSURL * url = [NSURL URLWithString:[external_url stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"mixare://"]]];
+//		NSLog(@"URL %@", url );
+//		mixareData = [[NSString alloc]initWithContentsOfURL:url encoding:NSUTF8StringEncoding error:nil];
+//		NSLog(@"Downloading Mixare done %@", mixareData);
+//		if(mixareData != nil && ![mixareData isEqualToString:@""]){
+//			[_data addObjectsFromArray:[jHandler processMixareJSONData:mixareData]];
+//			NSLog(@"data count: %d", [_data count]);
+//			[mixareData release];
+//		}
+//	}else{
+		//Application is called normally
+		if([self checkIfDataSourceIsEanabled:@"Wikipedia"]){
+			NSLog(@"Downloading WIki data");
+			NSString   *language = [[NSLocale preferredLanguages] objectAtIndex:0];
+			NSLog(@"Language: %@",language);
+			wikiData = [[NSString alloc]initWithContentsOfURL:[NSURL URLWithString:[DataSource createRequestURLFromDataSource:@"WIKIPEDIA" Lat:pos.coordinate.latitude Lon:pos.coordinate.longitude Alt:pos.altitude radius:radius Lang:language]] encoding:NSUTF8StringEncoding error:nil];
+			NSLog(@"Download done");
+		}else {
+			wikiData = nil;
+		}
+		if([self checkIfDataSourceIsEanabled:@"Buzz"]){
+			NSLog(@"Downloading Buzz data");
+			buzzData = [[NSString alloc]initWithContentsOfURL:[NSURL URLWithString:[DataSource createRequestURLFromDataSource:@"BUZZ" Lat:pos.coordinate.latitude Lon:pos.coordinate.longitude Alt:700 radius:radius Lang:@"de"]]encoding:NSUTF8StringEncoding error:nil];
+			NSLog(@"Download done");
+		}else {
+			buzzData = nil;
+		}
+		if([self checkIfDataSourceIsEanabled:@"Twitter"]){
+			NSLog(@"Downloading Twitter data");
+			twitterData = [[NSString alloc]initWithContentsOfURL:[NSURL URLWithString:[DataSource createRequestURLFromDataSource:@"TWITTER" Lat:pos.coordinate.latitude Lon:pos.coordinate.longitude Alt:700 radius:radius Lang:@"de"]]encoding:NSUTF8StringEncoding error:nil];
+			NSLog(@"Download done");
+		}else {
+			twitterData = nil;
+		}
+		//User specific Sources .. 
+		if(_sourceViewController != nil && [_sourceViewController.dataSourceArray count]>3){
+			//datasource contains sources added by the user
+			NSLog(@"Downloading Mixare data");
+			//mixareData = [[NSString alloc]initWithContentsOfURL:[NSURL URLWithString:@"http://www.suedtirolerland.it/api/map/getARData/?client%5Blat%5D=46.47895932197436&client%5Blng%5D=11.295661926269203&client%5Brad%5D=100&lang_id=1&project_id=15&showTypes=13%2C14&key=51016f95291ef145e4b260c51b06af61"] encoding:NSUTF8StringEncoding error:nil];
+			//getting selected Source
+			NSString * customURL;
+			for(int i=3;i< [_sourceViewController.dataSourceArray count];i++){
+				if([self checkIfDataSourceIsEanabled:[_sourceViewController.dataSourceArray objectAtIndex:i]]){
+					customURL = [NSString stringWithFormat:@"http://%@",[_sourceViewController.dataSourceArray objectAtIndex:i]];
+				}
+			}
+			NSURL * customDsURL;
+			@try {
+				customDsURL = [NSURL URLWithString:customURL];
+				mixareData = [[NSString alloc]initWithContentsOfURL:customDsURL encoding:NSUTF8StringEncoding error:nil];
+				NSLog(@"Download done");
+			}
+			@catch (NSException *exception) {
+				NSLog(@"ERROR Downloading custom ds");
+			}
+			@finally {
+				
+			}
+			
+			
+		}else {
+			mixareData = nil;
+		}
+		
+		[_data removeAllObjects];
+		if(wikiData != nil){
+			_data= [jHandler processWikipediaJSONData:wikiData];
+			NSLog(@"data count: %d", [_data count]);
+			[wikiData release];
+		}
+		if(buzzData != nil){
+			[_data addObjectsFromArray:[jHandler processBuzzJSONData:buzzData]];
+			NSLog(@"data count: %d", [_data count]);
+			[buzzData release];
+		}
+		if(twitterData != nil && ![twitterData isEqualToString:@""]){
+			[_data addObjectsFromArray:[jHandler processTwitterJSONData:twitterData]]; 
+			NSLog(@"data count: %d", [_data count]);
+			[twitterData release];
+		}
+		if(mixareData != nil && ![mixareData isEqualToString:@""]){
+			[_data addObjectsFromArray:[jHandler processMixareJSONData:mixareData]];
+			NSLog(@"data count: %d", [_data count]);
+			[mixareData release];
+		}
+//	}
     
 	[jHandler release];
-	//[pool release];
 }
 
 -(void)valueChanged:(id)sender{
diff --git a/Classes/data/JsonHandler.m b/Classes/data/JsonHandler.m
index ce01485..3e9dd1a 100644
--- a/Classes/data/JsonHandler.m
+++ b/Classes/data/JsonHandler.m
@@ -47,6 +47,7 @@ -(NSMutableArray*)processMixareJSONData: (NSString*) jsonData{
         NSDictionary* data = [jsonData JSONValue];
         NSMutableArray* ret = [[NSMutableArray alloc]init];
         NSArray* geonames = [data objectForKey:@"results"];
+		NSLog(@"IN PROCESS MIXARE DATA: %@", geonames);
         for(NSDictionary *geoname in geonames){
             [ret addObject:[NSDictionary dictionaryWithObjectsAndKeys:[geoname objectForKey:@"title"],kTitleKey, [geoname objectForKey:@"webpage"],kUrlKey,[geoname objectForKey:@"lng"],kLonKey,[geoname objectForKey:@"lat"],kLatKey,[geoname objectForKey:@"elevation"],kAltKey,@"MIXARE",kSourceKey, nil]];
         }
diff --git a/Classes/reality/PoiItem.m b/Classes/reality/PoiItem.m
index 3a3a971..c7aa98f 100644
--- a/Classes/reality/PoiItem.m
+++ b/Classes/reality/PoiItem.m
@@ -53,7 +53,7 @@ - (BOOL)isEqualToCoordinate:(PoiItem *)otherCoordinate {
 	equal = equal && self.inclination == otherCoordinate.inclination;
 	equal = equal && self.azimuth == otherCoordinate.azimuth;
 		
-	if (self.title && otherCoordinate.title || self.title && !otherCoordinate.title || !self.title && otherCoordinate.title) {
+	if ((self.title && otherCoordinate.title) || (self.title && !otherCoordinate.title) || (!self.title && otherCoordinate.title)) {
 		equal = equal && [self.title isEqualToString:otherCoordinate.title];
 	}
 	
diff --git a/MainWindow.xib b/MainWindow.xib
index 248b007..d4e07c8 100644
--- a/MainWindow.xib
+++ b/MainWindow.xib
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1056</int>
-		<string key="IBDocument.SystemVersion">10H574</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1246</string>
-		<string key="IBDocument.AppKitVersion">1038.35</string>
+		<int key="IBDocument.SystemTarget">1280</int>
+		<string key="IBDocument.SystemVersion">10K549</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1934</string>
+		<string key="IBDocument.AppKitVersion">1038.36</string>
+		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">931</string>
+		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBUITableView</string>
 			<string>IBUITextView</string>
@@ -30,7 +35,10 @@
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<object class="IBProxyObject" id="841351856">
 				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
@@ -79,7 +87,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, -2}, {320, 44}}</string>
 								<reference key="NSSuperview" ref="42061531"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="676796923"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -116,7 +123,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{20, 142}, {287, 264}}</string>
 								<reference key="NSSuperview" ref="42061531"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="925690613"/>
 								<reference key="IBUIBackgroundColor" ref="388338193"/>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -140,23 +146,26 @@ A</string>
 									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								</object>
 								<int key="IBUIDataDetectorTypes">2</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription" id="669175592">
+									<int key="type">1</int>
+									<double key="pointSize">17</double>
+								</object>
+								<object class="NSFont" key="IBUIFont" id="192785276">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">17</double>
+									<int key="NSfFlags">16</int>
+								</object>
 							</object>
 							<object class="IBUIButton" id="676796923">
 								<reference key="NSNextResponder" ref="42061531"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{20, 53}, {282, 77}}</string>
 								<reference key="NSSuperview" ref="42061531"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="207807838"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
 								<int key="IBUIContentVerticalAlignment">0</int>
-								<object class="NSFont" key="IBUIFont">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
 								<object class="NSColor" key="IBUIHighlightedTitleColor" id="782640094">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
@@ -173,6 +182,17 @@ A</string>
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">mixare_button.png</string>
 								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription">
+									<string key="name">Helvetica-Bold</string>
+									<string key="family">Helvetica</string>
+									<int key="traits">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
 							</object>
 							<object class="IBUIView" id="925690613">
 								<reference key="NSNextResponder" ref="42061531"/>
@@ -183,7 +203,6 @@ A</string>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{20, 53}, {66, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="68003376"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -191,22 +210,23 @@ A</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<string key="IBUIText">Latitude:</string>
-										<object class="NSFont" key="IBUIFont" id="904794252">
-											<string key="NSName">Helvetica</string>
-											<double key="NSSize">17</double>
-											<int key="NSfFlags">16</int>
-										</object>
 										<reference key="IBUITextColor" ref="950994020"/>
 										<nil key="IBUIHighlightedColor"/>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<float key="IBUIMinimumFontSize">10</float>
+										<object class="IBUIFontDescription" key="IBUIFontDescription" id="881621182">
+											<string key="name">Helvetica</string>
+											<string key="family">Helvetica</string>
+											<int key="traits">0</int>
+											<double key="pointSize">17</double>
+										</object>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="68003376">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{108, 53}, {131, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="177160615"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -219,13 +239,14 @@ A</string>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 										<float key="IBUIMinimumFontSize">17</float>
+										<reference key="IBUIFontDescription" ref="669175592"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="177160615">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{20, 82}, {80, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="836258863"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -233,18 +254,18 @@ A</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<string key="IBUIText">Longitude:</string>
-										<reference key="IBUIFont" ref="904794252"/>
 										<reference key="IBUITextColor" ref="950994020"/>
 										<nil key="IBUIHighlightedColor"/>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<float key="IBUIMinimumFontSize">10</float>
+										<reference key="IBUIFontDescription" ref="881621182"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="187385121">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{20, 111}, {57, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="987200899"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -252,18 +273,18 @@ A</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<string key="IBUIText">Altitude</string>
-										<reference key="IBUIFont" ref="904794252"/>
 										<reference key="IBUITextColor" ref="950994020"/>
 										<nil key="IBUIHighlightedColor"/>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<float key="IBUIMinimumFontSize">10</float>
+										<reference key="IBUIFontDescription" ref="881621182"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="368104184">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{20, 140}, {54, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="262369059"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -271,18 +292,18 @@ A</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<string key="IBUIText">Speed:</string>
-										<reference key="IBUIFont" ref="904794252"/>
 										<reference key="IBUITextColor" ref="950994020"/>
 										<nil key="IBUIHighlightedColor"/>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<float key="IBUIMinimumFontSize">10</float>
+										<reference key="IBUIFontDescription" ref="881621182"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="714594225">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{20, 169}, {75, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="369690055"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -290,18 +311,18 @@ A</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<string key="IBUIText">Accuracy:</string>
-										<reference key="IBUIFont" ref="904794252"/>
 										<reference key="IBUITextColor" ref="950994020"/>
 										<nil key="IBUIHighlightedColor"/>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<float key="IBUIMinimumFontSize">10</float>
+										<reference key="IBUIFontDescription" ref="881621182"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="1044179758">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{20, 193}, {122, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="167896937"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -309,18 +330,18 @@ A</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<string key="IBUIText">last gps update:</string>
-										<reference key="IBUIFont" ref="904794252"/>
 										<reference key="IBUITextColor" ref="950994020"/>
 										<nil key="IBUIHighlightedColor"/>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<float key="IBUIMinimumFontSize">10</float>
+										<reference key="IBUIFontDescription" ref="881621182"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="710605185">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{69, 13}, {127, 32}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="1763698"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -328,22 +349,27 @@ A</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<string key="IBUIText">GPS Info</string>
+										<reference key="IBUITextColor" ref="950994020"/>
+										<nil key="IBUIHighlightedColor"/>
+										<int key="IBUIBaselineAdjustment">1</int>
+										<float key="IBUIMinimumFontSize">10</float>
+										<object class="IBUIFontDescription" key="IBUIFontDescription">
+											<string key="name">Helvetica-Bold</string>
+											<string key="family">Helvetica</string>
+											<int key="traits">2</int>
+											<double key="pointSize">24</double>
+										</object>
 										<object class="NSFont" key="IBUIFont">
 											<string key="NSName">Helvetica-Bold</string>
 											<double key="NSSize">24</double>
 											<int key="NSfFlags">16</int>
 										</object>
-										<reference key="IBUITextColor" ref="950994020"/>
-										<nil key="IBUIHighlightedColor"/>
-										<int key="IBUIBaselineAdjustment">1</int>
-										<float key="IBUIMinimumFontSize">10</float>
 									</object>
 									<object class="IBUILabel" id="836258863">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{108, 82}, {131, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="187385121"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -356,13 +382,14 @@ A</string>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 										<float key="IBUIMinimumFontSize">17</float>
+										<reference key="IBUIFontDescription" ref="669175592"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="987200899">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{108, 111}, {136, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="368104184"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -375,13 +402,14 @@ A</string>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 										<float key="IBUIMinimumFontSize">17</float>
+										<reference key="IBUIFontDescription" ref="669175592"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="262369059">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{108, 140}, {136, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="714594225"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -394,13 +422,14 @@ A</string>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 										<float key="IBUIMinimumFontSize">17</float>
+										<reference key="IBUIFontDescription" ref="669175592"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="369690055">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{108, 169}, {143, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="1044179758"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
@@ -413,13 +442,14 @@ A</string>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 										<float key="IBUIMinimumFontSize">17</float>
+										<reference key="IBUIFontDescription" ref="669175592"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 									<object class="IBUILabel" id="167896937">
 										<reference key="NSNextResponder" ref="925690613"/>
 										<int key="NSvFlags">292</int>
 										<string key="NSFrame">{{150, 193}, {101, 21}}</string>
 										<reference key="NSSuperview" ref="925690613"/>
-										<reference key="NSWindow"/>
 										<bool key="IBUIOpaque">NO</bool>
 										<bool key="IBUIClipsSubviews">YES</bool>
 										<int key="IBUIContentMode">7</int>
@@ -431,11 +461,12 @@ A</string>
 										<int key="IBUIBaselineAdjustment">1</int>
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 										<float key="IBUIMinimumFontSize">17</float>
+										<reference key="IBUIFontDescription" ref="669175592"/>
+										<reference key="IBUIFont" ref="192785276"/>
 									</object>
 								</array>
 								<string key="NSFrame">{{28, 130}, {264, 267}}</string>
 								<reference key="NSSuperview" ref="42061531"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="710605185"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">3</int>
@@ -449,14 +480,12 @@ A</string>
 						</array>
 						<string key="NSFrame">{{0, 20}, {320, 411}}</string>
 						<reference key="NSSuperview"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="696056706"/>
 						<reference key="IBUIBackgroundColor" ref="782640094"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 					<object class="IBUITabBarItem" key="IBUITabBarItem" id="558130610">
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<reference key="IBUITabBar" ref="709503856"/>
 						<int key="IBUISystemItemIdentifier">0</int>
 					</object>
 					<array key="IBUIToolbarItems" id="0"/>
@@ -488,7 +517,6 @@ A</string>
 								<string key="NSResourceName">camera.png</string>
 							</object>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<reference key="IBUITabBar" ref="709503856"/>
 						</object>
 						<reference key="IBUIParentViewController" ref="327829679"/>
 						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
@@ -506,7 +534,6 @@ A</string>
 								<string key="NSResourceName">icon_datasource.png</string>
 							</object>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<reference key="IBUITabBar" ref="709503856"/>
 						</object>
 						<reference key="IBUIParentViewController" ref="327829679"/>
 						<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
@@ -544,7 +571,6 @@ A</string>
 									<float key="IBUISectionFooterHeight">22</float>
 								</object>
 								<object class="IBUINavigationItem" key="IBUINavigationItem" id="738252914">
-									<reference key="IBUINavigationBar"/>
 									<string key="IBUITitle">Sources</string>
 									<object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="485642304">
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -572,7 +598,6 @@ A</string>
 								<string key="NSResourceName">list.png</string>
 							</object>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<reference key="IBUITabBar" ref="709503856"/>
 						</object>
 						<reference key="IBUIParentViewController" ref="327829679"/>
 						<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
@@ -645,7 +670,6 @@ A</string>
 								<string key="NSResourceName">map.png</string>
 							</object>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							<reference key="IBUITabBar" ref="709503856"/>
 						</object>
 						<reference key="IBUIToolbarItems" ref="0"/>
 						<reference key="IBUIParentViewController" ref="327829679"/>
@@ -663,21 +687,11 @@ A</string>
 					<int key="NSvFlags">266</int>
 					<string key="NSFrame">{{0, 431}, {320, 49}}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView"/>
 					<object class="NSColor" key="IBUIBackgroundColor">
 						<int key="NSColorSpace">3</int>
 						<bytes key="NSWhite">MCAwAA</bytes>
 					</object>
 					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					<array class="NSMutableArray" key="IBUIItems">
-						<reference ref="388073832"/>
-						<reference ref="776007183"/>
-						<reference ref="781644674"/>
-						<reference ref="552553944"/>
-						<reference ref="558130610"/>
-					</array>
-					<reference key="IBUISelectedItem" ref="558130610"/>
 				</object>
 			</object>
 			<object class="IBUIView" id="1019770978">
@@ -706,7 +720,6 @@ A</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<string key="IBUIText">Loading</string>
-						<reference key="IBUIFont" ref="904794252"/>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">6</int>
 							<string key="NSCatalogName">System</string>
@@ -719,6 +732,8 @@ A</string>
 						<nil key="IBUIHighlightedColor"/>
 						<int key="IBUIBaselineAdjustment">1</int>
 						<float key="IBUIMinimumFontSize">10</float>
+						<reference key="IBUIFontDescription" ref="881621182"/>
+						<reference key="IBUIFont" ref="192785276"/>
 					</object>
 				</array>
 				<string key="NSFrameSize">{120, 120}</string>
@@ -733,6 +748,14 @@ A</string>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="664661524"/>
+					</object>
+					<int key="connectionID">99</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">window</string>
@@ -743,19 +766,51 @@ A</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="664661524"/>
+						<string key="label">tabBarController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="327829679"/>
 					</object>
-					<int key="connectionID">99</int>
+					<int key="connectionID">148</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">tabBarController</string>
+						<string key="label">listViewController</string>
 						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="327829679"/>
+						<reference key="destination" ref="848725656"/>
 					</object>
-					<int key="connectionID">148</int>
+					<int key="connectionID">208</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">mapViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="747247695"/>
+					</object>
+					<int key="connectionID">230</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">sourceViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="260344888"/>
+					</object>
+					<int key="connectionID">294</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">moreViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="706579617"/>
+					</object>
+					<int key="connectionID">295</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">notificationView</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="1019770978"/>
+					</object>
+					<int key="connectionID">299</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
@@ -776,34 +831,26 @@ A</string>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">delegate</string>
-						<reference key="source" ref="879232090"/>
-						<reference key="destination" ref="848725656"/>
+						<reference key="source" ref="352701256"/>
+						<reference key="destination" ref="747247695"/>
 					</object>
-					<int key="connectionID">194</int>
+					<int key="connectionID">300</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">dataSource</string>
+						<string key="label">delegate</string>
 						<reference key="source" ref="879232090"/>
 						<reference key="destination" ref="848725656"/>
 					</object>
-					<int key="connectionID">195</int>
+					<int key="connectionID">194</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">listViewController</string>
-						<reference key="source" ref="664661524"/>
+						<string key="label">dataSource</string>
+						<reference key="source" ref="879232090"/>
 						<reference key="destination" ref="848725656"/>
 					</object>
-					<int key="connectionID">208</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">mapViewController</string>
-						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="747247695"/>
-					</object>
-					<int key="connectionID">230</int>
+					<int key="connectionID">195</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
@@ -885,6 +932,14 @@ A</string>
 					</object>
 					<int key="connectionID">280</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">addButton</string>
+						<reference key="source" ref="260344888"/>
+						<reference key="destination" ref="485642304"/>
+					</object>
+					<int key="connectionID">292</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -901,14 +956,6 @@ A</string>
 					</object>
 					<int key="connectionID">287</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">addButton</string>
-						<reference key="source" ref="260344888"/>
-						<reference key="destination" ref="485642304"/>
-					</object>
-					<int key="connectionID">292</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">addSource</string>
@@ -917,38 +964,6 @@ A</string>
 					</object>
 					<int key="connectionID">293</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">sourceViewController</string>
-						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="260344888"/>
-					</object>
-					<int key="connectionID">294</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">moreViewController</string>
-						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="706579617"/>
-					</object>
-					<int key="connectionID">295</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">notificationView</string>
-						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="1019770978"/>
-					</object>
-					<int key="connectionID">299</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="352701256"/>
-						<reference key="destination" ref="747247695"/>
-					</object>
-					<int key="connectionID">300</int>
-				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1272,90 +1287,60 @@ A</string>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<string key="-1.CustomClassName">UIApplication</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="138.IBEditorWindowLastContentRect">{{874, 774}, {320, 480}}</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="138.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="139.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="140.CustomClassName">SourceViewController</string>
 				<string key="140.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="145.CustomClassName">MapViewController</string>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="146.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="192.CustomClassName">ListViewController</string>
 				<string key="192.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="193.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<dictionary class="NSMutableDictionary" key="2.IBAttributePlaceholdersKey"/>
-				<string key="2.IBEditorWindowLastContentRect">{{229, 373}, {320, 480}}</string>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="223.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="229.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="238.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="239.CustomClassName">MoreViewController</string>
+				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="240.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="241.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="241.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAwhgAAA</bytes>
-				</object>
 				<integer value="1" key="241.IUISegmentedControlInspectorSelectedSegmentMetadataKey"/>
 				<string key="248.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="248.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw8oAAA</bytes>
-				</object>
 				<string key="250.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="250.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwwgAAA</bytes>
-				</object>
 				<string key="255.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="255.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABB4AAAw8WAAA</bytes>
-				</object>
 				<string key="257.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="258.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="259.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="260.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="261.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="262.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="262.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw1QAAA</bytes>
-				</object>
 				<string key="263.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="269.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="269.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABC3gAAwpAAAA</bytes>
-				</object>
 				<string key="270.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="270.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABC2AAAwsoAAA</bytes>
-				</object>
 				<string key="271.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="271.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABC2AAAwwIAAA</bytes>
-				</object>
 				<string key="272.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="272.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABC2AAAwx8AAA</bytes>
-				</object>
 				<string key="273.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="273.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABC2AAAwzwAAA</bytes>
-				</object>
 				<string key="274.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="274.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAABDFgAAw1QAAA</bytes>
-				</object>
-				<string key="281.IBEditorWindowLastContentRect">{{329, 894}, {320, 480}}</string>
 				<string key="281.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="282.CustomClassName">SourceViewController</string>
 				<string key="282.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="283.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="284.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="285.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="288.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="290.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="296.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<object class="NSAffineTransform" key="296.IBViewBoundsToFrameTransform">
-					<bytes key="NSTransformStruct">P4AAAL+AAAAAAAAAwuwAAA</bytes>
-				</object>
+				<string key="297.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="298.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="3.CustomClassName">MixareAppDelegate</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -1375,9 +1360,16 @@ A</string>
 						<string key="NS.key.0">dataSourceArray</string>
 						<string key="NS.object.0">NSMutableArray</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">dataSourceArray</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">dataSourceArray</string>
+							<string key="candidateClassName">NSMutableArray</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./classes-xjh84/ListViewController.h</string>
+						<string key="minorKey">./Classes/ListViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1387,9 +1379,16 @@ A</string>
 						<string key="NS.key.0">_map</string>
 						<string key="NS.object.0">MKMapView</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">_map</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">_map</string>
+							<string key="candidateClassName">MKMapView</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./classes-xjh84/MapViewController.h</string>
+						<string key="minorKey">./Classes/MapViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1409,9 +1408,59 @@ A</string>
 						<string key="valueLabel">UILabel</string>
 						<string key="window">UIWindow</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="data">
+							<string key="name">data</string>
+							<string key="candidateClassName">NSMutableArray</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="listViewController">
+							<string key="name">listViewController</string>
+							<string key="candidateClassName">ListViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="mapViewController">
+							<string key="name">mapViewController</string>
+							<string key="candidateClassName">MapViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="menuButton">
+							<string key="name">menuButton</string>
+							<string key="candidateClassName">UISegmentedControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="menuView">
+							<string key="name">menuView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="moreViewController">
+							<string key="name">moreViewController</string>
+							<string key="candidateClassName">MoreViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="notificationView">
+							<string key="name">notificationView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="slider">
+							<string key="name">slider</string>
+							<string key="candidateClassName">UISlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sourceViewController">
+							<string key="name">sourceViewController</string>
+							<string key="candidateClassName">SourceViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="tabBarController">
+							<string key="name">tabBarController</string>
+							<string key="candidateClassName">UITabBarController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="valueLabel">
+							<string key="name">valueLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="window">
+							<string key="name">window</string>
+							<string key="candidateClassName">UIWindow</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./classes-xjh84/MixareAppDelegate.h</string>
+						<string key="minorKey">./Classes/MixareAppDelegate.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1421,6 +1470,16 @@ A</string>
 						<string key="buttonClick:">id</string>
 						<string key="switchView:">id</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="buttonClick:">
+							<string key="name">buttonClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="switchView:">
+							<string key="name">switchView:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="accuracy">UILabel</string>
 						<string key="alt">UILabel</string>
@@ -1433,9 +1492,51 @@ A</string>
 						<string key="tabSwitch">UISegmentedControl</string>
 						<string key="textView">UITextView</string>
 					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="accuracy">
+							<string key="name">accuracy</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="alt">
+							<string key="name">alt</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="date">
+							<string key="name">date</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="generalInfoView">
+							<string key="name">generalInfoView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="lat">
+							<string key="name">lat</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="logoButton">
+							<string key="name">logoButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="lon">
+							<string key="name">lon</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="speed">
+							<string key="name">speed</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="tabSwitch">
+							<string key="name">tabSwitch</string>
+							<string key="candidateClassName">UISegmentedControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="textView">
+							<string key="name">textView</string>
+							<string key="candidateClassName">UITextView</string>
+						</object>
+					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./classes-xjh84/MoreViewController.h</string>
+						<string key="minorKey">./Classes/MoreViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1443,7 +1544,7 @@ A</string>
 					<string key="superclassName">NSArray</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./classes-xjh84/NSMutableArray.h</string>
+						<string key="minorKey">./Classes/NSMutableArray.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1453,21 +1554,38 @@ A</string>
 						<string key="NS.key.0">addSource</string>
 						<string key="NS.object.0">id</string>
 					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">addSource</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">addSource</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<string key="NS.key.0">addButton</string>
 						<string key="NS.object.0">UIBarButtonItem</string>
 					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addButton</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addButton</string>
+							<string key="candidateClassName">UIBarButtonItem</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./classes-xjh84/SourceViewController.h</string>
+						<string key="minorKey">./Classes/SourceViewController.h</string>
 					</object>
 				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1280" key="NS.object.0"/>
+		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../Mixare.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<string key="camera.png">{24, 18}</string>
@@ -1476,6 +1594,6 @@ A</string>
 			<string key="map.png">{26, 21}</string>
 			<string key="mixare_button.png">{413, 113}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">106</string>
+		<string key="IBCocoaTouchPluginVersion">931</string>
 	</data>
 </archive>
diff --git a/Mixare.xcodeproj/project.pbxproj b/Mixare.xcodeproj/project.pbxproj
index 7b52a23..d61d294 100644
--- a/Mixare.xcodeproj/project.pbxproj
+++ b/Mixare.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -406,10 +406,11 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastUpgradeCheck = 0420;
 				ORGANIZATIONNAME = "Peer GmbH";
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Mixare" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -522,7 +523,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Mixare_Prefix.pch;
 				INFOPLIST_FILE = "Mixare-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				PRODUCT_NAME = Mixare;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -536,7 +537,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Mixare_Prefix.pch;
 				INFOPLIST_FILE = "Mixare-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				PRODUCT_NAME = Mixare;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -551,8 +552,7 @@
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.1;
-				PREBINDING = NO;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
 				VALID_ARCHS = "armv6 armv7";
@@ -568,9 +568,8 @@
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-				PREBINDING = NO;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = NO;