Do distance computations outside the life of the SqlConnection.

jonsagara · Feb 28, 2020 · 3accd14 · 3accd14
1 parent 0e815cb
commit 3accd14
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/LocationByZip/SqlLocationRepository.cs b/src/LocationByZip/SqlLocationRepository.cs
@@ -60,6 +60,7 @@ public async Task<IReadOnlyCollection<Location>> GetByCityStateAsync(string city
         ///  within Radius miles of inRefLoc.</returns>
         public async Task<IReadOnlyCollection<LocationInRadius>> GetLocationsInRadiusAsync(Location origin, RadiusBox bounds)
         {
+            var locationsInBoundingBox = new List<LocationInRadius>();
             var locationsInRadius = new List<LocationInRadius>();
 
             using (var conn = new SqlConnection(_connectionString))
@@ -72,17 +73,16 @@ public async Task<IReadOnlyCollection<LocationInRadius>> GetLocationsInRadiusAsy
                     EastLon = bounds.RightLongitude,
                 };
 
-                var locs = (await conn.QueryAsync<LocationInRadius>(GetLocationsWithinRadiusSql(), args))
-                    .ToArray();
+                locationsInBoundingBox.AddRange(await conn.QueryAsync<LocationInRadius>(GetLocationsWithinRadiusSql(), args));
+            }
 
-                foreach (var loc in locs)
-                {
-                    loc.DistanceToCenter = loc.DistanceFrom(origin);
+            foreach (var locInBox in locationsInBoundingBox)
+            {
+                locInBox.DistanceToCenter = locInBox.DistanceFrom(origin);
 
-                    if (loc.DistanceToCenter <= bounds.RadiusMiles)
-                    {
-                        locationsInRadius.Add(loc);
-                    }
+                if (locInBox.DistanceToCenter <= bounds.RadiusMiles)
+                {
+                    locationsInRadius.Add(locInBox);
                 }
             }