Revert "Disabled map.zoom to prevent crashing."

This reverts commit 3ef0ebe.

.gitignore

@@ -1,38 +1,24 @@
-###########################
-# built application files #
-###########################
+# built application files
 *.ap_
 
-########################
-# files for the dex VM #
-########################
+# files for the dex VM
 *.dex
 
-####################
-# Java class files #
-####################
+# Java class files
 *.class
 
-###################
-# generated files #
-###################
+# generated files
 bin/
 gen/
 
-############################################
-# Local configuration file (sdk path, etc) #
-############################################
+# Local configuration file (sdk path, etc)
 local.properties
 
-#########################
-# Eclipse project files #
-#########################
+# Eclipse project files
 .classpath
 .project
 
-#############
-# IOS files #
-#############
+# IOS files
 .DS_Store
 *.swp
 *~.nib
@@ -47,18 +33,4 @@ build/
 *.mode1v3
 *.mode2v3
 
-xcuserdata
-
-########################
-# Keep out icons local #
-########################
-Android/res/drawable-hdpi/icon.png
-Android/res/drawable-ldpi/icon.png
-Android/res/drawable-mdpi/icon.png
-Android/res/drawable-xhdpi/icon.png
-Android/res/drawable/icon.png
-iOS/Arbiter/Resources/icons/icon.png
-iOS/Arbiter/Resources/icons/icon@2x.png
-iOS/Arbiter/Resources/icons/icon-72.png
-iOS/Arbiter/Resources/icons/icon-72@2x.png
-iOS/www/src/img/logo.png
+xcuserdata

Android/AndroidManifest.xml

@@ -47,7 +47,7 @@
 
     <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="17"/>
 
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:largeHeap="true" android:hardwareAccelerated="false" android:allowBackup="true">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:largeHeap="true" android:hardwareAccelerated="true" android:allowBackup="true">
         <activity android:name="Arbiter" android:label="@string/app_name"
                 android:theme="@android:style/Theme.Black.NoTitleBar"
                 android:configChanges="orientation|keyboardHidden|locale"

iOS/Arbiter/Arbiter-Info.plist

@@ -21,6 +21,8 @@
 				<string>icon-72.png</string>
 				<string>icon-72@2x.png</string>
 			</array>
+			<key>UIPrerenderedIcon</key>
+			<false/>
 		</dict>
 	</dict>
 	<key>CFBundleIdentifier</key>

iOS/www/src/index.html

@@ -70,7 +70,7 @@ <h1 data-localize="page.welcome">Welcome</h1>
 
 			<!-- Content -->
 			<div id="idLogo">
-				<img src="img/logo.png" alt="Arbiter" width="220" height="180"/>
+				<img src="img/tempLogo.png" alt="Arbiter" width="180" height="180"/>
 			</div>
 
 			<div id='idLanguageListContainer'>
@@ -168,7 +168,7 @@ <h1 data-localize="page.newProject">New Project</h1>
 		<div data-role="page" class="Page" id='idServersPage' data-theme="a">
 			<!-- Header -->
 			<div data-role="header" class="PageHeader" id="idPageHeader" data-position="fixed">
-				<a onClick="Arbiter.onBackFromServers()" class="ui-btn-left" data-icon="back" data-localize="button.projects">Projects</a>
+				<a onClick="Arbiter.onBackFromServers()" class="ui-btn-left" data-icon="back" data-localize="button.map">Map</a>
 				<h1 data-localize="page.servers">Servers</h1>
 				<a id="idEditServersButton" onClick="Arbiter.onClick_EditServer()" class="ui-btn-right" data-icon="info" data-localize="button.edit">Edit</a>
 			</div>

iOS/www/src/js/TileUtil.js

@@ -4,7 +4,7 @@ debug: false,
 debugProgress: false,
 cacheTilesTest1Couter: 0,
 counterCacheInProgressMax: 2,
-androidClearWebCacheAfter: 20,
+androidClearWebCacheAfter: 15,
 
 formatSuffixMap: {
     "image/png": "png",
@@ -171,7 +171,7 @@ serviceCacheRequests: function(){
 			 */
 			if (request.zoom != map.zoom) {
 				console.log("change zoom to: ", request.zoom, ", from: ", map.zoom);
-				//map.zoomTo(request.zoom);
+				map.zoomTo(request.zoom);
 			}
 
 			TileUtil.cacheTile(request.bounds, request.zoom);
@@ -508,7 +508,7 @@ queueCacheRequestsForZoom: function(layer, bounds, zoomLevel, onlyCountTile) {
 
 	//TODO: would like to not have to change map zoom. find out what is needed to 
 	//      keep computation valid without having to do this
-	//map.zoomTo(zoomLevel);
+	map.zoomTo(zoomLevel);
 
     var resolutionForZoom = map.getResolutionForZoom(zoomLevel);
     var extentWidth = (bounds.right - bounds.left) / resolutionForZoom;