Removing static fields

sdkproject/Assets/Mapbox/Core/Unity/Location/TransformLocationProvider.cs

@@ -14,6 +14,9 @@ namespace Mapbox.Unity.Location
     /// </summary>
     public class TransformLocationProvider : MonoBehaviour, ILocationProvider
     {
+        [SerializeField]
+        private MapController _mapController;
+
         /// <summary>
         /// The transform that will be queried for location and heading data.
         /// </summary>
@@ -70,11 +73,11 @@ void Update()
 
         Vector2d GetLocation()
         {
-            if (MapController.ReferenceTileRect == null)
+            if (_mapController.WorldParameters.ReferenceTileRect == null)
             {
                 return LocationProviderFactory.Instance.DefaultLocationProvider.Location;
             }
-            return _targetTransform.GetGeoPosition(MapController.ReferenceTileRect.Center, MapController.WorldScaleFactor);
+            return _targetTransform.GetGeoPosition(_mapController.WorldParameters.ReferenceTileRect.Center, _mapController.WorldParameters.WorldScaleFactor);
         }
     }
 }

sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/DirectionsFactory.cs

@@ -18,15 +18,20 @@ public class DirectionsFactory : Factory
         private Directions _directions;
         public List<MeshModifier> MeshModifiers;
 
-        public override void Initialize(IFileSource fileSource)
+        public override void Initialize(IFileSource fileSource, WorldParameters parameters)
         {
-            base.Initialize(fileSource);
+            base.Initialize(fileSource, parameters);
             _directions = MapboxAccess.Instance.Directions;
         }
 
-        public void Query(List<Vector2d> waypoints)
+        public void Query(List<Transform> waypoints)
         {
-            var _directionResource = new DirectionResource(waypoints.ToArray(), RoutingProfile.Driving);
+            var wp = new Vector2d[waypoints.Count];
+            for (int i = 0; i < waypoints.Count; i++)
+            {
+                wp[i] = waypoints[i].GetGeoPosition(Parameters.ReferenceTileRect.Center, Parameters.WorldScaleFactor);
+            }
+            var _directionResource = new DirectionResource(wp, RoutingProfile.Driving);
             _directionResource.Steps = true;
             _directions.Query(_directionResource, HandleDirectionsResponse);
         }
@@ -39,7 +44,7 @@ void HandleDirectionsResponse(DirectionsResponse response)
             {
                 foreach (var point in response.Routes[0].Geometry)
                 {
-                    meshData.Vertices.Add(Conversions.GeoToWorldPosition(point.x, point.y, MapController.ReferenceTileRect.Center, MapController.WorldScaleFactor).ToVector3xz());
+                    meshData.Vertices.Add(Conversions.GeoToWorldPosition(point.x, point.y, Parameters.ReferenceTileRect.Center, Parameters.WorldScaleFactor).ToVector3xz());
                 }
             }
 

sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/Factory.cs

