Enable loading external configurations - take 2 (#552)

* carry over changes from #352 to latest develop

* Fix the merge typo.

Author: Wilhelm Berg

sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs

@@ -5,6 +5,7 @@ namespace Mapbox.Unity.Map
 	using Utils;
 	using UnityEngine;
 	using Mapbox.Map;
+	using System.Collections;
 
 	/// <summary>
 	/// Abstract Map (Basic Map etc)
@@ -141,10 +142,16 @@ public void SetWorldRelativeScale(float scale)
 		}
 		public event Action OnInitialized = delegate { };
 
+		protected IEnumerator SetupAccess()
+		{
+			_fileSource = MapboxAccess.Instance;
+
+			yield return new WaitUntil(() => MapboxAccess.Configured);
+		}
+
 		protected virtual void Awake()
 		{
 			_worldHeightFixed = false;
-			_fileSource = MapboxAccess.Instance;
 			_tileProvider.OnTileAdded += TileProvider_OnTileAdded;
 			_tileProvider.OnTileRemoved += TileProvider_OnTileRemoved;
 			_tileProvider.OnTileRepositioned += TileProvider_OnTileRepositioned;
@@ -154,8 +161,10 @@ protected virtual void Awake()
 			}
 		}
 
-		protected virtual void Start()
+		protected void Start()
 		{
+			StartCoroutine("SetupAccess");
+
 			if (_initializeOnStart)
 			{
 				Initialize(Conversions.StringToLatLon(_latitudeLongitudeString), AbsoluteZoom);

sdkproject/Assets/Mapbox/Unity/MapboxAccess.cs

@@ -25,7 +25,7 @@ public class MapboxAccess : IFileSource
 		public delegate void TokenValidationEvent(MapboxTokenStatus response);
 		public event TokenValidationEvent OnTokenValidation;
 
-		static MapboxAccess _instance;
+		private static MapboxAccess _instance;
 
 		/// <summary>
 		/// The singleton instance.
@@ -43,7 +43,10 @@ public static MapboxAccess Instance
 		}
 
 
-		MapboxConfiguration _configuration;
+		public static bool Configured;
+		public static string ConfigurationJSON;
+		private MapboxConfiguration _configuration;
+
 		/// <summary>
 		/// The Mapbox API access token.
 		/// </summary>
@@ -89,6 +92,8 @@ public void SetConfiguration(MapboxConfiguration configuration, bool throwExecpt
 
 			ConfigureFileSource();
 			ConfigureTelemetry();
+
+			Configured = true;
 		}
 
 
@@ -142,12 +147,16 @@ public void ClearAllCacheFiles()
 		private void LoadAccessToken()
 		{
 
-			TextAsset configurationTextAsset = Resources.Load<TextAsset>(Constants.Path.MAPBOX_RESOURCES_RELATIVE);
+			if (string.IsNullOrEmpty(ConfigurationJSON))
+			{
+				TextAsset configurationTextAsset = Resources.Load<TextAsset>(Constants.Path.MAPBOX_RESOURCES_RELATIVE);
+				ConfigurationJSON = configurationTextAsset.text;
+			}
 
 #if !WINDOWS_UWP
-			SetConfiguration(configurationTextAsset == null ? null : JsonUtility.FromJson<MapboxConfiguration>(configurationTextAsset.text));
+			SetConfiguration(ConfigurationJSON == null ? null : JsonUtility.FromJson<MapboxConfiguration>(ConfigurationJSON));
 #else
-			SetConfiguration(configurationTextAsset == null ? null : Mapbox.Json.JsonConvert.DeserializeObject<MapboxConfiguration>(configurationTextAsset.text));
+			SetConfiguration(ConfigurationJSON == null ? null : Mapbox.Json.JsonConvert.DeserializeObject<MapboxConfiguration>(ConfigurationJSON));
 #endif
 		}