From 09266601f747f8cd1e2af463d90e0e602cde4f9e Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Tue, 17 Apr 2012 20:24:19 +0300
Subject: [PATCH] [ios] Added bookmark icon

---
 iphone/Maps/Classes/MapViewController.h       |   2 +
 iphone/Maps/Classes/MapViewController.mm      |  10 ++
 iphone/Maps/MainWindow.xib                    | 146 +++++++----------
 iphone/Maps/Maps.xcodeproj/project.pbxproj    |  24 +++
 .../Maps/Resources-iPad/MainWindow-iPad.xib   | 155 +++++++++++++++++-
 iphone/Maps/bookmarks-highlighted.png         | Bin 0 -> 3914 bytes
 iphone/Maps/bookmarks-highlighted@2x.png      | Bin 0 -> 7049 bytes
 iphone/Maps/bookmarks.png                     | Bin 0 -> 2724 bytes
 iphone/Maps/bookmarks@2x.png                  | Bin 0 -> 4804 bytes
 9 files changed, 241 insertions(+), 96 deletions(-)
 create mode 100644 iphone/Maps/bookmarks-highlighted.png
 create mode 100644 iphone/Maps/bookmarks-highlighted@2x.png
 create mode 100644 iphone/Maps/bookmarks.png
 create mode 100644 iphone/Maps/bookmarks@2x.png

diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h
index 8b5fda5bca..537f3b92f2 100644
--- a/iphone/Maps/Classes/MapViewController.h
+++ b/iphone/Maps/Classes/MapViewController.h
@@ -34,11 +34,13 @@
 - (IBAction)OnMyPositionClicked:(id)sender;
 - (IBAction)OnSettingsClicked:(id)sender;
 - (IBAction)OnSearchClicked:(id)sender;
+- (IBAction)OnBookmarksClicked:(id)sender;
 
 -(BOOL)OnProcessURL:(NSString*)url;
 
 @property (nonatomic, retain) IBOutlet UIButton * m_myPositionButton;
 @property (nonatomic, retain) IBOutlet UIButton * m_searchButton;
 @property (nonatomic, retain) IBOutlet UIButton * m_downloadButton;
+@property (nonatomic, retain) IBOutlet UIButton * m_bookmarksButton;
 
 @end
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 3351a9ce13..77e3df7dbc 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -3,6 +3,7 @@
 #import "MapsAppDelegate.h"
 #import "EAGLView.h"
 #import "BalloonView.h"
+#import "BookmarksVC.h"
 #import "../Settings/SettingsManager.h"
 #import "../../Common/CustomAlertView.h"
 
@@ -15,6 +16,7 @@
 @synthesize m_myPositionButton;
 @synthesize m_searchButton;
 @synthesize m_downloadButton;
+@synthesize m_bookmarksButton;
 
 // @TODO Make m_framework and m_storage MapsAppDelegate properties instead of global variables.
 Framework * m_framework = NULL;
@@ -105,6 +107,14 @@ Framework * m_framework = NULL;
   [searchVC release];
 }
 
+- (IBAction)OnBookmarksClicked:(id)sender
+{
+  BookmarksVC * bVC = [[BookmarksVC alloc] initWithFramework:m_framework];
+  [self presentModalViewController:bVC animated:YES];
+  [bVC release];
+}
+
+
 - (void)onBookmarkClicked
 {
   m2::PointD const ptG = m2::PointD(m_bookmark.glbPos.x, m_bookmark.glbPos.y);
diff --git a/iphone/Maps/MainWindow.xib b/iphone/Maps/MainWindow.xib
index 3e8bc6ee26..ff3a4a8082 100644
--- a/iphone/Maps/MainWindow.xib
+++ b/iphone/Maps/MainWindow.xib
@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1024</int>
 		<string key="IBDocument.SystemVersion">11D50</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2177</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
 		<string key="IBDocument.AppKitVersion">1138.32</string>
 		<string key="IBDocument.HIToolboxVersion">568.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1173</string>
+			<string key="NS.object.0">1181</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBUIWindow</string>
@@ -48,7 +48,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{10, 435}, {40, 40}}</string>
 							<reference key="NSSuperview" ref="53915144"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="773974234"/>
 							<string key="NSReuseIdentifierKey">_NS:222</string>
 							<bool key="IBUIOpaque">NO</bool>
@@ -97,7 +96,36 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{110, 435}, {40, 40}}</string>
 							<reference key="NSSuperview" ref="53915144"/>
-							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="431157229"/>
+							<string key="NSReuseIdentifierKey">_NS:222</string>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<int key="IBUIContentHorizontalAlignment">0</int>
+							<int key="IBUIContentVerticalAlignment">0</int>
+							<reference key="IBUIHighlightedTitleColor" ref="933778228"/>
+							<object class="NSColor" key="IBUINormalTitleColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA</bytes>
+							</object>
+							<reference key="IBUINormalTitleShadowColor" ref="538042181"/>
+							<object class="NSCustomResource" key="IBUIHighlightedImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">bookmarks-highlighted.png</string>
+							</object>
+							<object class="NSCustomResource" key="IBUINormalImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">bookmarks.png</string>
+							</object>
+							<reference key="IBUIFontDescription" ref="757694151"/>
+							<reference key="IBUIFont" ref="142678927"/>
+						</object>
+						<object class="IBUIButton" id="431157229">
+							<reference key="NSNextResponder" ref="53915144"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{160, 435}, {40, 40}}</string>
+							<reference key="NSSuperview" ref="53915144"/>
+							<reference key="NSNextKeyView"/>
 							<string key="NSReuseIdentifierKey">_NS:222</string>
 							<bool key="IBUIOpaque">NO</bool>
 							<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -126,7 +154,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{60, 435}, {40, 40}}</string>
 							<reference key="NSSuperview" ref="53915144"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="23888313"/>
 							<string key="NSReuseIdentifierKey">_NS:222</string>
 							<bool key="IBUIOpaque">NO</bool>
@@ -154,7 +181,6 @@
 					</array>
 					<string key="NSFrame">{{0, 20}, {320, 480}}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="803813744"/>
 					<object class="NSColor" key="IBUIBackgroundColor">
 						<int key="NSColorSpace">3</int>
@@ -260,12 +286,12 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">OnSearchClicked:</string>
+						<string key="label">OnBookmarksClicked:</string>
 						<reference key="source" ref="23888313"/>
 						<reference key="destination" ref="532797962"/>
 						<int key="IBEventType">1</int>
 					</object>
-					<int key="connectionID">222</int>
+					<int key="connectionID">226</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
@@ -276,6 +302,15 @@
 					</object>
 					<int key="connectionID">223</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">OnSearchClicked:</string>
