Add support for DurationInTraffic

src/Google.Maps/AvoidHelper.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Google.Maps

src/Google.Maps/BaseRequest.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Google.Maps
 {

src/Google.Maps/Common/IServiceResponse.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Google.Maps.Common
+namespace Google.Maps.Common
 {
     public interface IServiceResponse
     {

src/Google.Maps/ComponentFilter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Google.Maps
 {

src/Google.Maps/Constants.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 
 namespace Google.Maps

src/Google.Maps/Direction/DirectionLeg.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Google.Maps.Direction
 {
@@ -13,6 +10,9 @@ public class DirectionLeg
 
 		[JsonProperty("duration")]
 		public ValueText Duration { get; set; }
+
+		[JsonProperty("duration_in_traffic")]
+		public ValueText DurationInTraffic { get; set; }
 
 		[JsonProperty("distance")]
 		public ValueText Distance { get; set; }

src/Google.Maps/Direction/DirectionRequest.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Google.Maps;
 using System.ComponentModel;
 
 namespace Google.Maps.Direction
@@ -24,6 +23,15 @@ public class DirectionRequest : BaseRequest
 		[DefaultValue(TravelMode.driving)]
 		public TravelMode Mode { get; set; }
 
+
+		/// <summary>
+		/// Specifies the assumptions to use when calculating time in traffic. This setting affects the value returned in the duration_in_traffic field in the response,
+		/// which contains the predicted time in traffic based on historical averages. The traffic_model parameter may only be specified for driving directions where
+		/// the request includes a departure_time, and only if the request includes an API key or a Google Maps Platform Premium Plan client ID. 
+		/// </summary>
+		[DefaultValue(TrafficModel.best_guess)]
+		public TrafficModel TrafficModel { get; set; }
+
 		/// <summary>
 		/// (optional) Directions may be calculated that adhere to certain restrictions.
 		/// </summary>
@@ -119,6 +127,7 @@ public override Uri ToUri()
 				.Append("origin", (Origin == null ? (string)null : Origin.GetAsUrlParameter()))
 				.Append("destination", (Destination == null ? (string)null : Destination.GetAsUrlParameter()))
 				.Append("mode", (Mode != TravelMode.driving ? Mode.ToString() : (string)null))
+				.Append("traffic_model", (TrafficModel!=TrafficModel.best_guess ? TrafficModel.ToString():(string)null))
 				.Append("departure_time", (DepartureTime == null ? null : DepartureTime.Value.ToString()))
 				.Append("arrival_time", (ArrivalTime == null ? null : ArrivalTime.Value.ToString()))
 				.Append("waypoints", WaypointsToUri())

src/Google.Maps/Direction/DirectionResponse.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Google.Maps.Common;
 
 namespace Google.Maps.Direction

src/Google.Maps/Direction/DirectionRoute.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps/Direction/DirectionStep.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Newtonsoft.Json;
 
 namespace Google.Maps.Direction
@@ -23,6 +21,9 @@ public class DirectionStep
 		[JsonProperty("duration")]
 		public ValueText Duration { get; set; }
 
+		[JsonProperty("duration_in_traffic")]
+		public ValueText DurationInTraffic { get; set; }
+
 		[Obsolete("maneuver is obsolete", false)]
 		public string Maneuver { get; set; }
 

src/Google.Maps/Direction/DirectionTransitDetails.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps/Direction/GeocodedWaypoint.cs

@@ -1,9 +1,5 @@
 using Google.Maps.Shared;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps/Direction/LineInfo.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 
 namespace Google.Maps.Direction

src/Google.Maps/Direction/Polyline.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps/Direction/Stop.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps/Direction/Time.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps/Direction/TransitAgency .cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 
 namespace Google.Maps.Direction

src/Google.Maps/Direction/VehicleInfo.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace Google.Maps.Direction
 {

src/Google.Maps/DistanceMatrix/DistanceMatrixRequest.cs

@@ -18,7 +18,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using Google.Maps;
 using System.Text;
 using System.Linq;
 

src/Google.Maps/DistanceMatrix/DistanceMatrixResponse.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Google.Maps.Common;
 
 namespace Google.Maps.DistanceMatrix

src/Google.Maps/ExceptionHelper.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Google.Maps
 {

src/Google.Maps/GMapsImageFormats.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Google.Maps
+namespace Google.Maps
 {
 	/// <summary>
 	/// Represents the different image formats available from the Google Maps API.

src/Google.Maps/Geocoding/GeocodeResponse.cs

@@ -17,7 +17,6 @@
 
 using Google.Maps.Common;
 using Newtonsoft.Json;
-using System;
 
 namespace Google.Maps.Geocoding
 {

src/Google.Maps/Geocoding/Result.cs

@@ -16,7 +16,6 @@
  */
 
 using Newtonsoft.Json;
-using System;
 using Google.Maps.Shared;
 
 namespace Google.Maps.Geocoding

src/Google.Maps/Google.Maps.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard1.3</TargetFrameworks>
+	  <TargetFramework>net7.0</TargetFramework>
+	  <LangVersion>latest</LangVersion>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <DelaySign>False</DelaySign>
+    <Configurations>Debug;Release;Release_PathDiagnostics</Configurations>
+    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net461'">
     <DefineConstants>HAS_SYSTEMDRAWING</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Net.Http" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 </Project>

src/Google.Maps/Internal/ConvertUtil.cs

@@ -1,7 +1,5 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Collections.Generic;
-using System.Text;
 using System.Collections;
 
 namespace Google.Maps.Internal

src/Google.Maps/Internal/QueryStringBuilder.cs

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-using System;
-
 namespace Google.Maps.Internal
 {
 	internal class QueryStringBuilder

src/Google.Maps/Internal/RequestUtils.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 

src/Google.Maps/Internal/StringCaseExtensions.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 
 namespace Google.Maps.Internal
 {

src/Google.Maps/Internal/ValueTextComparer.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Google.Maps
 {

src/Google.Maps/JsonEnumTypeConverter.cs

@@ -16,7 +16,6 @@
  */
 
 using System;
-using Google.Maps.Geocoding;
 using Google.Maps.Shared;
 using Newtonsoft.Json;
 

src/Google.Maps/LatLngComparer.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Google.Maps
 {

src/Google.Maps/Location.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Google.Maps
+namespace Google.Maps
 {
 	/// <summary>
 	/// A general free-text location, usually for specifying an address or particular place for Google Maps.

src/Google.Maps/MapMarker.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.ComponentModel;
 
 namespace Google.Maps

src/Google.Maps/MapMarkersCollection.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 
 namespace Google.Maps
 {

src/Google.Maps/MapTypes.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Google.Maps
+namespace Google.Maps
 {
 	/// <summary>
 	/// The available map types for the current Google Maps API.

src/Google.Maps/MarkerSizes.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Google.Maps
+namespace Google.Maps
 {
 	/// <summary>
 	/// The set of marker sizes available for the current Google Maps API.

src/Google.Maps/Path.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.ComponentModel;
 
 namespace Google.Maps