Moved AbstractMercatorWebSource into libMapView

@@ -71,6 +71,10 @@
 		B83E66C30E80F053001663B6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B83E65680E80E830001663B6 /* QuartzCore.framework */; };
 		B83E66C50E80F06D001663B6 /* libProj4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B83E654F0E80E7A8001663B6 /* libProj4.a */; };
 		B83E67170E80F1CE001663B6 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = B83E670F0E80F1B5001663B6 /* loading.png */; };
+		B85C7B960E89E7EC00B112E4 /* AbstractMecatorWebSource.h in Headers */ = {isa = PBXBuildFile; fileRef = C7A967500E8412930031BA75 /* AbstractMecatorWebSource.h */; };
+		B85C7B970E89E7ED00B112E4 /* AbstractMecatorWebSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C7A967510E8412930031BA75 /* AbstractMecatorWebSource.m */; };
+		B85C7B980E89E7EF00B112E4 /* RMVirtualEarthSource.h in Headers */ = {isa = PBXBuildFile; fileRef = C7A9675C0E84134B0031BA75 /* RMVirtualEarthSource.h */; };
+		B85C7B990E89E7EF00B112E4 /* RMVirtualEarthSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C7A9675D0E84134B0031BA75 /* RMVirtualEarthSource.m */; };
 		B86F26AE0E87442C007A3773 /* RMMapLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = B86F26AC0E87442C007A3773 /* RMMapLayer.h */; };
 		B8D27AFC0E8780CD00F596FE /* RMLatLong.h in Headers */ = {isa = PBXBuildFile; fileRef = B8D27AFB0E8780CD00F596FE /* RMLatLong.h */; };
 		B8D27C8E0E8796FF00F596FE /* RMWebTileImage.m in Sources */ = {isa = PBXBuildFile; fileRef = B83E64DD0E80E73F001663B6 /* RMWebTileImage.m */; };
@@ -126,8 +130,6 @@
 		B8D27CC30E87972000F596FE /* RMMapLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = B86F26AC0E87442C007A3773 /* RMMapLayer.h */; };
 		B8D27CC40E87972100F596FE /* AbstractMecatorWebSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C7A967510E8412930031BA75 /* AbstractMecatorWebSource.m */; };
 		B8D27CC50E87972100F596FE /* AbstractMecatorWebSource.h in Headers */ = {isa = PBXBuildFile; fileRef = C7A967500E8412930031BA75 /* AbstractMecatorWebSource.h */; };
