tilerange count and minor fixes

dem-net · Mar 23, 2020 · fbf8320 · fbf8320
1 parent 3851758
commit fbf8320
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/DEM.Net.Core/Model/Imagery/TextureInfo.cs b/DEM.Net.Core/Model/Imagery/TextureInfo.cs
@@ -42,8 +42,9 @@ public class TextureInfo
         public int Height { get; }
         public int ProjectedZoom { get; }
         public BoundingBox ProjectedBounds { get; }
+        public int? TileCount { get; set; }
 
-        public TextureInfo(string filePath, TextureImageFormat imageFormat, int width, int height, int zoom = 0, BoundingBox projectedBounds = null)
+        public TextureInfo(string filePath, TextureImageFormat imageFormat, int width, int height, int zoom = 0, BoundingBox projectedBounds = null, int? tileCount = null)
         {
             this.FilePath = filePath;
             this.FileName = Path.GetFileName(filePath);
@@ -52,8 +53,9 @@ public TextureInfo(string filePath, TextureImageFormat imageFormat, int width, i
             this.Height = height;
             this.ProjectedZoom = zoom;
             this.ProjectedBounds = projectedBounds;
+            this.TileCount = tileCount;
         }
 
-       
+
     }
 }
diff --git a/DEM.Net.Core/Model/Imagery/TileRange.cs b/DEM.Net.Core/Model/Imagery/TileRange.cs
@@ -62,6 +62,7 @@ public void AddRange(IEnumerable<MapTile> tiles)
         public MapTileInfo End { get; set; }
         public int NumCols => End.X - Start.X + 1;
         public int NumRows => End.Y - Start.Y + 1;
+        public int Count => NumCols * NumRows;
 
         public BoundingBox AreaOfInterest { get; internal set; }
 

diff --git a/DEM.Net.Core/Services/Imagery/ImageryService.cs b/DEM.Net.Core/Services/Imagery/ImageryService.cs
@@ -165,9 +165,8 @@ public TileRange DownloadTiles(TileRange tiles, ImageryProvider provider)
                         {
                             entry.SetSlidingExpiration(TimeSpan.FromMinutes(options.ImageryCacheExpirationMinutes));
 
-                            return _httpClient.GetByteArrayAsync(tileUri).Result;
-                        });
-                        //var contentBytes = _httpClient.GetByteArrayAsync(tileUri).Result;
+                            return _httpClient.GetByteArrayAsync(tileUri).GetAwaiter().GetResult();
+                        });                        
                         tiles.Add(new MapTile(contentBytes, provider.TileSize, tileUri, tileInfo));
 
                     }
@@ -278,7 +277,7 @@ BoundingBox GetTilesBoundingBox(TileRange tiles)
             }
 #endif
             return new TextureInfo(fileName, mimeType, (int)projectedBbox.Width, (int)projectedBbox.Height, zoomLevel,
-                projectedBbox);
+                projectedBbox, tiles.Count);
             //return new TextureInfo(fileName, format, (int)tilesBbox.Width, (int)tilesBbox.Height);
         }