Merge commit '9778033c0d9549b8cc1a34fcc79501fbb89a208a' into runtime-editing-dev

* commit '9778033c0d9549b8cc1a34fcc79501fbb89a208a':
  Release/v1.4.1 (#682) (#683)
  Release/v1.4.1 (#682) (#684)
  Updated manual synchornization example scene (#636)
  Disable InitializeOnStart when `InitializeWithLocationProvider` is used.  (#656)
  Disable buildingsWithUniqueIds setting for MapboxStreets data source.  (#655)
  Fix satellite imagery on roof not working. (#638)
  Add camera table top ar (#614)
  [publish docs] (#652)
  Ui fixes (#643)
  add feature collections and kdtree collection (#565)
  Playmode tests (#628)
  Collider Dropdown in Abstract Map for adding colliders on top of extruded geometry (#637)

# Conflicts:
#	sdkproject/Assets/Mapbox/Unity/Map/RangeTileProvider.cs

Author: abhishektrip

LICENSE

@@ -92,4 +92,31 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
+
+============================================================================
+
+Contains a portion of kd-sharp for C#
+https://github.com/acgessler/kd-sharp
+
+The MIT License (MIT)
+
+Copyright (c) 2013, Original Committers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

documentation/docs/05-changelog.md

@@ -1,10 +1,29 @@
 ## CHANGELOG
-### v.1.4.0
-*??/??/2018*
+### v.1.4.1
+*04/17/2018*
 
-#####
-- Fix `Range Property` extrusion option for vector features.
+##### New Features
+- Add two new modules, KdTreeCollection and AddToCollection Gameobject modifier.
+- Add Collider option for vector features.
 - Add scale factor for extrusion value derived from feature property.
+- Add camera script with zoom & pan support for TabletopAR scene.
+
+##### Bug Fixes
+- Remove `buildingsWithUniqueIds` setting for `Mapbox Streets` data source.
+- Change `Style Name` to `Data Source`
+- Fix to make filter values case insensitive.
+- Fix issue where position vector features was not being set.
+- Fix `Range Property` extrusion option for vector features.
+- Select newly created layer visualizer.
+- Fix typo in colorPalette.
+- Add defaults for all sublayer properties to not carry over any options from the previous layer.
+- Don't allow empty names for layer visualizers.
+- Fix foldouts not retaining states between play mode & editor.
+- Add missing tooltips.
+- Fix issue with Satellite TextureType.
+- Added a check to prevent NRE on tile update because map was not initialized.
+- Added method to disable `InitializeOnStart` in the `Initialize With Location Provider` script.
+- Fix loop counter in `SpawnInsidePrefabModifier` which was causing an infinite loop.
 
 ### v.1.4.0
 *03/20/2018*

sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/CheapRulerCsTests.cs renamed to sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/MapboxUnitTests_CheapRulerCs.cs

@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
 // <copyright file="FileSourceTest.cs" company="Mapbox">
 //     Copyright (c) 2016 Mapbox. All rights reserved.
 // </copyright>
@@ -10,20 +10,14 @@ namespace Mapbox.CheapRulerCs.UnitTest
 {
 
 
-	using Mapbox.Platform;
 	using NUnit.Framework;
 	using System.Collections.Generic;
-	using System.Globalization;
-	using System.IO;
-	using System.Text;
-	using System;
-	using System.Linq;
 	using UnityEngine;
 	using Mapbox.CheapRulerCs;
 	using Mapbox.Json.Linq;
 
 	[TestFixture]
-	internal class ProbeExtractorCsTest
+	internal class CheapRulerCsTest
 	{
 
 
@@ -67,11 +61,8 @@ public void DistanceInMiles()
 
 		private List<line> loadFixtures()
 		{
-			string fixturePath = Application.dataPath + "/Mapbox/Core/cheap-ruler-cs/Tests/Editor/lines.json";
-			string fixtureAsText;
-			using (TextReader tw = new StreamReader(fixturePath, Encoding.UTF8)) { fixtureAsText = tw.ReadToEnd(); }
-
-			var json = JArray.Parse(fixtureAsText);
+			TextAsset fixturesAsset = Resources.Load<TextAsset>("ChearRulerCs_fixtures");
+			var json = JArray.Parse(fixturesAsset.text);
 			List<line> fixtures = new List<line>();
 
 			foreach (var line in json)
@@ -91,4 +82,4 @@ private List<line> loadFixtures()
 
 
 	}
-}
+}

sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/CheapRulerCsTests.cs.meta renamed to sdkproject/Assets/Mapbox/Core/cheap-ruler-cs/Tests/Editor/MapboxUnitTests_CheapRulerCs.cs.meta

@@ -55,9 +55,15 @@ public IAsyncRequest Query(DirectionResource direction, Action<DirectionsRespons
 		/// </summary>
 		/// <param name="str">JSON String.</param>
 		/// <returns>A <see cref="DirectionsResponse"/>.</returns>
-		internal DirectionsResponse Deserialize(string str)
+		public DirectionsResponse Deserialize(string str)
 		{
 			return JsonConvert.DeserializeObject<DirectionsResponse>(str, JsonConverters.Converters);
 		}
+
+		public string Serialize(DirectionsResponse response)
+		{
+			return JsonConvert.SerializeObject(response, JsonConverters.Converters);
+		}
+
 	}
 }

sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Directions/Directions.cs

@@ -79,7 +79,7 @@ public IAsyncRequest Geocode<T>(GeocodeResource<T> geocode, Action<ForwardGeocod
 		/// <param name="str">JSON String.</param>
 		/// <returns>A <see cref="GeocodeResponse"/>.</returns>
 		/// <typeparam name="T">Forward or reverse geocode. </typeparam>
-		internal T Deserialize<T>(string str)
+		public T Deserialize<T>(string str)
 		{
 			return JsonConvert.DeserializeObject<T>(str, JsonConverters.Converters);
 		}

sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Geocoding/Geocoder.cs

@@ -9,7 +9,7 @@ namespace Mapbox.Map
 	using System;
 	using Mapbox.Unity.Telemetry;
 
-	internal sealed class TileResource : IResource
+	public sealed class TileResource : IResource
 	{
 		readonly string _query;
 
@@ -65,7 +65,8 @@ public string GetUrl()
 				uriBuilder.Query = TelemetryFactory.EventQuery;
 			}
 
-			return uriBuilder.ToString();
+			//return uriBuilder.ToString();
+			return uriBuilder.Uri.ToString();
 		}
 	}
 }