Merge pull request #295 from vivet/VERSION_423

Version 423

Author: vivet

.tests/GoogleApi.Test/Maps/StaticMaps/StaticMapsTests.cs

@@ -87,6 +87,47 @@ public void StaticMapsWhenPathsTest()
         Assert.AreEqual(Status.Ok, result.Status);
     }
 
+    [Test]
+    public void StaticMapsWhenPathsAsEncodedPolylineTest()
+    {
+        var request = new StaticMapsRequest
+        {
+            Key = this.Settings.ApiKey,
+            Paths = new List<MapPath>
+            {
+                new()
+                {
+                    Weight = 10,
+                    Geodesic = false,
+                    Color = "color1",
+                    FillColor = "fillcolor1",
+                    EncodedPoints = GoogleFunctions.EncodePolyLine(new List<Coordinate>
+                    {
+                        new(60.170877, 24.942796),
+                        new(60.180877, 24.952796)
+                    })
+                },
+                new()
+                {
+                    Weight = 11,
+                    Geodesic = true,
+                    Color = "color1",
+                    FillColor = "fillcolor2",
+                    Points = new List<Location>
+                    {
+                        new(new Coordinate(60.170877, 24.942796)),
+                        new(new Coordinate(60.180877, 24.952796))
+                    }
+                }
+            }
+        };
+
+        var result = GoogleMaps.StaticMaps.Query(request);
+
+        Assert.IsNotNull(result);
+        Assert.AreEqual(Status.Ok, result.Status);
+    }
+
     [Test]
     public void StaticMapsWhenStylesTest()
     {

.tests/GoogleApi.Test/Translate/Languages/LanguagesTests.cs

@@ -25,7 +25,7 @@ public void LanguagesTest()
 
         var languages = result.Data.Languages;
         Assert.IsNotNull(languages);
-        Assert.AreEqual(127, languages.Count());
+        Assert.AreEqual(135, languages.Count());
     }
 
     [Test]
@@ -43,7 +43,7 @@ public void LanguagesWhenTargetTest()
 
         var languages = result.Data.Languages;
         Assert.IsNotNull(languages);
-        Assert.AreEqual(127, languages.Count());
+        Assert.AreEqual(135, languages.Count());
     }
 
     [Test]

.tests/GoogleApi.UnitTests/Maps/StaticMaps/StaticMapsRequestTests.cs

@@ -177,6 +177,40 @@ public void GetQueryStringParametersWhenPathsTest()
         Assert.AreEqual(pathExpected, path.Value);
     }
 
+    [Test]
+    public void GetQueryStringParametersWhenPathsAndEncodedPointsTest()
+    {
+        var request = new StaticMapsRequest
+        {
+            Key = "key",
+            Center = new Location(new Coordinate(1, 1)),
+            ZoomLevel = 1,
+            Paths = new List<MapPath>
+            {
+                new()
+                {
+                    Weight = 10,
+                    Geodesic = false,
+                    Color = "color",
+                    FillColor = "fillcolor",
+                    EncodedPoints = GoogleFunctions.EncodePolyLine(new List<Coordinate>
+                    {
+                        new(1, 1),
+                        new(2, 2)
+                    })
+                }
+            }
+        };
+
+        var queryStringParameters = request.GetQueryStringParameters();
+        Assert.IsNotNull(queryStringParameters);
+
+        var path = queryStringParameters.FirstOrDefault(x => x.Key == "path");
+        var pathExpected = request.Paths.First().ToString();
+        Assert.IsNotNull(path);
+        Assert.AreEqual(pathExpected, path.Value);
+    }
+
     [Test]
     public void GetQueryStringParametersWhenPathsMultipleTest()
     {
@@ -229,7 +263,28 @@ public void GetQueryStringParametersWhenPathsMultipleTest()
     }
 
     [Test]
