AddRouteDestinations fixed: supported addresses with no AddressString

Author: Dmitry Koval

route4me-csharp-sdk/Route4MeSDKLibrary/Route4MeManager.cs

@@ -3080,18 +3080,18 @@ public int[] AddRouteDestinations(string routeId, Address[] addresses, bool opti
             var arrDestinationIds = new List<int>();
 
             if (response != null && response.Addresses != null)
+            {
                 addresses.ForEach(addressNew =>
                 {
-                    response.Addresses.Where(addressResp => addressResp.AddressString == addressNew.AddressString &&
-                                                            Math.Abs(addressResp.Latitude - addressNew.Latitude) <
-                                                            0.0001 &&
-                                                            Math.Abs(addressResp.Longitude - addressNew.Longitude) <
-                                                            0.0001 &&
-                                                            addressResp.RouteDestinationId != null).ForEach(addrResp =>
-                    {
-                        arrDestinationIds.Add((int) addrResp.RouteDestinationId);
-                    });
+                    response.Addresses.Where(addressResp =>
+                            (addressResp.AddressString == addressNew.AddressString ||
+                             addressNew.AddressString == null) &&
+                            Math.Abs(addressResp.Latitude - addressNew.Latitude) < 0.0001 &&
+                            Math.Abs(addressResp.Longitude - addressNew.Longitude) < 0.0001 &&
+                            addressResp.RouteDestinationId != null)
+                        .ForEach(addrResp => { arrDestinationIds.Add((int)addrResp.RouteDestinationId); });
                 });
+            }
 
             return arrDestinationIds.ToArray();
         }
@@ -3119,18 +3119,18 @@ public async Task<Tuple<int[], string>> AddRouteDestinationsAsync(string routeId
             var arrDestinationIds = new List<int>();
 
             if (response.Item1 != null && response.Item1.Addresses != null)
+            {
                 addresses.ForEach(addressNew =>
                 {
-                    response.Item1.Addresses.Where(addressResp => addressResp.AddressString == addressNew.AddressString &&
-                                                            Math.Abs(addressResp.Latitude - addressNew.Latitude) <
-                                                            0.0001 &&
-                                                            Math.Abs(addressResp.Longitude - addressNew.Longitude) <
-                                                            0.0001 &&
-                                                            addressResp.RouteDestinationId != null).ForEach(addrResp =>
-                                                            {
-                                                                arrDestinationIds.Add((int)addrResp.RouteDestinationId);
-                                                            });
+                    response.Item1.Addresses.Where(addressResp =>
+                            (addressResp.AddressString == addressNew.AddressString ||
+                             addressNew.AddressString == null) &&
+                            Math.Abs(addressResp.Latitude - addressNew.Latitude) < 0.0001 &&
+                            Math.Abs(addressResp.Longitude - addressNew.Longitude) < 0.0001 &&
+                            addressResp.RouteDestinationId != null)
+                        .ForEach(addrResp => { arrDestinationIds.Add((int)addrResp.RouteDestinationId); });
                 });
+            }
 
             return new Tuple<int[], string>(arrDestinationIds.ToArray(), response.Item2);
         }

route4me-csharp-sdk/Route4MeSDKUnitTest/Tests/AddressesGroupTests.cs

@@ -198,6 +198,88 @@ public void AddRouteDestinationsTest()
             Assert.That(destinationIds, Is.InstanceOf<int[]>(), "AddRouteDestinationsTest failed. " + errorString);
         }
 
+        [Test]
+        public void AddRouteDestinationsWithNoAddressStringTest()
+        {
+            var route4Me = new Route4MeManager(c_ApiKey);
+
+            var route_id = _tdr.SDRT_route_id;
+
+            Assert.IsNotNull(route_id, "rote_id is null.");
+
+            // Prepare the addresses
+
+            #region Addresses
+
+            Address[] addresses =
+            {
+                new Address
+                {
+                    Latitude = 30.143526,
+                    Longitude = -87.240354,
+                    Time = 0
+                },
+
+                new Address
+                {
+                    Latitude = 30.177852,
+                    Longitude = -87.263535,
+                    Time = 0
+                }
+            };
+
+            #endregion
+
+            // Run the query
+            var optimalPosition = true;
+
+            var destinationIds = route4Me.AddRouteDestinations(
+                route_id,
+                addresses,
+                optimalPosition,
+                out var errorString);
+
+            Assert.That(destinationIds.Length, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void AddInvalidRouteDestinationsWithNoAddressStringTest()
+        {
+            var route4Me = new Route4MeManager(c_ApiKey);
+
+            var route_id = _tdr.SDRT_route_id;
+
+            Assert.IsNotNull(route_id, "rote_id is null.");
+
+            // Prepare the addresses
+
+            #region Addresses
+
+            Address[] addresses =
+            {
+                new Address
+                {
+                },
+
+                new Address
+                {
+                }
+            };
+
+            #endregion
+
+            // Run the query
+            var optimalPosition = true;
+
+            var destinationIds = route4Me.AddRouteDestinations(
+                route_id,
+                addresses,
+                optimalPosition,
+                out var errorString);
+
+            Assert.That(errorString, Is.Not.Empty);
+        }
+
         [Test]
         public void AddRouteDestinationInSpecificPositionTest()
         {