Skip to content

Enable loading external configurations - take 2 #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 5, 2018
Merged

Enable loading external configurations - take 2 #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bece751
carry over changes from https://github.com/mapbox/mapbox-unity-sdk/pu…
wilhelmberg Jan 12, 2018
c6344bb
Fix the merge typo.
abhishektrip Jan 14, 2018
017a7b3
Merge branch 'develop' of github.com:mapbox/mapbox-unity-sdk into ena…
wilhelmberg Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions sdkproject/Assets/Mapbox/Unity/Map/AbstractMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ namespace Mapbox.Unity.Map
using Utils;
using UnityEngine;
using Mapbox.Map;
using System.Collections;

/// <summary>
/// Abstract Map (Basic Map etc)
Expand Down Expand Up @@ -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;
Expand All @@ -154,8 +161,10 @@ protected virtual void Awake()
}
}

protected virtual void Start()
protected void Start()
{
StartCoroutine("SetupAccess");

if (_initializeOnStart)
{
Initialize(Conversions.StringToLatLon(_latitudeLongitudeString), AbsoluteZoom);
Expand Down
19 changes: 14 additions & 5 deletions sdkproject/Assets/Mapbox/Unity/MapboxAccess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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>
Expand Down Expand Up @@ -89,6 +92,8 @@ public void SetConfiguration(MapboxConfiguration configuration, bool throwExecpt

ConfigureFileSource();
ConfigureTelemetry();

Configured = true;
}


Expand Down Expand Up @@ -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
}

Expand Down