incomplete commit because some bug tracking messed it all up

Author: brnkhy

Runtime/Mapbox/BaseModule/Map/TileCreator.cs

@@ -19,8 +19,6 @@ public class TileCreator : ITileCreator
         private readonly int UsingLinearColorspace = Shader.PropertyToID("_UsingLinearColorspace");
         private ObjectPool<UnityMapTile> _tilePool;
         private UnityContext _unityContext;
-        private TerrainStrategy _terrainStrategy;
-        private ElevationLayerProperties _settings;
         private int _cacheSize;
 
         public UnityMapTile GetTile() => _tilePool.GetObject();
@@ -31,15 +29,12 @@ public TileCreator(UnityContext unityContext, TerrainStrategy terrainStrategy,
         {
             TileMaterials = tileMaterials;
             _unityContext = unityContext;
-            _terrainStrategy = terrainStrategy;
-            _settings = elevationProperties ?? new ElevationLayerProperties();
             _cacheSize = cacheSize;
         }
 
         public IEnumerator Initialize()
         {
             _tilePool = new ObjectPool<UnityMapTile>(() => CreateTile(_unityContext));
-            _terrainStrategy.Initialize(_settings);
             yield return _tilePool.InitializeItems(_cacheSize);
         }
 
@@ -66,8 +61,6 @@ private UnityMapTile CreateTile(UnityContext unityContext)
             }
 
             tile.gameObject.SetActive(false);
-
-            _terrainStrategy.RegisterTile(tile, false);
             return tile;
         }
     }

Runtime/Mapbox/ImageModule/Terrain/TerrainLayerModule.cs

@@ -26,13 +26,13 @@ public TerrainLayerModule(Source<TerrainData> source, TerrainLayerModuleSettings
             _settings = settings;
             _retainedTerrainTiles = new HashSet<CanonicalTileId>();
             _rasterSource = source;
-            _terrainStrategy = new ElevatedTerrainStrategy();
+            _terrainStrategy = new FlatTerrainStrategy(); //new ElevatedTerrainStrategy();
         }
 
         public virtual IEnumerator Initialize()
         {
             yield return _rasterSource.Initialize();
-            
+            _terrainStrategy.Initialize(_settings.ElevationLayerProperties);
             if(_settings.LoadBackgroundTextures)
             {
                 _rasterSource?.DownloadAndCacheBaseTiles();
@@ -53,9 +53,10 @@ public virtual void LoadTempTile(UnityMapTile unityTile)
             for (int i = parentTileId.Z; i >= 2; i--)
             {
                 parentTileId = parentTileId.Parent;
-                if (_rasterSource.GetInstantData(parentTileId, out var instantData))
+                if (_rasterSource.GetInstantData(parentTileId, out var instantData)  && instantData.IsElevationDataReady)
                 {
                     unityTile.TerrainContainer.SetTerrainData(instantData, _settings.UseShaderTerrain, TileContainerState.Temporary);
+                    _terrainStrategy.RegisterTile(unityTile, !_settings.UseShaderTerrain);
                     return;
                 }
             }
@@ -73,15 +74,14 @@ public virtual bool LoadInstant(UnityMapTile unityTile)
             var targetTileId = GetDataId(unityTile.CanonicalTileId);
             if (_rasterSource.GetInstantData(targetTileId, out var instantData) && instantData.IsElevationDataReady)
             {
-                _terrainStrategy.RegisterTile(unityTile, false);
-                Debug.Log(unityTile.CanonicalTileId.Z + " using " + instantData.TileId.Z);
                 unityTile.TerrainContainer.SetTerrainData(instantData, _settings.UseShaderTerrain);
+                _terrainStrategy.RegisterTile(unityTile, !_settings.UseShaderTerrain);
                 return true;
             }
 
             return false;
         }
-        
+
         public virtual bool RetainTiles(HashSet<CanonicalTileId> retainedTiles, Dictionary<UnwrappedTileId, UnityMapTile> activeTiles)
         {
             if (_settings.ElevationLayerType == ElevationLayerType.FlatTerrain)

Runtime/Mapbox/ImageModule/Terrain/TerrainLayerModuleSettings.cs

@@ -1,6 +1,7 @@
 using System;
 using Mapbox.BaseModule.Data.Interfaces;
 using Mapbox.BaseModule.Map;
+using Mapbox.ImageModule.Terrain.Settings;
 using UnityEngine;
 
 namespace Mapbox.ImageModule.Terrain