Merge pull request #1220 from mapbox/revertUriBuilderChanges

revert uribuilder changes from before for safety

Author: abhishektrip

sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Map/TileResource.cs

@@ -55,7 +55,18 @@ internal static TileResource MakeStyleOptimizedVector(CanonicalTileId id, string
 
 		public string GetUrl()
 		{
-			return _query;
+			var uriBuilder = new UriBuilder(_query);
+			if (uriBuilder.Query != null && uriBuilder.Query.Length > 1)
+			{
+				uriBuilder.Query = uriBuilder.Query.Substring(1) + "&" + TelemetryFactory.EventQuery;
+			}
+			else
+			{
+				uriBuilder.Query = TelemetryFactory.EventQuery;
+			}
+
+			//return uriBuilder.ToString();
+			return uriBuilder.Uri.ToString();
 		}
 	}
 }

sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/Cache/CachingWebFileSource.cs

@@ -1,6 +1,4 @@
-using Mapbox.Unity.Telemetry;
-
-namespace Mapbox.Platform.Cache
+namespace Mapbox.Platform.Cache
 {
 	using System;
 	using Mapbox.Platform;
@@ -118,6 +116,7 @@ string uri
 			, string mapId = null
 		)
 		{
+
 			if (string.IsNullOrEmpty(mapId))
 			{
 				throw new Exception("Cannot cache without a map id");
@@ -135,11 +134,20 @@ string uri
 				}
 			}
 
-			var finalUrl = uri + "?" + TelemetryFactory.EventQuery;
+			var uriBuilder = new UriBuilder(uri);
 			if (!string.IsNullOrEmpty(_accessToken))
 			{
-				finalUrl += "&access_token=" + _accessToken;
+				string accessTokenQuery = "access_token=" + _accessToken;
+				if (uriBuilder.Query != null && uriBuilder.Query.Length > 1)
+				{
+					uriBuilder.Query = uriBuilder.Query.Substring(1) + "&" + accessTokenQuery;
+				}
+				else
+				{
+					uriBuilder.Query = accessTokenQuery;
+				}
 			}
+			string finalUrl = uriBuilder.ToString();
 
 #if MAPBOX_DEBUG_CACHE
 			string methodName = _className + "." + new System.Diagnostics.StackFrame().GetMethod().Name;

sdkproject/Assets/Mapbox/Core/mapbox-sdk-cs/Platform/FileSource.cs

@@ -4,8 +4,6 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-using Mapbox.Unity.Telemetry;
-
 namespace Mapbox.Platform
 {
 	using Mapbox.Map;
@@ -86,11 +84,18 @@ string url
 		{
 			if (!string.IsNullOrEmpty(_accessToken))
 			{
-				url = url + "?" + TelemetryFactory.EventQuery;
-				if (!string.IsNullOrEmpty(_accessToken))
+				var uriBuilder = new UriBuilder(url);
+				string accessTokenQuery = "access_token=" + _accessToken;
+				if (uriBuilder.Query != null && uriBuilder.Query.Length > 1)
+				{
+					uriBuilder.Query = uriBuilder.Query.Substring(1) + "&" + accessTokenQuery;
+				}
+				else
 				{
-					url += "&access_token=" + _accessToken;
+					uriBuilder.Query = accessTokenQuery;
 				}
+
+				url = uriBuilder.ToString();
 			}
 
 			// TODO: