Merge branch 'dev'

dem-net · Feb 25, 2020 · 0af3d89 · 0af3d89
2 parents 7faf338 + 7b767e6
commit 0af3d89
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 40 deletions.
diff --git a/DEM.Net.Core/Configuration/ServiceCollectionExtensions.cs b/DEM.Net.Core/Configuration/ServiceCollectionExtensions.cs
@@ -42,7 +42,7 @@ public static IServiceCollection AddDemNetCore(this IServiceCollection services)
                     .AddSingleton<IRasterService, RasterService>()
                     .AddTransient<IElevationService, ElevationService>()
                     .AddTransient<IMeshService, MeshService>()
-                    .AddSingleton<IImageryService, ImageryService>();
+                    .AddSingleton<ImageryService>();
 
             return services;
         }

diff --git a/DEM.Net.Core/Services/Imagery/IImageryService.cs b/DEM.Net.Core/Services/Imagery/IImageryService.cs
diff --git a/DEM.Net.Core/Services/Imagery/ImageryService.cs b/DEM.Net.Core/Services/Imagery/ImageryService.cs
@@ -57,7 +57,7 @@
 
 namespace DEM.Net.Core.Imagery
 {
-    public class ImageryService : IImageryService
+    public class ImageryService
     {
         #region Tiled imagery
 
@@ -275,7 +275,7 @@ BoundingBox GetTilesBoundingBox(TileRange tiles)
         }
 
         public TextureInfo ConstructTextureWithGpxTrack(TileRange tiles, BoundingBox bbox, string fileName,
-            TextureImageFormat mimeType, IEnumerable<GeoPoint> gpxPoints, bool drawGpxVertices)
+            TextureImageFormat mimeType, IEnumerable<GeoPoint> gpxPoints, bool drawGpxVertices = false)
         {
             // where is the bbox in the final image ?
 
@@ -440,7 +440,7 @@ public bool IsTokenConfigurationValid(ImageryProvider provider)
         /// <param name="heightMap">heightMap in projected coordinates</param>
         /// <param name="outputDirectory"></param>
         /// <returns></returns>
-        public TextureInfo GenerateNormalMap(HeightMap heightMap, string outputDirectory, string fileName)
+        public TextureInfo GenerateNormalMap(HeightMap heightMap, string outputDirectory, string fileName = "normalmap.png")
         {
             List<Vector3> normals = _meshService.ComputeNormals(heightMap).ToList();