From 9b530753d3da4db4352b1e66e740e061613f2055 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Wed, 4 Mar 2015 21:41:27 +0100 Subject: [PATCH 1/2] iitcm: update views on app start --- mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index 78859e39..4e6e2965 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -83,7 +83,7 @@ public class IITC_Mobile extends Activity private EditText mEditCommand; private boolean mDebugging = false; private boolean mReloadNeeded = false; - private boolean mIsLoading = true; + private boolean mIsLoading = false; private boolean mShowMapInDebug = false; private boolean mPersistentZoom = false; private final Stack mDialogStack = new Stack(); From e9d643626031c35ad27b7a368194ffc996ad0007 Mon Sep 17 00:00:00 2001 From: fkloft Date: Thu, 5 Mar 2015 19:37:40 +0100 Subject: [PATCH 2/2] Support shonin shards Fixes #951 --- code/artifact.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/code/artifact.js b/code/artifact.js index eef75521..9e54a868 100644 --- a/code/artifact.js +++ b/code/artifact.js @@ -148,6 +148,7 @@ window.artifact.getArtifactDescriptions = function(type) { 'jarvis': { 'title': "Jarvis Shards", 'fragmentName': "shards" }, 'amar': { 'title': "Amar Artifacts", 'fragmentName': "artifacts" }, 'helios': { 'title': "Helios Artifacts", 'fragmentName': "artifacts" }, + 'shonin': { 'title': "Shonin Artifacts", 'fragmentName': "shards" }, }; return descriptions[type]; @@ -239,6 +240,20 @@ window.artifact.updateLayer = function() { } + // 2015-03-05 - shonin artifacts + if (data.shonin) { + if (data.shonin.target) { + // target portal - show the target marker. helios target marker doesn't fill like the earlier jarvis/amar targets + iconUrl = '//commondatastorage.googleapis.com/ingress.com/img/map_icons/marker_images/shonin_shard_target.png'; + iconSize = 100/2; // 100 pixels - half that size works better + } else if (data.shonin.fragments) { + iconUrl = '//commondatastorage.googleapis.com/ingress.com/img/map_icons/marker_images/shonin_shard.png'; + iconSize = 60/2; // 60 pixels - half that size works better + opacity = 0.6; // these often hide portals - let's make them semi transparent + } + + } + if (iconUrl) { var icon = L.icon({ iconUrl: iconUrl,