From 4956932c20467693cc2fd5e96c10955c283b52a8 Mon Sep 17 00:00:00 2001
From: William Newman <newmanw10@gmail.com>
Date: Thu, 12 Oct 2017 08:36:33 -0700
Subject: [PATCH] Fix bug with static feature loading

---
 CHANGELOG.md                                  |  1 +
 mage/build.gradle                             |  2 +-
 .../mil/nga/giat/mage/map/MapFragment.java    | 19 +++++--------------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ef257fb4..f740dc94f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ##### Bug Fixes
 * Fix static feature map click
+* Fix static feature preference loading
 
 ## [5.3.4](https://github.com/ngageoint/mage-android/releases/tag/5.3.4) (10-05-2017)
 
diff --git a/mage/build.gradle b/mage/build.gradle
index 3e2102e54..d0aa5b3a9 100644
--- a/mage/build.gradle
+++ b/mage/build.gradle
@@ -11,7 +11,7 @@ group 'mil.nga.giat.mage'
 archivesBaseName = 'mage-android'
 version '5.3.5'
 ext {
-    versionCode = 40
+    versionCode = 41
     sourceRefspec = Grgit.open().head().id
 }
 
diff --git a/mage/src/main/java/mil/nga/giat/mage/map/MapFragment.java b/mage/src/main/java/mil/nga/giat/mage/map/MapFragment.java
index 534442c2c..9cb037eca 100644
--- a/mage/src/main/java/mil/nga/giat/mage/map/MapFragment.java
+++ b/mage/src/main/java/mil/nga/giat/mage/map/MapFragment.java
@@ -343,6 +343,11 @@ public void onClick(View v) {
 
 			ObservationHelper.getInstance(getActivity().getApplicationContext()).addListener(this);
 			LocationHelper.getInstance(getActivity().getApplicationContext()).addListener(this);
+
+			updateStaticFeatureLayers();
+
+			CacheProvider.getInstance(getActivity().getApplicationContext()).registerCacheOverlayListener(this);
+			StaticFeatureHelper.getInstance(getActivity().getApplicationContext()).addListener(this);
 		}
 
 		if (observations != null) {
@@ -380,11 +385,6 @@ public void onClick(View v) {
 			refreshMyHistoricLocationsMarkersTask.executeOnExecutor(executor, REFRESHMARKERINTERVALINSECONDS);
 		}
 
-		updateStaticFeatureLayers();
-
-		CacheProvider.getInstance(getActivity().getApplicationContext()).registerCacheOverlayListener(this);
-		StaticFeatureHelper.getInstance(getActivity().getApplicationContext()).addListener(this);
-
 		// Check if any map preferences changed that I care about
 		if (locationService != null && ContextCompat.checkSelfPermission(getActivity().getApplicationContext(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
 			map.setMyLocationEnabled(true);
@@ -402,15 +402,6 @@ public void onLowMemory() {
 		mapView.onLowMemory();
 	}
 
-	@Override
-	public void onSaveInstanceState(Bundle outState) {
-		super.onSaveInstanceState(outState);
-
-//		Bundle mapState = new Bundle();
-//		mapView.onSaveInstanceState(mapState);
-//		outState.putBundle(MAP_VIEW_STATE, mapState);
-	}
-
 	@Override
 	public void onResume() {
 		super.onResume();