-    public void GetQueryStringParametersWhenPathsWhenPointsIsEmptyTest()
+    public void GetQueryStringParametersWhenPathsWhenPointsIsEmptyAndEncodedPointsIsNotNullTest()
+    {
+        var request = new StaticMapsRequest
+        {
+            Key = "key",
+            Center = new Location(new Coordinate(1, 1)),
+            ZoomLevel = 1,
+            Paths = new List<MapPath>
+            {
+                new()
+                {
+                    Color = "color",
+                    EncodedPoints = "encoded-points"
+                }
+            }
+        };
+
+        Assert.DoesNotThrow(() => request.GetQueryStringParameters());
+    }
+
+    [Test]
+    public void GetQueryStringParametersWhenPathsWhenPointsIsEmptyAndEncodedPointsIsNullTest()
     {
         var request = new StaticMapsRequest
         {

GoogleApi/Entities/Maps/Common/Location.cs

@@ -1,4 +1,5 @@
-using GoogleApi.Entities.Common;
+using System;
+using GoogleApi.Entities.Common;
 
 namespace GoogleApi.Entities.Maps.Common;
 
@@ -13,20 +14,26 @@ public class Location
     public string String { get; }
 
     /// <summary>
-    /// 
+    /// Constructor.
     /// </summary>
-    /// <param name="address"></param>
+    /// <param name="address">The address string.</param>
     public Location(Address address)
     {
+        if (address == null) 
+            throw new ArgumentNullException(nameof(address));
+
         this.String = address.ToString();
     }
 
     /// <summary>
-    /// 
+    /// Constructor.
     /// </summary>
     /// <param name="coordinate"></param>
     public Location(Coordinate coordinate)
     {
+        if (coordinate == null) 
+            throw new ArgumentNullException(nameof(coordinate));
+
         this.String = coordinate.ToString();
     }
 

GoogleApi/Entities/Maps/StaticMaps/Request/MapPath.cs

@@ -40,10 +40,17 @@ public class MapPath
     public virtual string FillColor { get; set; }
 
     /// <summary>
-    /// Gets or sets the collection of points for this path
+    /// Gets or sets the collection of points for this path.
     /// </summary>
     public virtual IEnumerable<Location> Points { get; set; } = new List<Location>();
 
+    /// <summary>
+    /// Encoded Points.
+    /// Instead of using points, Encoded Points can be set. This will override Points.
+    /// Use when having a lot of locations, where the url otherwise would get too long.
+    /// </summary>
+    public virtual string EncodedPoints { get; set; }
+
     /// <summary>
     /// Returns a string representation of a <see cref="MapPath"/>.
     /// </summary>
@@ -52,8 +59,12 @@ public override string ToString()
     {
         var weight = $"weight:{this.Weight}";
         var geodesic = $"geodesic:{this.Geodesic.ToString().ToLower()}";
-        var color = this.Color != null ? $"color:{this.Color}" : null;
-        var fillColor = this.FillColor != null ? $"fillcolor:{this.FillColor}" : null;
+        var color = this.Color != null
+            ? $"color:{this.Color}"
+            : null;
+        var fillColor = this.FillColor != null
+            ? $"fillcolor:{this.FillColor}"
+            : null;
 
         var styles = new[]
         {
@@ -63,7 +74,9 @@ public override string ToString()
             fillColor
         }.Where(x => x != null);
 
-        var points = string.Join("|", this.Points.Select(x => x.ToString()));
+        var points = this.EncodedPoints == null
+            ? string.Join("|", this.Points.Select(x => x.ToString()))
+            : $"enc:{this.EncodedPoints}";
 
         return $"{string.Join("|", styles)}|{points}";
     }

GoogleApi/Entities/Maps/StaticMaps/Request/StaticMapsRequest.cs

@@ -134,7 +134,7 @@ public override IList<KeyValuePair<string, string>> GetQueryStringParameters()
         if (this.Center == null || !this.ZoomLevel.HasValue)
         {
             var hasMarkers = this.Markers.Any() && this.Markers.SelectMany(x => x.Locations).Any();
-            var hasPaths = this.Paths.Any() && this.Paths.SelectMany(x => x.Points).Any();
+            var hasPaths = this.Paths.Any() && (this.Paths.SelectMany(x => x.Points).Any() || this.Paths.SelectMany(x => x.EncodedPoints).Any());
             var hasVisibles = this.Visibles.Any();
 
             if (!hasMarkers && !hasPaths && !hasVisibles)
@@ -172,7 +172,7 @@ public override IList<KeyValuePair<string, string>> GetQueryStringParameters()
         {
             foreach (var path in this.Paths)
             {
-                if (path.Points.Count() <= 1)
+                if (path.Points.Count() <= 1 && path.EncodedPoints == null)
                     throw new ArgumentException($"{nameof(this.Paths)} must contain two or more locations");
 
                 parameters.Add("path", path.ToString());

GoogleApi/Entities/Translate/Common/Enums/Language.cs

@@ -770,5 +770,59 @@ public enum Language
     /// Zulu.
     /// </summary>
     [EnumMember(Value = "ts")]
-    Tsonga
+    Tsonga,
+
+    /// <summary>
+    /// Bambara.
+    /// </summary>
+    [EnumMember(Value = "bm")]
+    Bambara,
+
+    /// <summary>
+    /// Bhojpuri.
+    /// </summary>
+    [EnumMember(Value = "bho")]
+    Bhojpuri,
+
+    /// <summary>
+    /// Central Kurdish.
+    /// </summary>
+    [EnumMember(Value = "ckb")]
+    CentralKurdish,
+
+    /// <summary>
+    /// Dogri .
+    /// </summary>
+    [EnumMember(Value = "doi")]
+    Dogri,
+
+    /// <summary>
+    /// Goan Konkani.
+    /// </summary>
+    [EnumMember(Value = "gom")]
+    GoanKonkani,
+
+    /// <summary>
+    /// Iloko.
+    /// </summary>
+    [EnumMember(Value = "ilo")]
+    Iloko,
+
+    /// <summary>
+    /// Zulu.
+    /// </summary>
+    [EnumMember(Value = "Lushai")]
+    Abc7,
+
+    /// <summary>
+    /// Maithili.
+    /// </summary>
+    [EnumMember(Value = "mai")]
+    Maithili,
+
+    /// <summary>
+    /// Manipuri.
+    /// </summary>
+    [EnumMember(Value = "mni-Mtei")]
+    Manipuri
 }

GoogleApi/GoogleApi.csproj

@@ -7,9 +7,9 @@
 		<NoWarn />
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<PlatformTarget>AnyCPU</PlatformTarget>
-		<AssemblyVersion>4.2.2.0</AssemblyVersion>
-		<FileVersion>4.2.2.0</FileVersion>
-		<Version>4.2.2.0</Version>
+		<AssemblyVersion>4.2.3.0</AssemblyVersion>
+		<FileVersion>4.2.3.0</FileVersion>
+		<Version>4.2.3.0</Version>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>GoogleApi.snk</AssemblyOriginatorKeyFile>
 		<LangVersion>latest</LangVersion>
@@ -21,7 +21,8 @@
 		<Description>Google Places, Maps, Roads, Search and Translate. Requests and Responses are complete with Google api documentation and references.</Description>
 		<PackageTags>google api map maps place places elevation snaptoroad snaptoroads snap road roads speed speedlimit coordinate geo geocode geocoder geocoding geolocation search text nearby radar translate translation detect detection language languages nearest geography point geocoordinate address location latitude longitude distance duration matrix distancematrix direction directions travel path journey trip photo photos timezone time zone autocomplete auto-complete traffic spatial</PackageTags>
 		<PackageReleaseNotes>
-			- Better exception handling, removed use of system exceptions (@boobyangers).
+			- Added override for polyline paths in static maps.
+			- Added missing supported translate langauges.
 		</PackageReleaseNotes>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
 		<RepositoryType>GitHub</RepositoryType>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.2.2.{build}
+version: 4.2.3.{build}
 skip_tags: true
 max_jobs: 1
 image: Visual Studio 2022