@@ -9,11 +9,15 @@ namespace Mapbox.Unity.MeshGeneration.Factories
     /// </summary>
     public class Factory : ScriptableObject
     {
+        //private IWorldParameter MapVisualization;
         protected IFileSource FileSource;
+        protected WorldParameters Parameters;
 
-        public virtual void Initialize(IFileSource fileSource)
+        public virtual void Initialize(IFileSource fileSource, WorldParameters parameters)
         {
+            //MapVisualization = vis;
             FileSource = fileSource;
+            Parameters = parameters;
         }
 
         public virtual void Register(UnityTile tile)

sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MapImageFactory.cs

@@ -41,9 +41,9 @@ public class MapImageFactory : Factory
 
         private Dictionary<Vector2, UnityTile> _tiles;
 
-        public override void Initialize(IFileSource fs)
+        public override void Initialize(IFileSource fs, WorldParameters parameters)
         {
-            base.Initialize(fs);
+            base.Initialize(fs, parameters);
             _tiles = new Dictionary<Vector2, UnityTile>();
         }
 

sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/MeshFactory.cs

@@ -1,108 +1,130 @@
-namespace Mapbox.Unity.MeshGeneration.Factories {
-	using System.Collections.Generic;
-	using UnityEngine;
-	using Mapbox.Unity.MeshGeneration.Enums;
-	using Mapbox.Unity.MeshGeneration.Data;
-	using Mapbox.Unity.MeshGeneration.Interfaces;
-	using Mapbox.Platform;
+namespace Mapbox.Unity.MeshGeneration.Factories
+{
+    using System.Collections.Generic;
+    using UnityEngine;
+    using Mapbox.Unity.MeshGeneration.Enums;
+    using Mapbox.Unity.MeshGeneration.Data;
+    using Mapbox.Unity.MeshGeneration.Interfaces;
+    using Mapbox.Platform;
 
-	/// <summary>
-	/// Uses vector tile api to visualize vector data.
-	/// Fetches the vector data for given tile and passes layer data to layer visualizers.
-	/// </summary>
-	[CreateAssetMenu(menuName = "Mapbox/Factories/Mesh Factory")]
-	public class MeshFactory : Factory {
-		[SerializeField]
-		private string _mapId = "";
-		public List<LayerVisualizerBase> Visualizers;
+    /// <summary>
+    /// Uses vector tile api to visualize vector data.
+    /// Fetches the vector data for given tile and passes layer data to layer visualizers.
+    /// </summary>
+    [CreateAssetMenu(menuName = "Mapbox/Factories/Mesh Factory")]
+    public class MeshFactory : Factory
+    {
+        [SerializeField]
+        private string _mapId = "";
+        public List<LayerVisualizerBase> Visualizers;
 
-		private Dictionary<Vector2, UnityTile> _tiles;
-		private Dictionary<string, List<LayerVisualizerBase>> _layerBuilder;
+        private Dictionary<Vector2, UnityTile> _tiles;
+        private Dictionary<string, List<LayerVisualizerBase>> _layerBuilder;
 
-		public void OnEnable() {
-			if (Visualizers == null)
-				Visualizers = new List<LayerVisualizerBase>();
-		}
+        public void OnEnable()
+        {
+            if (Visualizers == null)
+                Visualizers = new List<LayerVisualizerBase>();
+        }
 
-		/// <summary>
-		/// Sets up the Mesh Factory
-		/// </summary>
-		/// <param name="fs"></param>
-		public override void Initialize(IFileSource fs) {
-			base.Initialize(fs);
-			_tiles = new Dictionary<Vector2, UnityTile>();
-			_layerBuilder = new Dictionary<string, List<LayerVisualizerBase>>();
-			foreach (LayerVisualizerBase factory in Visualizers) {
-				if (_layerBuilder.ContainsKey(factory.Key)) {
-					_layerBuilder[factory.Key].Add(factory);
-				} else {
-					_layerBuilder.Add(factory.Key, new List<LayerVisualizerBase>() { factory });
-				}
-			}
-		}
+        /// <summary>
+        /// Sets up the Mesh Factory
+        /// </summary>
+        /// <param name="fs"></param>
+        public override void Initialize(IFileSource fs, WorldParameters parameters)
+        {
+            base.Initialize(fs, parameters);
+            _tiles = new Dictionary<Vector2, UnityTile>();
+            _layerBuilder = new Dictionary<string, List<LayerVisualizerBase>>();
+            foreach (LayerVisualizerBase factory in Visualizers)
+            {
+                if (_layerBuilder.ContainsKey(factory.Key))
+                {
+                    _layerBuilder[factory.Key].Add(factory);
+                }
+                else
+                {
+                    _layerBuilder.Add(factory.Key, new List<LayerVisualizerBase>() { factory });
+                }
+            }
+        }
 
-		public override void Register(UnityTile tile) {
-			base.Register(tile);
-			_tiles.Add(tile.TileCoordinate, tile);
-			Run(tile);
-		}
+        public override void Register(UnityTile tile)
+        {
+            base.Register(tile);
+            _tiles.Add(tile.TileCoordinate, tile);
+            Run(tile);
+        }
 
-		/// <summary>
-		/// Mesh Factory waits for both Height and Image data to be processed if they are requested
-		/// </summary>
-		/// <param name="tile"></param>
-		private void Run(UnityTile tile) {
-			if (tile.HeightDataState == TilePropertyState.Loading ||
-				tile.ImageDataState == TilePropertyState.Loading) {
-				tile.HeightDataChanged += HeightDataChangedHandler;
-				tile.ImageDataChanged += ImageDataChangedHandler;
-			} else {
-				CreateMeshes(tile, null);
-			}
-		}
+        /// <summary>
+        /// Mesh Factory waits for both Height and Image data to be processed if they are requested
+        /// </summary>
+        /// <param name="tile"></param>
+        private void Run(UnityTile tile)
+        {
+            if (tile.HeightDataState == TilePropertyState.Loading ||
+                tile.ImageDataState == TilePropertyState.Loading)
+            {
+                tile.HeightDataChanged += HeightDataChangedHandler;
+                tile.ImageDataChanged += ImageDataChangedHandler;
+            }
+            else
+            {
+                CreateMeshes(tile, null);
+            }
+        }
 
-		private void HeightDataChangedHandler(UnityTile t, object e) {
-			if (t.ImageDataState != TilePropertyState.Loading)
-				CreateMeshes(t, e);
-		}
+        private void HeightDataChangedHandler(UnityTile t, object e)
+        {
+            if (t.ImageDataState != TilePropertyState.Loading)
+                CreateMeshes(t, e);
+        }
 
-		private void ImageDataChangedHandler(UnityTile t, object e) {
-			if (t.HeightDataState != TilePropertyState.Loading)
-				CreateMeshes(t, e);
-		}
+        private void ImageDataChangedHandler(UnityTile t, object e)
+        {
+            if (t.HeightDataState != TilePropertyState.Loading)
+                CreateMeshes(t, e);
+        }
 
 
-		/// <summary>
-		/// Fetches the vector data and passes each layer to relevant layer visualizers
-		/// </summary>
-		/// <param name="tile"></param>
-		/// <param name="e"></param>
-		private void CreateMeshes(UnityTile tile, object e) {
-			tile.HeightDataChanged -= HeightDataChangedHandler;
-			tile.ImageDataChanged -= ImageDataChangedHandler;
+        /// <summary>
+        /// Fetches the vector data and passes each layer to relevant layer visualizers
+        /// </summary>
+        /// <param name="tile"></param>
+        /// <param name="e"></param>
+        private void CreateMeshes(UnityTile tile, object e)
+        {
+            tile.HeightDataChanged -= HeightDataChangedHandler;
+            tile.ImageDataChanged -= ImageDataChangedHandler;
 
-			var parameters = new Mapbox.Map.Tile.Parameters {
-				Fs = this.FileSource,
-				Id = new Mapbox.Map.CanonicalTileId(tile.Zoom, (int)tile.TileCoordinate.x, (int)tile.TileCoordinate.y),
-				MapId = _mapId
-			};
+            var parameters = new Mapbox.Map.Tile.Parameters
+            {
+                Fs = this.FileSource,
+                Id = new Mapbox.Map.CanonicalTileId(tile.Zoom, (int)tile.TileCoordinate.x, (int)tile.TileCoordinate.y),
+                MapId = _mapId
+            };
 
-			var vectorTile = new Mapbox.Map.VectorTile();
-			vectorTile.Initialize(parameters, () => {
-				if (vectorTile.HasError) {
-					Debug.Log(vectorTile.ExceptionsAsString);
-					return;
-				}
+            var vectorTile = new Mapbox.Map.VectorTile();
+            vectorTile.Initialize(parameters, () =>
+            {
+                if (vectorTile.HasError)
+                {
+                    Debug.Log(vectorTile.ExceptionsAsString);
+                    return;
+                }
 
-				foreach (var layerName in vectorTile.Data.LayerNames()) {
-					if (_layerBuilder.ContainsKey(layerName)) {
-						foreach (var builder in _layerBuilder[layerName]) {
-							if (builder.Active)
-								builder.Create(vectorTile.Data.GetLayer(layerName), tile);
-						}
-					}
-				}
-			});
-		}
-	}
+                foreach (var layerName in vectorTile.Data.LayerNames())
+                {
+                    if (_layerBuilder.ContainsKey(layerName))
+                    {
+                        foreach (var builder in _layerBuilder[layerName])
+                        {
+                            if (builder.Active)
+                                builder.Create(vectorTile.Data.GetLayer(layerName), tile);
+                        }
+                    }
+                }
+            });
+        }
+    }
 }

sdkproject/Assets/Mapbox/Core/Unity/MeshGeneration/Factories/TerrainFactory.cs

@@ -53,9 +53,9 @@ public class TerrainFactory : Factory
         private Dictionary<Vector2, UnityTile> _tiles;
         private Vector2 _stitchTarget;
 
-        public override void Initialize(IFileSource fs)
+        public override void Initialize(IFileSource fs, WorldParameters parameters)
         {
-            base.Initialize(fs);
+            base.Initialize(fs, parameters);
             _tiles = new Dictionary<Vector2, UnityTile>();
         }