Data fetcher

documentation/docs/05-changelog.md

@@ -11,6 +11,13 @@
 
 ##### Improvements
 - `UnityARInterface` updated to [commit 67351b6](https://github.com/Unity-Technologies/experimental-ARInterface/commit/67351b66ff9af28380e7dd5f5b2f4ba1bf802ca8) from March 1st 2018
+- Changes to terrain factory (#623)
+  - Create a new base class
+  - Introduce all different terrains as strategies
+  - Change sidewalls as a property on elevated terrain strategy
+- Data Fetching Changes (#622)
+  - Move data calls from factories to DataFetcher classes
+  - Factories register to events in DataFetchers
 
 ### v.1.4.1
 *04/17/2018*

sdkproject/Assets/Mapbox/Examples/3_Globe/Scripts/SpawnOnGlobeExample.cs

@@ -3,11 +3,12 @@
 	using UnityEngine;
 	using Mapbox.Unity.MeshGeneration.Factories;
 	using Mapbox.Unity.Utilities;
+	using Mapbox.Unity.MeshGeneration.Factories.TerrainStrategies;
 
 	public class SpawnOnGlobeExample : MonoBehaviour
 	{
 		[SerializeField]
-		FlatSphereTerrainFactory _globeFactory;
+		TerrainFactoryBase _globeFactory;
 
 		[SerializeField]
 		[Geocode]
@@ -25,7 +26,7 @@ void Start()
 			{
 				var instance = Instantiate(_markerPrefab);
 				var location = Conversions.StringToLatLon(locationString);
-				instance.transform.position = Conversions.GeoToWorldGlobePosition(location, _globeFactory.Radius);
+				instance.transform.position = Conversions.GeoToWorldGlobePosition(location, (_globeFactory.Strategy as FlatSphereTerrainStrategy).Radius);
 				instance.transform.localScale = Vector3.one * _spawnScale;
 				instance.transform.SetParent(transform);
 			}

sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/AbstractTileFactory.cs

@@ -106,10 +106,10 @@ public virtual void Unregister(UnityTile tile)
 			OnUnregistered(tile);
 		}
 
-		internal abstract void OnInitialized();
+		protected abstract void OnInitialized();
 
-		internal abstract void OnRegistered(UnityTile tile);
+		protected abstract void OnRegistered(UnityTile tile);
 
-		internal abstract void OnUnregistered(UnityTile tile);
+		protected abstract void OnUnregistered(UnityTile tile);
 	}
 }

sdkproject/Assets/Mapbox/Unity/MeshGeneration/Factories/ImageDataFetcher.cs

@@ -0,0 +1,38 @@
+using Mapbox.Map;
+using Mapbox.Unity.MeshGeneration.Data;
+using System;
+public class ImageDataFetcher : DataFetcher
+{
+	public Action<UnityTile, RasterTile> DataRecieved = (t, s) => { };
+	public Action<UnityTile, TileErrorEventArgs> FetchingError = (t, s) => { };
+
+	//tile here should be totally optional and used only not to have keep a dictionary in terrain factory base
+	public void FetchImage(CanonicalTileId canonicalTileId, string mapid, UnityTile tile = null, bool useRetina = false)
+	{
+		RasterTile rasterTile;
+		if (mapid.StartsWith("mapbox://", StringComparison.Ordinal))
+		{
+			rasterTile = useRetina ? new RetinaRasterTile() : new RasterTile();
+		}
+		else
+		{
+			rasterTile = useRetina ? new ClassicRetinaRasterTile() : new ClassicRasterTile();
+		}
+
+		if (tile != null)
+		{
+			tile.AddTile(rasterTile);
+		}
+
+		rasterTile.Initialize(_fileSource, tile.CanonicalTileId, mapid, () =>
+		{
+			if (rasterTile.HasError)
+			{
+				FetchingError(tile, new TileErrorEventArgs(tile.CanonicalTileId, rasterTile.GetType(), tile, rasterTile.Exceptions));
+				return;
+			}
+
+			DataRecieved(tile, rasterTile);
+		});
+	}
+}