Merge branch 'master' into merge-master-develop

* master:
  V1.4.2 hotfix (#780)
  Release/v1.4.2 (#772)
  Release/v1.4.1 (#682)

# Conflicts:
#	documentation/docs/05-changelog.md
#	sdkproject/Assets/Mapbox/Unity/LayerProperties/CoreVectorLayerProperties.cs
#	sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/PrefabModifier.cs

Author: abhishektrip

documentation/docs/05-changelog.md

@@ -29,6 +29,7 @@
 #### Bug Fixes
 - Added checks to prevent NRE in `GeocodeAttributeSearchWindow` when searching with an invalid token or no connection.
 - Fix issue where side wall mesh generation did not work with elevated terrain.
+- Fix issue with scaling prefabs for POI's. Enables correct scaling of objects with map.
 
 #### Known Issues
 - `Filters` with empty key or value parameters will exclude all features in a layer.

sdkproject/Assets/Mapbox/Unity/LayerProperties/CoreVectorLayerProperties.cs

@@ -9,7 +9,7 @@
 	public class CoreVectorLayerProperties
 	{
 		[SerializeField]
-		private string sourceId = "";
+		private string sourceId;
 		[Tooltip("Is visualizer active.")]
 		public bool isActive = true;
 		[Tooltip("Name of the visualizer. ")]

sdkproject/Assets/Mapbox/Unity/MeshGeneration/Modifiers/GameObjectModifiers/PrefabModifier.cs

@@ -11,12 +11,6 @@ namespace Mapbox.Unity.MeshGeneration.Modifiers
 	[CreateAssetMenu(menuName = "Mapbox/Modifiers/Prefab Modifier")]
 	public class PrefabModifier : GameObjectModifier
 	{
-		//[SerializeField]
-		//private GameObject _prefab;
-
-		//[SerializeField]
-		//private bool _scaleDownWithWorld = false;
-
 		private Dictionary<GameObject, GameObject> _objects;
 		[SerializeField]
 		private SpawnPrefabOptions _options;
@@ -63,11 +57,11 @@ public override void Run(VectorEntity ve, UnityTile tile)
 				{
 					goRectTransform.anchoredPosition3D = met;
 				}
+				//go.transform.localScale = Constants.Math.Vector3One;
 
-
-				if (!_options.scaleDownWithWorld)
+				if (_options.scaleDownWithWorld)
 				{
-					go.transform.localScale = (go.transform.localScale * (1.0f / tile.TileScale));
+					go.transform.localScale = (go.transform.localScale * (tile.TileScale));
 				}
 				return;
 			}
@@ -89,19 +83,18 @@ public override void Run(VectorEntity ve, UnityTile tile)
 			{
 				goRectTransform.anchoredPosition3D = met;
 			}
-
 			go.transform.SetParent(ve.GameObject.transform, false);
-			go.transform.localScale = Constants.Math.Vector3One;
+			//go.transform.localScale = Constants.Math.Vector3One;
 
 			settable = go.GetComponent<IFeaturePropertySettable>();
 			if (settable != null)
 			{
 				settable.Set(ve.Feature.Properties);
 			}
 
-			if (!_options.scaleDownWithWorld)
+			if (_options.scaleDownWithWorld)
 			{
-				go.transform.localScale = (go.transform.localScale * (1.0f / tile.TileScale));
+				go.transform.localScale = (go.transform.localScale * (tile.TileScale));
 			}
 
 			if (_options.AllPrefabsInstatiated != null)