+						<reference key="source" ref="431157229"/>
+						<reference key="destination" ref="532797962"/>
+						<int key="IBEventType">1</int>
+					</object>
+					<int key="connectionID">225</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -323,6 +358,7 @@
 							<reference ref="803813744"/>
 							<reference ref="773974234"/>
 							<reference ref="23888313"/>
+							<reference ref="431157229"/>
 						</array>
 						<reference key="parent" ref="963277495"/>
 					</object>
@@ -341,6 +377,11 @@
 						<reference key="object" ref="23888313"/>
 						<reference key="parent" ref="53915144"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">224</int>
+						<reference key="object" ref="431157229"/>
+						<reference key="parent" ref="53915144"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -359,10 +400,13 @@
 				<real value="0.0" key="200.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="201.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="201.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="1" key="201.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="0.0" key="201.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="202.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="1" key="202.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="224.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="224.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
+				<real value="1" key="224.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="3.CustomClassName">MapsAppDelegate</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
@@ -370,18 +414,10 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">223</int>
+			<int key="maxID">226</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">EAGLView</string>
-					<string key="superclassName">UIView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/EAGLView.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstResponder</string>
 					<dictionary class="NSMutableDictionary" key="actions">
@@ -408,74 +444,6 @@
 						<string key="minorKey"/>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MapViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="OnMyPositionClicked:">id</string>
-						<string key="OnSearchClicked:">id</string>
-						<string key="OnSettingsClicked:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="OnMyPositionClicked:">
-							<string key="name">OnMyPositionClicked:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="OnSearchClicked:">
-							<string key="name">OnSearchClicked:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="OnSettingsClicked:">
-							<string key="name">OnSettingsClicked:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="m_downloadButton">UIButton</string>
-						<string key="m_myPositionButton">UIButton</string>
-						<string key="m_searchButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="m_downloadButton">
-							<string key="name">m_downloadButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="m_myPositionButton">
-							<string key="name">m_myPositionButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="m_searchButton">
-							<string key="name">m_searchButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MapViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">MapsAppDelegate</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="m_mapViewController">MapViewController</string>
-						<string key="m_window">UIWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="m_mapViewController">
-							<string key="name">m_mapViewController</string>
-							<string key="candidateClassName">MapViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="m_window">
-							<string key="name">m_window</string>
-							<string key="candidateClassName">UIWindow</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MapsAppDelegate.h</string>
-					</object>
-				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
@@ -486,7 +454,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1280" key="NS.object.0"/>
+			<real value="1296" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -495,6 +463,8 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="bookmarks-highlighted.png">{48, 48}</string>
+			<string key="bookmarks.png">{48, 48}</string>
 			<string key="downloader-highlighted.png">{48, 48}</string>
 			<string key="downloader.png">{48, 48}</string>
 			<string key="location-highlighted.png">{48, 48}</string>
@@ -503,6 +473,6 @@
 			<string key="search-highlighted.png">{48, 48}</string>
 			<string key="search.png">{48, 48}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1173</string>
+		<string key="IBCocoaTouchPluginVersion">1181</string>
 	</data>
 </archive>
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 0a30e8fa96..899ba4fc46 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -98,6 +98,14 @@
 		FA81AE3314D061BF00A0D70D /* SearchCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA81AE3214D061BF00A0D70D /* SearchCell.mm */; };
 		FA85F633145DDDC20090E1A0 /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA85F632145DDDC20090E1A0 /* packed_polygons.bin */; };
 		FA87151B12B1518F00592DAF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA87151A12B1518F00592DAF /* SystemConfiguration.framework */; };
+		FA8A71D4153D83C8005D9795 /* bookmarks-highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D0153D83C8005D9795 /* bookmarks-highlighted.png */; };
+		FA8A71D5153D83C8005D9795 /* bookmarks-highlighted.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D0153D83C8005D9795 /* bookmarks-highlighted.png */; };
+		FA8A71D6153D83C8005D9795 /* bookmarks-highlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D1153D83C8005D9795 /* bookmarks-highlighted@2x.png */; };
+		FA8A71D7153D83C8005D9795 /* bookmarks-highlighted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D1153D83C8005D9795 /* bookmarks-highlighted@2x.png */; };
+		FA8A71D8153D83C8005D9795 /* bookmarks.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D2153D83C8005D9795 /* bookmarks.png */; };
+		FA8A71D9153D83C8005D9795 /* bookmarks.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D2153D83C8005D9795 /* bookmarks.png */; };
+		FA8A71DA153D83C8005D9795 /* bookmarks@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D3153D83C8005D9795 /* bookmarks@2x.png */; };
+		FA8A71DB153D83C8005D9795 /* bookmarks@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8A71D3153D83C8005D9795 /* bookmarks@2x.png */; };
 		FA8F8938132D5DB00048E3FE /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA8F8937132D5DB00048E3FE /* libtomcrypt.a */; };
 		FA8F9331150218F10057B215 /* food.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9325150218F10057B215 /* food.png */; };
 		FA8F9332150218F10057B215 /* food@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA8F9326150218F10057B215 /* food@2x.png */; };
@@ -1360,6 +1368,10 @@
 		FA81AE3214D061BF00A0D70D /* SearchCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchCell.mm; sourceTree = "<group>"; };
 		FA85F632145DDDC20090E1A0 /* packed_polygons.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = packed_polygons.bin; path = ../../data/packed_polygons.bin; sourceTree = SOURCE_ROOT; };
 		FA87151A12B1518F00592DAF /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		FA8A71D0153D83C8005D9795 /* bookmarks-highlighted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bookmarks-highlighted.png"; sourceTree = "<group>"; };
+		FA8A71D1153D83C8005D9795 /* bookmarks-highlighted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bookmarks-highlighted@2x.png"; sourceTree = "<group>"; };
+		FA8A71D2153D83C8005D9795 /* bookmarks.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bookmarks.png; sourceTree = "<group>"; };
+		FA8A71D3153D83C8005D9795 /* bookmarks@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bookmarks@2x.png"; sourceTree = "<group>"; };
 		FA8F8937132D5DB00048E3FE /* libtomcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libtomcrypt.a; sourceTree = SOURCE_ROOT; };
 		FA8F9325150218F10057B215 /* food.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = food.png; sourceTree = "<group>"; };
 		FA8F9326150218F10057B215 /* food@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "food@2x.png"; sourceTree = "<group>"; };
@@ -2060,6 +2072,10 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				FA8A71D0153D83C8005D9795 /* bookmarks-highlighted.png */,
+				FA8A71D1153D83C8005D9795 /* bookmarks-highlighted@2x.png */,
+				FA8A71D2153D83C8005D9795 /* bookmarks.png */,
+				FA8A71D3153D83C8005D9795 /* bookmarks@2x.png */,
 				FA68E1581525F8F400077B9E /* marker.png */,
 				FA68E1591525F8F400077B9E /* marker@2x.png */,
 				FA68E15A1525F8F400077B9E /* star.png */,