-		C7A967520E8412930031BA75 /* AbstractMecatorWebSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C7A967510E8412930031BA75 /* AbstractMecatorWebSource.m */; };
-		C7A9675E0E84134B0031BA75 /* RMVirtualEarthSource.m in Sources */ = {isa = PBXBuildFile; fileRef = C7A9675D0E84134B0031BA75 /* RMVirtualEarthSource.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -534,6 +536,8 @@
 				B83E66140E80EA29001663B6 /* RMMercator.h in Headers */,
 				B86F26AE0E87442C007A3773 /* RMMapLayer.h in Headers */,
 				B8D27AFC0E8780CD00F596FE /* RMLatLong.h in Headers */,
+				B85C7B960E89E7EC00B112E4 /* AbstractMecatorWebSource.h in Headers */,
+				B85C7B980E89E7EF00B112E4 /* RMVirtualEarthSource.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -692,8 +696,6 @@
 				1D60589B0D05DD56006BFB54 /* main.m in Sources */,
 				1D3623260D0F684500981E51 /* MapViewAppDelegate.m in Sources */,
 				28D7ACF80DDB3853001CB0EB /* MapViewViewController.m in Sources */,
-				C7A967520E8412930031BA75 /* AbstractMecatorWebSource.m in Sources */,
-				C7A9675E0E84134B0031BA75 /* RMVirtualEarthSource.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -724,6 +726,8 @@
 				B83E66130E80EA28001663B6 /* RMMercator.m in Sources */,
 				B83E66150E80EA29001663B6 /* RMProjection.m in Sources */,
 				B83E66160E80EA2A001663B6 /* RMWebTileImage.m in Sources */,
+				B85C7B970E89E7ED00B112E4 /* AbstractMecatorWebSource.m in Sources */,
+				B85C7B990E89E7EF00B112E4 /* RMVirtualEarthSource.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

@@ -233,8 +233,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -275,6 +273,8 @@
 								<string>29B97314FDCFA39411CA2CEA</string>
 								<string>B83E64810E80E6DC001663B6</string>
 								<string>080E96DDFE201D6D7F000001</string>
+								<string>B86F26A80E8742ED007A3773</string>
+								<string>B83E64EB0E80E73F001663B6</string>
 								<string>29B97323FDCFA39411CA2CEA</string>
 								<string>19C28FACFE9D520D11CA2CBB</string>
 								<string>1C37FBAC04509CD000000102</string>
@@ -284,7 +284,7 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>15</integer>
+									<integer>12</integer>
 									<integer>9</integer>
 									<integer>0</integer>
 								</array>
@@ -327,7 +327,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>RMMapView.m</string>
+								<string>RMMapLayer.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -335,11 +335,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>RMMapView.m</string>
+										<string>RMMapLayer.h</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>B85C7B840E89DDE700B112E4</string>
+										<string>B85C7B9C0E89E80000B112E4</string>
 										<key>history</key>
 										<array>
 											<string>B83E67330E80F2CB001663B6</string>
@@ -398,7 +398,6 @@
 											<string>B8D27D2D0E87AB7500F596FE</string>
 											<string>B8D27D440E87AE8900F596FE</string>
 											<string>B8D27D450E87AE8900F596FE</string>
-											<string>B8D27D630E88C61400F596FE</string>
 											<string>B83E911A0E89D70D00BD8B5F</string>
 											<string>B83E911B0E89D70D00BD8B5F</string>
 											<string>B83E911C0E89D70D00BD8B5F</string>
@@ -409,7 +408,8 @@
 											<string>B85C7B7E0E89DDE700B112E4</string>
 											<string>B85C7B7F0E89DDE700B112E4</string>
 											<string>B85C7B800E89DDE700B112E4</string>
-											<string>B83E91360E89D77A00BD8B5F</string>
+											<string>B85C7B890E89E22D00B112E4</string>
+											<string>B8D27D630E88C61400F596FE</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@@ -476,6 +476,7 @@
 											<string>B85C7B810E89DDE700B112E4</string>
 											<string>B85C7B820E89DDE700B112E4</string>
 											<string>B85C7B830E89DDE700B112E4</string>
+											<string>B85C7B8A0E89E22D00B112E4</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -497,6 +498,8 @@
 							<string>500pt</string>
 						</dict>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -669,6 +672,10 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>B85C7B9D0E89E80000B112E4</string>
+		<string>B85C7B9E0E89E80000B112E4</string>
+		<string>1C78EAAD065D492600B07095</string>
+		<string>1CD10A99069EF8BA00B06720</string>
 		<string>B83E64750E80E6C8001663B6</string>
 		<string>/Users/sineltor/src/catchme/Project/temp/MapView/MapView.xcodeproj</string>
 	</array>
@@ -872,13 +879,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>B8571D300E895D5100D72179</string>
+				<string>B85C7B8F0E89E7D700B112E4</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>B8571D310E895D5100D72179</string>
-				<string>B8571D320E895D5100D72179</string>
-				<string>B8571D330E895D5100D72179</string>
-				<string>B8571D340E895D5100D72179</string>
-				<string>B8571D350E895D5100D72179</string>
+				<string>B85C7B900E89E7D700B112E4</string>
+				<string>B85C7B910E89E7D700B112E4</string>
+				<string>B85C7B920E89E7D700B112E4</string>
+				<string>B85C7B930E89E7D700B112E4</string>
+				<string>B85C7B940E89E7D700B112E4</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -1011,7 +1018,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {1253, 781}}</string>
 								<key>RubberWindowFrame</key>
-								<string>34 56 1253 822 0 0 1440 878 </string>
+								<string>121 356 1253 822 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXDebugCLIModule</string>
@@ -1034,17 +1041,17 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>B8D27B3C0E87887200F596FE</string>
+				<string>B85C7B950E89E7D700B112E4</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.consoleV3</string>
 			<key>WindowString</key>
-			<string>34 56 1253 822 0 0 1440 878 </string>
+			<string>121 356 1253 822 0 0 1920 1178 </string>
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>Identifier</key>

@@ -202,6 +202,11 @@
 			B85C7B820E89DDE700B112E4 /* PBXTextBookmark */ = B85C7B820E89DDE700B112E4 /* PBXTextBookmark */;
 			B85C7B830E89DDE700B112E4 /* PBXTextBookmark */ = B85C7B830E89DDE700B112E4 /* PBXTextBookmark */;
 			B85C7B840E89DDE700B112E4 /* PBXTextBookmark */ = B85C7B840E89DDE700B112E4 /* PBXTextBookmark */;
+			B85C7B890E89E22D00B112E4 /* PBXTextBookmark */ = B85C7B890E89E22D00B112E4 /* PBXTextBookmark */;
+			B85C7B8A0E89E22D00B112E4 /* PBXTextBookmark */ = B85C7B8A0E89E22D00B112E4 /* PBXTextBookmark */;
+			B85C7B8B0E89E22D00B112E4 /* PBXTextBookmark */ = B85C7B8B0E89E22D00B112E4 /* PBXTextBookmark */;
+			B85C7B8E0E89E7D700B112E4 /* PBXTextBookmark */ = B85C7B8E0E89E7D700B112E4 /* PBXTextBookmark */;
+			B85C7B9C0E89E80000B112E4 /* PBXTextBookmark */ = B85C7B9C0E89E80000B112E4 /* PBXTextBookmark */;
 			B86F27100E877996007A3773 = B86F27100E877996007A3773 /* PBXTextBookmark */;
 			B8A7306A0E81F5F800DB975F = B8A7306A0E81F5F800DB975F /* PlistBookmark */;
 			B8A7306C0E81F5F800DB975F = B8A7306C0E81F5F800DB975F /* PlistBookmark */;
@@ -1395,9 +1400,9 @@
 		path = /Users/sineltor/src/catchme/Project/temp/Proj4/pj_datums.c;
 		sourceTree = "<absolute>";
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1529, 1820}}";
+			sepNavIntBoundsRect = "{{0, 0}, {936, 1806}}";
 			sepNavSelRange = "{2847, 45}";
