diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index c40ad029..f9fc9e4d 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -1,18 +1,18 @@
+ package="com.cradle.iitc_mobile"
+ android:versionCode="22"
+ android:versionName="0.4.1">
+ android:targetSdkVersion="17"/>
-
-
-
-
-
+
+
+
+
+
+ android:configChanges="orientation|keyboard|keyboardHidden|screenSize">
-
-
+
+
+
+
+
-
-
+
+
+
+ android:configChanges="orientation|keyboard|keyboardHidden|screenSize">
+
+
+
+
+
+
+
+
+
+
diff --git a/mobile/res/values/dimens.xml b/mobile/res/values/dimens.xml
index a6dd1403..4fb5f825 100644
--- a/mobile/res/values/dimens.xml
+++ b/mobile/res/values/dimens.xml
@@ -3,5 +3,9 @@
16dp
16dp
+ 640dip
+ 400dip
+ 400dip
+ 200dip
\ No newline at end of file
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java b/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java
index ba0ce3d1..db9511ff 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_DeviceAccountLogin.java
@@ -153,7 +153,7 @@ public class IITC_DeviceAccountLogin implements AccountManagerCallback {
if (result != null) {
// authentication succeded, we can load the given url, which will redirect back to the intel map
mWebView.loadUrl(result);
- mActivity.loginSucceded();
+ mActivity.loginSucceeded();
} else {
onLoginFailed();
}
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 2af11b89..88604777 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -399,7 +399,7 @@ public class IITC_Mobile extends Activity {
/**
* called after successful login
*/
- public void loginSucceded() {
+ public void loginSucceeded() {
// garbage collection
mLogin = null;
}
diff --git a/plugins/basemap-cloudmade.user.js b/plugins/basemap-cloudmade.user.js
new file mode 100755
index 00000000..b6857696
--- /dev/null
+++ b/plugins/basemap-cloudmade.user.js
@@ -0,0 +1,102 @@
+//******************************
+//******************************
+//******** INSTRUCTIONS ********
+//******************************
+//******************************
+
+// 1. Go to the www.cloudmade.com website and register an account
+// 2. Get an API Key
+// 3. Edit the clode below, replace YOUR_API_KEY with the API key from CloudMade.com
+// 4. Reload the page
+// optional: browse their map styles, add/modify any you like to the cmStyles list
+
+// You take your own responsibility for any API key you register and use. Please read
+// any relevant terms and conditions. At the time of writing, Cloudmade offer a reasonable
+// number of free requests, which should be more than enough for personal use. You could
+// probably share a key with a group of people without issues, but it is your responsibility
+// to remain within any terms and usage limits.
+
+//******************************
+//******************************
+//******************************
+
+
+// ==UserScript==
+// @id iitc-plugin-cloudmade-maps
+// @name IITC plugin: CloudMade.com maps
+// @version 0.0.1
+// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
+// @description TEMPLATE PLUGIN - add back the CloudMade.com map layers. YOU WILL NEED TO EDIT THIS PLUGIN BEFORE IT WILL RUN
+// @include https://www.ingress.com/intel*
+// @include http://www.ingress.com/intel*
+// @match https://www.ingress.com/intel*
+// @match http://www.ingress.com/intel*
+// ==/UserScript==
+
+function wrapper() {
+// ensure plugin framework is there, even if iitc is not yet loaded
+if(typeof window.plugin !== 'function') window.plugin = function() {};
+
+
+// PLUGIN START ////////////////////////////////////////////////////////
+
+window.plugin.mapTileCloudMade = function() {};
+
+window.plugin.mapTileCloudMade.setup = function() {
+ //**********************************
+ //**********************************
+ //**** CloudMade settings start ****
+ //**********************************
+ //**********************************
+
+ //set this to your API key - get an API key by registering at www.cloudmade.com
+ //e.g. var cmApiKey = '8ee2a50541944fb9bcedded5165f09d9';
+ var cmApiKey = 'YOUR_API_KEY';
+
+ //the list of styles you'd like to see
+ var cmStyles = {
+ '999': "Midnight",
+ '22677': "Minimal",
+ '78603': "Armageddon",
+ };
+
+ //**********************************
+ //**********************************
+ //**** CloudMade settings end ****
+ //**********************************
+ //**********************************
+
+
+ if(cmApiKey=='YOUR_API_KEY') {
+ dialog({title: 'CloudMade.com map plugin', text: 'The CloudMade.com plugin needs manual configuration. Edit the plugin code to do this.'});
+ return;
+ }
+
+ var osmAttribution = 'Map data © OpenStreetMap contributors';
+ var cmOpt = {attribution: osmAttribution+', Imagery © CloudMade', maxZoom: 18, apikey: cmApiKey};
+
+ $.each(cmStyles, function(key,value) {
+ cmOpt['style'] = key;
+ var cmMap = new L.TileLayer('http://{s}.tile.cloudmade.com/{apikey}/{style}/256/{z}/{x}/{y}.png', cmOpt);
+ layerChooser.addBaseLayer(cmMap, 'CloudMade '+value);
+ });
+
+};
+
+var setup = window.plugin.mapTileCloudMade.setup;
+
+// PLUGIN END //////////////////////////////////////////////////////////
+
+if(window.iitcLoaded && typeof setup === 'function') {
+ setup();
+} else {
+ if(window.bootPlugins)
+ window.bootPlugins.push(setup);
+ else
+ window.bootPlugins = [setup];
+}
+} // wrapper end
+// inject code into site context
+var script = document.createElement('script');
+script.appendChild(document.createTextNode('('+ wrapper +')();'));
+(document.body || document.head || document.documentElement).appendChild(script);