@@ -3420,6 +3436,10 @@
 				FA68E1621525F8F400077B9E /* star@2x.png in Resources */,
 				FA68E1671525F92700077B9E /* Default-Landscape@2x.png in Resources */,
 				FA68E1691525F92700077B9E /* Default-Portrait@2x.png in Resources */,
+				FA8A71D4153D83C8005D9795 /* bookmarks-highlighted.png in Resources */,
+				FA8A71D6153D83C8005D9795 /* bookmarks-highlighted@2x.png in Resources */,
+				FA8A71D8153D83C8005D9795 /* bookmarks.png in Resources */,
+				FA8A71DA153D83C8005D9795 /* bookmarks@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4008,6 +4028,10 @@
 				FA68E1631525F8F400077B9E /* star@2x.png in Resources */,
 				FA68E1681525F92700077B9E /* Default-Landscape@2x.png in Resources */,
 				FA68E16A1525F92700077B9E /* Default-Portrait@2x.png in Resources */,
+				FA8A71D5153D83C8005D9795 /* bookmarks-highlighted.png in Resources */,
+				FA8A71D7153D83C8005D9795 /* bookmarks-highlighted@2x.png in Resources */,
+				FA8A71D9153D83C8005D9795 /* bookmarks.png in Resources */,
+				FA8A71DB153D83C8005D9795 /* bookmarks@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/iphone/Maps/Resources-iPad/MainWindow-iPad.xib b/iphone/Maps/Resources-iPad/MainWindow-iPad.xib
index 1f057faf68..27b944505d 100644
--- a/iphone/Maps/Resources-iPad/MainWindow-iPad.xib
+++ b/iphone/Maps/Resources-iPad/MainWindow-iPad.xib
@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1024</int>
 		<string key="IBDocument.SystemVersion">11D50</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2177</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
 		<string key="IBDocument.AppKitVersion">1138.32</string>
 		<string key="IBDocument.HIToolboxVersion">568.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1173</string>
+			<string key="NS.object.0">1181</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBUIWindow</string>
@@ -43,6 +43,7 @@
 				<object class="NSPSMatrix" key="NSFrameMatrix"/>
 				<string key="NSFrameSize">{768, 1024}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -65,6 +66,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{22, 899}, {44, 44}}</string>
 							<reference key="NSSuperview" ref="53915144"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="832785650"/>
 							<string key="NSReuseIdentifierKey">_NS:237</string>
 							<bool key="IBUIOpaque">NO</bool>
@@ -112,6 +114,36 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{150, 899}, {44, 44}}</string>
 							<reference key="NSSuperview" ref="53915144"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="82412579"/>
+							<string key="NSReuseIdentifierKey">_NS:237</string>
+							<bool key="IBUIOpaque">NO</bool>
+							<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+							<int key="IBUIContentHorizontalAlignment">0</int>
+							<int key="IBUIContentVerticalAlignment">0</int>
+							<reference key="IBUIHighlightedTitleColor" ref="95748844"/>
+							<object class="NSColor" key="IBUINormalTitleColor">
+								<int key="NSColorSpace">1</int>
+								<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+							</object>
+							<reference key="IBUINormalTitleShadowColor" ref="422857318"/>
+							<object class="NSCustomResource" key="IBUIHighlightedImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">bookmarks-highlighted.png</string>
+							</object>
+							<object class="NSCustomResource" key="IBUINormalImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">bookmarks.png</string>
+							</object>
+							<reference key="IBUIFontDescription" ref="995536267"/>
+							<reference key="IBUIFont" ref="624138544"/>
+						</object>
+						<object class="IBUIButton" id="82412579">
+							<reference key="NSNextResponder" ref="53915144"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{214, 899}, {44, 44}}</string>
+							<reference key="NSSuperview" ref="53915144"/>
+							<reference key="NSWindow"/>
 							<string key="NSReuseIdentifierKey">_NS:237</string>
 							<bool key="IBUIOpaque">NO</bool>
 							<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -139,6 +171,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{86, 899}, {44, 44}}</string>
 							<reference key="NSSuperview" ref="53915144"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="312081333"/>
 							<string key="NSReuseIdentifierKey">_NS:237</string>
 							<bool key="IBUIOpaque">NO</bool>
@@ -165,6 +198,7 @@
 					</array>
 					<string key="NSFrameSize">{768, 960}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="68084817"/>
 					<object class="NSColor" key="IBUIBackgroundColor">
 						<int key="NSColorSpace">3</int>
@@ -255,12 +289,12 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">OnSearchClicked:</string>
+						<string key="label">OnBookmarksClicked:</string>
 						<reference key="source" ref="312081333"/>
 						<reference key="destination" ref="532797962"/>
 						<int key="IBEventType">1</int>
 					</object>
-					<int key="connectionID">202</int>
+					<int key="connectionID">206</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
@@ -271,6 +305,15 @@
 					</object>
 					<int key="connectionID">203</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">OnSearchClicked:</string>
+						<reference key="source" ref="82412579"/>
+						<reference key="destination" ref="532797962"/>
+						<int key="IBEventType">1</int>
+					</object>
+					<int key="connectionID">205</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -318,6 +361,7 @@
 							<reference ref="68084817"/>
 							<reference ref="312081333"/>
 							<reference ref="832785650"/>
+							<reference ref="82412579"/>
 						</array>
 						<reference key="parent" ref="963277495"/>
 					</object>
@@ -336,6 +380,11 @@
 						<reference key="object" ref="312081333"/>
 						<reference key="parent" ref="53915144"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="82412579"/>
+						<reference key="parent" ref="53915144"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -350,7 +399,7 @@
 				<string key="190.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="2" key="190.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="191.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<real value="1" key="191.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="0.0" key="191.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="192.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="1" key="192.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<dictionary class="NSMutableDictionary" key="2.IBAttributePlaceholdersKey"/>
@@ -359,6 +408,8 @@
 					<integer value="0" key="NS.object.0"/>
 				</object>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="204.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="1" key="204.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="3.CustomClassName">MapsAppDelegate</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
@@ -366,10 +417,18 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">203</int>
+			<int key="maxID">206</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">EAGLView</string>
+					<string key="superclassName">UIView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/EAGLView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstResponder</string>
 					<dictionary class="NSMutableDictionary" key="actions">
@@ -396,6 +455,84 @@
 						<string key="minorKey"/>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MapViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="OnBookmarksClicked:">id</string>
+						<string key="OnMyPositionClicked:">id</string>
+						<string key="OnSearchClicked:">id</string>
+						<string key="OnSettingsClicked:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="OnBookmarksClicked:">
+							<string key="name">OnBookmarksClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="OnMyPositionClicked:">
+							<string key="name">OnMyPositionClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="OnSearchClicked:">
+							<string key="name">OnSearchClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="OnSettingsClicked:">
+							<string key="name">OnSettingsClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="m_bookmarksButton">UIButton</string>
+						<string key="m_downloadButton">UIButton</string>
+						<string key="m_myPositionButton">UIButton</string>
+						<string key="m_searchButton">UIButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="m_bookmarksButton">
+							<string key="name">m_bookmarksButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="m_downloadButton">
+							<string key="name">m_downloadButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="m_myPositionButton">
+							<string key="name">m_myPositionButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="m_searchButton">
+							<string key="name">m_searchButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MapViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MapsAppDelegate</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="m_mapViewController">MapViewController</string>
+						<string key="m_window">UIWindow</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="m_mapViewController">
+							<string key="name">m_mapViewController</string>
+							<string key="candidateClassName">MapViewController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="m_window">
+							<string key="name">m_window</string>
+							<string key="candidateClassName">UIWindow</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MapsAppDelegate.h</string>
+					</object>
+				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
@@ -406,7 +543,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1280" key="NS.object.0"/>
+			<real value="1296" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
@@ -415,6 +552,8 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="bookmarks-highlighted.png">{48, 48}</string>
+			<string key="bookmarks.png">{48, 48}</string>
 			<string key="downloader-highlighted.png">{48, 48}</string>
 			<string key="downloader.png">{48, 48}</string>
 			<string key="location-highlighted.png">{48, 48}</string>
@@ -423,6 +562,6 @@
 			<string key="search-highlighted.png">{48, 48}</string>
 			<string key="search.png">{48, 48}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1173</string>
+		<string key="IBCocoaTouchPluginVersion">1181</string>
 	</data>
 </archive>
diff --git a/iphone/Maps/bookmarks-highlighted.png b/iphone/Maps/bookmarks-highlighted.png
new file mode 100644
index 0000000000000000000000000000000000000000..0826bf60ca2e555535aa11d1a87ee2aef1418d57
GIT binary patch
literal 3914
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
MOl@(MSnrts1CkTS#{d8T

literal 0
HcmV?d00001

diff --git a/iphone/Maps/bookmarks-highlighted@2x.png b/iphone/Maps/bookmarks-highlighted@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..460dba94eb715a90efbbd9906e6146224874569f
GIT binary patch
literal 7049
zcmbVxXH-+$)^<W56hRQA1OY>6(i1`ry@cKbl-_ITy%R$~0YOl@(yJiSL{O0uibxYs
z=_tfPuZIpIeDU6M?)Uz<<NfjOG4^VE&S#c2=U#ivon&mNMMuL<0{{T%bhI^0NWH_K
zn+i;7zvqU@k~&B*+9KH0&n-C2G0+vD>f-0*3f1v(baypzb##dc7;sep06-oXGmBsg
z1AUaUpO2X19~!Z6AAb@z0HB~8?(gXA<r)lia&^b}D#EtkcEX?-7e$!4lmXnpU)|LM
zqa7LOY8q*1<{ateEaw7KR)Q*oqeuWguECDba362qAXK;_>|eMj()iD^I1KtPl3*`I
z*uRysFffLy`vtl}rNrQ(&Twf2R9aFDAqkh0loNqUz!7k9goHR;Mic=@Ny(t#2<YDz
zj3h14#SLYmq4~Eg(o7NN5ghD~5*H5(3lj@Niunb)izDRZ<iz0;;t~>~Bnr`>2;X4G
za8chNo_`QDT!WkgG5*0AKVRq{L`NsTkYGg^Nz;Fu;Nx##@E>5`puZhOa+!FzqrW&p
z3@+~D^T)1#Q3nN^xc+}N{wsBmS%kl<xQT0!Ur3-cX+PX}{$VEh?td5bhmfQV$|w*+
z+7w4`4L|1)A6MUC9Subo>4}&N#s#G*E2D`($VkFvB;eAr2!yPvIzm-LLrqpjP6CaP
zM*M^E-*^$KGSYGqlB7l&fk2=UYEno|bxB!CNeQ@|gftTU53i1IP_Uz~v+F-{F(kQv
z^Gg4(yeRcRSI1z#Kr=r-?|&k|*uyW_FUZ5sAF6IDC5C_+I67l||E&Dkpnuz|;Tnhu
zb#>7U^z(uK%fl$lf6+ivRZ~p^jzG$4{B5}mLQ_pnQU-}s(~v}~tHS=~b@{(|O`N2R
z_@D6jAK~)P5-A4%4F41Sq{)BM$JLjVGl8V!=&VXJ003BD>1e2$h0ku-Vp43-=_Ak9
z>N>U$Cw#mkvIFv@9a7(IG&uio1owWxJ4li>;+3_vp}Y)?%HQbKw4n^z+8lV!a}i;3
zo*<gg$er+ewhn~h+5DbW%&XDRg$diEz9ZBR1GCVj8uN+8x;2Q&eQf<R`}Uj@w2O<2
zhD(RGQjxiG=33SYJ%ib+@rm%?PZDo4gfP~^)?oM7FKT)3uLK4E;5k)5OKJw^dgQO%
z_~>0L4L5NXsw$`|@~BlhG+XH?)1XYecMz~k2|lX@tUS<IPmIi2dHg={kSV4bvP=IS
z$3=JMR@xzSi9q#H;K`M;p;X`_ZQlLneUX(-)zYT;^SUfDs1ocnb2hj<UV1_av;ui}
z{8?&es04TALd)lx?ICUPFTawW(V<7jKi;R+q$!_U#2ieRul3L?@24^`G0k7>#7O5I
zj5s&uqJE?x+xAjZFNf?72-Gx<D$U7%|FyNX6&Tg)R~>W5E}I0^oqqCInpHh(X2w!V
zQnEaBbGBkWde5LaY<vEG;vVK{L8Vy7u~W$T$#TslvDYe6Qc_vFK~-f7H{}z&(t)Xg
zVjqoq>}Ux^cg`aYz9);HGGa?<BKw=C>}q`5{?bh2=F3!OXg6QK&A_iOpLkw9eYe_7
zSMlge&{`}dm+=Djm(Q)Mzwgmq8z-%m`L?d|GpD`pIs55V8n#bfzr+SuUt-lbcsD+b
z998%MyhBvEWw6s}pmF+Z;%nGKt?!$~Z1|d>!Tv%+wr3L1eI-`9q3v+iYwd8(ul`AI
z!s?YY#lzgzjTb}RHs{vUWXUmZeE9*(S3%ct_8}9u)^>-)>n(TQ6jt%9v6mJqPx;h)
z(jS|b-l1+KF6P+ZmRX42!*^xrzkl*1@sUoR4CT6eQOs>ylDFSsPsKi7n8g7v^n<Zu
z(5NZfu<G~M?|h+=&Z}R#&~K8i!qQqH+y<kb9Q}xzE{wbQ8an5*R+7LaB(1#-JN;}T
zLDVn3gy%P28Qku?z-r(LDvyad-$!orWis0G+~y}XMfXkCTJP0&oO(7=e`WYsSm6M8
zUZ7`l@ul;QG9fMcboD8P%3g%6t!;eT@YQpBN%oM^oS{V)?Pq4!_>n#H$z3BZ5|=tM
zQXm{0X1(!ets(39hKMq=^(r$kVdNq#r&_023wq*!C(lWvMWq6$v<3hXzPiuI=We;5
zSetK4#J-awP@3jauLh(1B*?UI7k$_Ks$yefqj5>6>n2Oo6%xb+n+%Z`t31mEVTJ4v
zh$SF8CZ?TIlByUPOMO<b!D$j{fN4hb_9>iu&kvEa^b(PO9Z75M9~@MNEyS<}B}5Zk
zHf03xK<lKIne%}Cm5=>sR@?H!%{lX8r(E70$z1ebZ%RtI2lc;QG>y-)5rp24kGjzl
ze=$$b1}pC=F?yWq-&4QL3*m;uEqo7OtA6_I)qJF0twm!u#k_Cnk?;V3+z7ka5DJqI
z-7vl$y%U=*L}4<D+q=?B_@O<eaUvrt!#6oTXJei|oWIHbg|d@A==zs9V4obQNS{9_
z{YrFZJFsX}Zkgj?M1Grq3IrY(32D3(^)^0d6$3lb_<@RI{k*;RaeY@7KAI`_4HJ%r
z$xClsC`s5y7ZenUcg#9svQ6j+kl^ana=Y{+ZU)FS2NIxh(Eno4Me}paUmP|$%kyZT
zk+RJ+rBe@$w{<?bzqR-x2`rQ#Sbf{>{nn)?UeAf@-F%20QBlzlk>9<UY`7`?L|tlW
zN<;8mANe^Q(ojNOBE8-n3~=CBURrt~o3KARJnTY9oSB&sQPS%^ax)5Ft;iW?Hn%C^
z(8rCgj3zs(q_sqrvIHRmCoSEpS649$FC2F)XCcQ+OG|8ozBiSq=*o*YK?GbS4Rn*b
z&~;~cV04(=baSk|w62hx@R-_a7Z}W<4;@1SxZ+2XG+;w1faCpwQF2^bR7*?ClJe;a
zkA=20G-y_cUDTYyC*U|4mdg!}r6218Xe*2)t@+nMZc;jdal!OE5Q2keLk!_&E>PhH
zeC(JfD(=A}_GqJBpb`>5^eTy^8EnW}%0(}StAN4rXzcPxf%L7b6Kt2WdT?2heQ%4~
z&QI4174@^sA^`^zsb<Q6d|q;g_bV3kWIQDF#JZZYg(ji<Gm(I}4}je_m{lsU#d}6@
z5kw`Ob_dBj1L3B9TpVkYS9`@)U>n&0;Lov(tRC{hJx}hbkZ>3~<O{I*8nIkJ!Ne)e
z(?xY#o>nQ<$H#~3IC$#{qNK2{n(|oR%&C>~Y8AKXDVpA5Y_V*w|3vE=sQ3;6fHV43
z1O%y!gFcaCpG=ha+7D)85#j@lnEPb<Eq)7^vs~gfGfg04wJ~Rx22G6=nN|Jsh1T>s
z9dH6CR*T`Mg<XDrerZg{0jM-k^y!`aNI<T!5#3Rws+N}4HQOo83omdYxo)7Rr)Okf
zU?96s(fj%9(LsG2gbiQ=fxWf06}1xa;dMNCnmlny)VY`ZyDF+I3V=&{toX3#ZX;fI
zIF~itXSq-%_h(V`u1?yOY`piw_LjzCF~U~bj6!~z!fqlXe_=Y4$mE3r@x?4Re>mZD
zV{9s&1Nm=dL*jet^}c4Wsk%y?4}+2Z6I^ILE`{(NI54ZY&uy<%d*=<YL%4cuZ+0;z
zGAb(S<<<xzlV<0|`L8RjVR){*@je0>I5B{S{#!be4C;G8#MilT(&4r7fRbetqv70&
z12#r&w@)#9dmuZ>6YRskQOMOCh_JS7(@lV?j|h}I!CSHQ)sM~>UOV>O%aHc{a_oF+
zPbr03;;5=pNe|FvR7jA#y4jbg+kE#EDG^j@ZM7VvP-VtuRhLD*CZAjCyh_bz&KQ4I
z<1olTY&D*}Q$GDDA*gD3qQ+cU|C0zs<4BAn8^G{)Z)n1LeW%@nw6tGJ9EBg%zLx|7
zNRjzWEABewaj>_`4)yS1S67#TqN1X3u~he|+L$#}1K32TY5#4$oIR9!o3G2BiF!4o
zFQoj?Dhah(NKMs#Ud^$SwZnYEF9KLDg!WM$3<wle$#1>xIh3W6+`akq{#{-fE1t`5
zLnD%I1_tuPC_-;5dwX_&{|03BOsI-g*`98T*n<|l%3?}{E;XlrXwPQ1C&fjqU9;ze
zXY0{m;Fb=p$NUS|AwjdJV$Y&@CZ<d?s^mw_$KD2vAj4OCoS1tZ4ICD4T<htLuf6Q|
zb2FD1WTYbgP>IvlabcVsw30YKCIN^0)7X9{#F@*HAD}%ei*gw#nLN%c(9lrvr9wEB
zq4Mwj2WCf?Y3GlhuYXv2v90!K1f5qsXmPho+OrWGDH>OtBk3B+<@0Hjc1#PrP-c)P
z?Nh$}BN=!<DR(9wQQp~kM{)Icq3##cslT+w3vYYUr;t-CjehxklDa{`c+G)gSfs+-
zdBa7eQ)*IL(u~0@XUlE?uo=DAHN|vIvbdwZ-j6wC^-ve^uDrHtNq0VD+(H=fGH3Qv
zd@FKiL)PV>$5ZRsbtN)k2Nnm%>^{KHz1KK*r#%BCPh~Anq3z_O)UA46V}bO^dizd%
zszJlUUXgZ{wGWWDkT{27p>Eu(1?(JqghU0d{Yh1B_SLlFivt%A%d2ZZI3%yi;J|}E
z<Elgk9)79Y!m#&A$naE3=*gs!@fkC2h-NLf{yhNKnV;QL$_>Bj0p2*#n%42ai%z6j
z;vfw?pe`13%1P=b%I7b>QbnA+yKgC2$XilFyusl)bdTt-esDKz;;5lDol=+Jn`J;@
z>Ej_1f8%B(Y$?JQtJ#!K5btkmc+=983D~$jYi9hkMwnSxLcJ@P$;+Lk&GJOM8e(xv
z$lu88dfM{xqb)z{Up9Pzw}#h1C~xy8I?n*tmMR}ZUHJ_msUokjrtsPv5Qu@|v!U{6
zh-jpyo!iJjt_s_Rx5X4>1ZF)rK(_NhCCQ$8RqiK|^6id$6(OyOgAJ~vq?E7(3x-l8
z&GF;qBftxN@wfx}T4`{vEs!l|_EC}nhx5b?7&}f~XU`!ZAn<;6ZtkrYXEZKqW4aN7
zs$5c>+IxibWtIQwlIG9+vmd4F>;ayh^v3vV*`yG|g@x(_k)&@-)z%QPeghlfPie;>
zpu*EQY0Ht~F|s8AA00Y}-jo<t!$xEO0Yw$1lpvwUKvWQPXa<bhSiXB+RjyOOxv{;y
zU|d5i6Yc5g$r#VJL=}}qK7B(++i_JAk}rsky79=``p{P}{Dw}GQxb8UPW#deS{2j}
zXdD-=kC!ot+62u+deL(>_v3mJ=#5M{OR$XO-i&xqvUX*C@dJ+<mwN`MJuCyb%yENr
zkB_shDmeoRku!X9Z&M(+!5~6jE`{(79osX84=L6j5~ilsi^Zv0sT{HUqqwSh!EsIk
zkL%s8sR&hywSI~Y9+hp&rIsX%*37(qV@`AJXWS#rKqiL$%2CYMDssgB!~V@`RLMLK
z4-eBgxT+9B7IOK3!jvugWl~ZUAWpot1kY9;_0F|#5|rK|3!l`T0Xym&S9RM33JKw#
zBT%C+IysmVu9@p8m+JH@XkX#3l-K0PAn`Yvp}#5Vx$@&5>l2Mk^W3UL1;?*-mo+U)
zxGlYWQ%QJY_1*3!(%l&s(%&MRL9<_A=<$F}=*IhM?0DVFP@Si;2XR%Y;HsW|P8jai
zL3(<YjGm-{3cfOZr8G(7{#t?4&PSFJh$}O16wXWS9-zH!c$y6mwa2@s`@BG^;`+#q
z7Cb=dX@FO~M>a^ZUm|XwsRB(?`X2C_6{Di0kr2`!S(QEn%%0($h|!EwPNt=XvC(3v
z(pbvz8nz?PE}JOdm=@`E-JE5E+YK6o-%c5Xs;eH7nXwVq!w~|+$N{6BRGI};%Vqho
ziHQ&sv!C%I=-9hKD`O=AWZ_TNHW5Ig`mR(g^-34ETTDAGj3Qauros%&(QKPkplK7=
zz&mq^K>H#720Nj8S>iSKZbYdIgj=}IuR0enSGa%9MtB+tIuj&|N*#AH!P9?_HLtpE
ze_BEF;(&}bl+kMdr`{s`%J-{h78WoV*I1c<+2Ut#gHnyDtb~NKnr61_W11$<;{|zn
z`Kf#legax8T^W4KNTqxCaVGI|iXwWsV?XX;rSCInHa6!}wW|<aCz$X6Nc~j`^+A=*
zc3{aW>(lnv=XGKNQ<$6T5{%v%vK~E{f^nwZai&Rf*8x$M=qKK)o5LPE+$T+DMrlBe
z!u>cP6l`y$(iU!{+o|_k7W^$>3c4Y;;~fxtNxaP;2yzj3IFb~)yQoklf+YKz6O}~k
z5fq;U;^Gj3^8fUx{9?Wu3o%rE;t`Qf-(1G0%-tnW27O0V4=>hS^n`rgrQVGvLu$zp
zpHS~9%j9(uwz!QH{)!J0VOaN4%(<VK=nApmEH`TUd2J|BmYFkyHQcaC61Y)gb_M{6
zNtCWqHG>M2fjOY+JWCjTbQM=NR&GW2fF~;UP43)1%Qv(Z#tk1>`CTgA&7PE}U)i^{
z6ZaUxB#p9Ix8Fb(K3Y@9(S8n)`oLtxvg)M$AT>4hW(;E_LG)oX9FR_58f3Jq3a}H?
zk;vhvIKdJX0d9+MfZ=s-&si_S>P9cB(APBV4;RmH8SWo`^0}!XG>ZiosQmq&^J-=;
zwyE<UOixeCy1la6)c+XvFmfdZP&7`6BI<#6P>46OMy*_Uu!DEflD|5~XSN!s-wM`M
z$EcUfOB$Tp!OgRghwKX7T!eB&%h?U6Jy4NEf;yx1^z@7b5w2vR_xduZ$>@mAgaXp(
zZZeuaN*Yq^cpt6LwAF_WKTyCwzfL--f5o+x*fbPu<9{nQc5%ABYmt2__?!0SZMni4
ztCUL=HN*;e^E%LvW}9;S3p+S>L7|tQpSUOYH?HzP;$b1)FJTLT?ksRKHNE`WWOo&*
zZ)CsRbkLLh@`G8hIZzXr2Rwgw*4?56I9XRt5748_f90Mkym*;8W9{9on<J^jgLcMn
z--5H}Ij|A|-bS^1Yh!DHu05Y1TwF@`azSpd;8N7Xm@3%h5uhMMNhM(%c`UmOG&g!3
zy(4E^k-K^4;`fpDvSDQ5f!3ZLtMOcxtGt-VO{-39dudXNDVeN}-d2i}b=!wasQ#b(
zEI})Kuk9wUPOVe79k@iwF`co|1&=O~3Kk*b*HCmZMQ2-Yw^P*?$D~Zh#lofAcVPKm
zJDUwZdu9<K9da`g2iV*s){S$&j+4HM3uWkOOfDA@{dxTCbTScGH^tO&6Fp`@NZ%AK
z4%{b)%u4=vW<rO_5g%trqZEA6*GFBhfS~arz$h<suw9TU1N7b9B@1clr;Ue~^nokv
z$K`U<pFW~Ki-wFX1}?-LMF{ixeBg_mTMD>rCD;jS!dT}AeXcY>zsi5P$;^B7ka+h?
zTY6#6%QZg3d6V1E8&t7MBN1{np(_(toY_}i2~(BxzxeCXu7sW>dQ?q>^<8qW>h3p_
zdtR{umTWE+%{{21-<JHx@4&WKy<<*JmW$q!SxhINhP_iucRLyG11J!?D6gBzeDPOr
z#N3IE5K>5Z==p}G1Nv=Xx{LRc9#!lWINo*^wa$)>etq@36`HqtnGfOcBl0qz1ZKUD
zvfvf>*pizsf>;K~z%i5uvDP|8p&g_hZAH_5$C8;efTHknVmp)IwidQ_74MBJ$X8Mf
zCnx@2&{8}lrLxy}1k{t-D9I^r5y)|MiUo3*%}kKem&-s;$gh67tRVpJBdZ5ixn=H!
z5pGrOg&$%cvxe`TI_0mU{m<E*?P3O!f8+u`)p#Dtjx2nvhGPS9nc>l+{FT+)L%{1?
zc*Uqg5h|M`JcYAXw+nij2AlY`sAXp3>(e5vm2KG95XZKM9qj2rf{vCNF4=bvWi{o_
z-ZxUfRkuW4oN;d`8Gh|Tf+tTl>>h?<Exfc?92fxSThN`JeSi^e;w)Qgk_y=Z>zglj
zy#K`>HViguI{=E)rwd>8kuRZIiXi^rzzwxk6t~|Q_7O>D-e8NXP35Ezqx8O&VJia4
zOl7|K^bKP+*W%N|Rl<ktdil`XI{#ag9UG<Fj&E|{?GJIX?m_?uH*&q!VULHN33tqe
zj&r>?=iB8y)Tb_Br(TV}GGAbd_6h*~#bBn6<L}961h+?qa?n%ss%6$>rl{p`%eB(#
zZ9U)}2L}RZAsbPuw-QEY7C5IHvh`*;`z2qykAI6#kl^E9+J~JvbGbTMPFvJ#v-B^o
z?l^9D9?eJ1f4pfp-IArtyzqJgX*A@hmixfYHm_~=@T!!IQ&t>SPAH)(;Z2flu<c*i
z5WI{pTCg<)k;`zK^G&V;es~yOFJm(kfz)+(Hk2c(ZvxId{cMLTR+hfz*aYgV#9HEo
zVw-C<X{|~;K$9*wN$Z|TI*?ckpZt})u$(+HJf++#a#eI=wczkeMhTW(#v9pAaym}w
zbxu0ozJu$-3{J-Uc|+qG*7tFpH5@yvpFyv$#>9f8>j;-P$XJBqw;+p|CIsmiyYN_0
zcQShLV)pDz?;W7x2Y4<{3^zx{)PnoX<oOI*24s4UgNWrUcqw;2;|Ce5wfDM{>H}On
zaN{YbF2E%sse&>H&oTeWr<4`_V4~U+oBV^2E6P&G{hq46F<sB0#u8rA{j1lv{a_Ma
z--!1DS~G6f^fn3qhQ0EwO}*dIPnSX%F=^g`$+#fmquaktS#5IEn{j$B-MXh8(RD2+
z`}?hX{Q=!`d*@vCt~Z9P6vg7PdeV^;c!e_wqv7YmH{n5xIT5gMlkY<cX_y%0XqbxC
z{izwS;Vhn}j|y8Ldi|sN4!d=b0ApJViw@`vWgWfbjQjlD0#bUoDfp>l)(uz38wtEE
zEb^2UwO!G|dFf-ztUInsgmKB}V_k|>bcI~`Z=~nv62@7xCTA7nF0PTCWf*fu{U9N&
z>SS~ATQ{feT7s6RgSZTwOn$I#D#h|XS#hWNUPQyKn5VwwebS%T$7n5U(z2}jV{AZ*
z&(oNiKM}PbY`Z0*zi2;Dg;G`O=R8@M;CrUb%4XoH#K{$9m$Eual>!y!zF9+;BJy;T
l_kv4rpOWgC^|?I`2+-zl8N?#A*#7(+(?J_*)Tue({~rVq&~X3&

literal 0
HcmV?d00001

diff --git a/iphone/Maps/bookmarks.png b/iphone/Maps/bookmarks.png
new file mode 100644
index 0000000000000000000000000000000000000000..59d6db37c88e17e04a1bd9fea3bb8b6ca4f926fd
GIT binary patch
literal 2724
zcmbVOX;f3!77jCtL4krI0%;f&FvDfY1OY=r7-SNV!6isYZb*dW#w3!6iXfsy1wp_G
zs1_09L#c>jDO6%X17%QKWU!*qDm-Tfks&}|u+sN_boIx(Yu$U!+2{NAyw|$2@KAsF
z($!00Fc>^AfEJ-yu?w%EzUCXFJ$*>CSc?5(#gPzOEMW*i7=;BTfrvmJBN>bU8LVA9
z+CeWEOozjbiWSF(1e2H$56xJ>prt&4h7E&x`A7u}W(p`qB!S6XJ{kF;u^EZrvdG97
zj}UB#fC_TB0qH_8GCeeknV!NVvXDOB2rnr~qkspB83-val`kSm$;i)oNt*qF7=uK7
zhKN(h$UmKm4GBk3At8wHKx0u%EDk{6+|htLmgr7gk8s5TSPbBb!QxQ>mgIpaVFARK
z2dS|pWU)yRH2N1?niCnx5sL*R3`Qc6pe1f-NSKTPh(sa=>xyx8MQIQy(JsE2Aw}^;
zc8eNlpol5t3dCH9k66&iNP>2X$w-Z-e}=#lgoOO1m@oR0C{4;RQicEnps^SpZy~PF
zXpuMq{I45-ixx%g5`dTpPz3E1GBx#J+bxncx%+2B3qXxGq%a{@Qxrxj4Px%(fqZcw
zjf~XXpjliNiB7=N0RZog#k*p01OOmVr~rjV^CjSku6_UxSk&=%TvsZMilx&1a6}3Y
z0Q>-74>vm1o#5{7iY2<@-24`~fqape!DoVtcDWk6U%0e?<dUdDkRgVIQ4o~6*a6`j
zNDPTMkN`oA^gsiM5C)UWUyv*m=+Ag*ppcsevgksHhxnXf68CRBpyTOOKb*TOmHH)e
zJV5s)y5rs4d};1}R0{G7m-YW-4Wn@ev(O&@(=Ll5O%E<?|7w2C;ji%l`I?y#YKCJ?
z1<xM_)Bh!qMv0O>>e;e4I5Os|<~_&YaEfJWFz#F{CfBrTo?&tA)T%1O6NMYf=5K7+
zZ{m))Y`<cPYIc%-K5N5Ixw3ty<k-N%0*8&WExHDV%Y5%D*ZYMZw9s{Fi!mA`LX*cg
z{??~VvBic8f9dN}r|%nnEV|dX*Cx8UBo!PB56=upG#@#sxUFc+B)@_>6qu~1+RL@x
zWWoP1(E6mU)KY32wC_nX{oY_IOm!>ILIu0Jdde*)8d~<f&G);1)a%zNqjxdQ^Nt=Z
zP)~j+%Fj2h=z9|w6SFdI%NEm&@v$+a!EzgW6BCmcBhOmw$>j0_hYoqp>~pUpspcnE
zsJ;^X;%s%Q%>E{S5IHe1QF-yA|B0a_CR4WMisMR5f<1+j*4t+|8{njM3pSs{kH})P
z*}AH}ns~FC!EZA&VHFQJx|ESKc8_03vbHtYDPk0-6`limKm0&CUQ|R)XwJAI_gn^t
zJG^}P(jJA%YbI;W8jTpm=x*prb{pZ`o1UKDKh#$waH!eVjDBksn(JI!B5+iMb*2st
z4F%BY`dkjDzd%)7Ru=qzu+e{ZZf=)oCN3Z5q*!}uC^9k<zsw8M+Hz?5bO}ehcOZXU
zJn}X}-)2b{`}}RYXJrJu|Jrr9cJp;it)+9MGu>>{Gp2XpXjKW(OqKF_r>?E7wKZxF
z-;r@tIzLOab-C|y<H+fPGx5bIPVh<6s({w#hUc%q)TcYvSX(<heE2Zs%sIJy-RcU#
z*zD}=v5t<8xOeZ~waa8O#z+yq25TjG+h1#qLZM^?ePx<Na<;ppqlI<<knM2p3ZtZo
z>qSqEnqV$m-_4uN<F;-UFZJ^F&iGBC$ej7P#O3Mx-)>@hluD&h7l1~iqb~lsS28^Y
zc82dY*~;hhX-wwtuc(KNbADg7#>&iW{8DuFTvc7&cyZ7LU-gJ-sZlM$(LZ*;W~B1A
zub{NBu+UfNc!v66P~Bd%HY`F%M`!NN-OQ>hAPB~@>!w>CR>vGmPftI*-SWDpQQ#AZ
zety(?&ke%r?Dn&_6IFxG`U9XN%mS$=ebC!W&tF4)9;NQ;>XOMr9C&lLvkmN$?|rlP
z@FfdW=3DuV8=KqMPTX2-l4E6(#MUR{t+=9~V8u4<S;2kmrsKzKeddWnY2q+~y;Z6<
z8=3(fnw4G&KV6xAejupm>{;7K2Yv2bS8<NQ>*JeXjJGvW2|iw4Udgqwm%CFR`AN7{
zyElE@$Ge&{n!xdFbSZJX*WHbtn4An-$Md~9S#{~%5%x)3fBm@j)aaeVUp?&YeO+Rq
z>Mr+$<geDtx>B;c!q%TIsw~Ar#vdmpLY(z%u64_*svJAj!>y0ys{k#FDbujSikqe1
zI;YS@!j)dFr8yf<qAlg>vYqwXxPA+%)|2rIgR9$?I<*jV<;D`ldAH1U<SConq*y_{
zLF&~XhxJx5C10ar-@J}PG)+FawYTx<=8-#h?qCoVR?nJ)qtu~ub?|y1A(Met7Bcs<
z^XTKtgr6u4s*OQG2|YbMO_i$TveWs7^$c(0e-8{EIG{_^Rte9;{{TEZ!0yh@$95Bn
zj~}mJICm~_#c|J%vJZ0Dk?vrB-O?v7S)r|#dy31;t#wq!(%ri~m(i(IswgflZXeY`
zeM0-}iEFzrvGPCISjAe6JZ=yP$u8bL%Xe1{&rXkrg*X;jnzy*wCskEeR@%Uz%J}WS
zZn<q&P81z9fD+X?7^m8RHc$^<vp*_CCGW`cfE8DKjp%$Jm&<ulv)QKFt5*dpqWfrF
z?CAXF$%zT`>$Vp4$48^?cYpfVhEFSb$R#?AOYyQD@;pB|Lm3efkzp`1d^gW3TQl)<
zu#DsNJw9#l=-iwvgPdki)z>JWtQvT!6gQYmH5FGEJHMuwcq9hhYdt)ZHneRt>*t??
zB&NYedSt&YI!<ces!(KKQ%XmY8p2VHij2-2qm_?Ml1~2+Q0JoB!LM0M({#}Go2e-#
z+KFa8h?MOp(?{7`cU1RVd+r*0aWG5SAPCjBDNYsWCODVh>S!`elkFsxSAQdGn;;NY
zz6sWuT7oTae7{D3cx_!OR%D^;9zE1Co<G;}K6lBi=Y#Dx4zB?yGnBEhvFMj-4lZh(
zZw-vHByD(a?@(uF=L4Hxy?a-pw`cPG;Qsninj?YGU+>gwi2JVpYum62<>dnTfOXy2
z0p(@qlAr+D1CQs0)$yxtZrQderU9+I?DdQ?IoUrP@zcCkixq6%Wgs(~--vVSwS3VW
z1J?$<)%io)tUvzh5HSWWH?Q3{kiGWut-D-@3&Tg&N!pmz&HVB2U^=k&#O{nYZt*$`
P|BZoup|l#`#QpyPYi5YM

literal 0
HcmV?d00001

diff --git a/iphone/Maps/bookmarks@2x.png b/iphone/Maps/bookmarks@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c13dd8c5c20c4a1bad8e147ab7de39146bb54e4
GIT binary patch
literal 4804
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
YJM^{D)m2sG@V}BF(p0Zn$0_oE0FR@o4gdfE

literal 0
HcmV?d00001