-			sepNavVisRange = "{2245, 1055}";
+			sepNavVisRange = "{2296, 864}";
 		};
 	};
 	B85C7B7E0E89DDE700B112E4 /* PBXTextBookmark */ = {
@@ -1470,10 +1475,60 @@
 		vrLen = 1008;
 		vrLoc = 1016;
 	};
+	B85C7B890E89E22D00B112E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B83E64CD0E80E73F001663B6 /* RMMapView.m */;
+		name = "RMMapView.m: 150";
+		rLen = 0;
+		rLoc = 3145;
+		rType = 0;
+		vrLen = 1008;
+		vrLoc = 1016;
+	};
+	B85C7B8A0E89E22D00B112E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B83E64CD0E80E73F001663B6 /* RMMapView.m */;
+		name = "RMMapView.m: 150";
+		rLen = 0;
+		rLoc = 3145;
+		rType = 0;
+		vrLen = 1008;
+		vrLoc = 1016;
+	};
+	B85C7B8B0E89E22D00B112E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B86F26AC0E87442C007A3773 /* RMMapLayer.h */;
+		name = "RMMapLayer.h: 19";
+		rLen = 7;
+		rLoc = 344;
+		rType = 0;
+		vrLen = 367;
+		vrLoc = 0;
+	};
+	B85C7B8E0E89E7D700B112E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B85C7B7B0E89DDCF00B112E4 /* pj_datums.c */;
+		name = "pj_datums.c: 79";
+		rLen = 45;
+		rLoc = 2847;
+		rType = 0;
+		vrLen = 864;
+		vrLoc = 2296;
+	};
+	B85C7B9C0E89E80000B112E4 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = B86F26AC0E87442C007A3773 /* RMMapLayer.h */;
+		name = "RMMapLayer.h: 19";
+		rLen = 7;
+		rLoc = 344;
+		rType = 0;
+		vrLen = 367;
+		vrLoc = 0;
+	};
 	B86F26AC0E87442C007A3773 /* RMMapLayer.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1529, 895}}";
-			sepNavSelRange = "{211, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {1529, 468}}";
+			sepNavSelRange = "{344, 7}";
 			sepNavVisRange = "{0, 367}";
 		};
 	};
@@ -1528,7 +1583,7 @@
 		ignoreCount = 0;
 		lineNumber = 255;
 		location = MapView;
-		modificationTime = 243461234.557047;
+		modificationTime = 243918777.220738;
 		state = 2;
 	};
 	B8A7308F0E81FFBF00DB975F /* pj_datums.c */ = {