Merge pull request #38 from dem-net/dev

0.1.0-beta0007

DEM.Net.Core/DEM.Net.Core.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <PackageId>DEM.Net.Core</PackageId>
-    <Version>0.1.0-beta0006</Version>
+    <Version>0.1.0-beta0007</Version>
     <Authors>Xavier Fischer, Frédéric Aubin</Authors>
     <Copyright>Xavier Fischer, Frédéric Aubin</Copyright>
     <Owners>Xavier Fischer</Owners>

DEM.Net.Core/DependencyInjection/IServiceCollectionExtensions.cs

@@ -1,5 +1,4 @@
 using DEM.Net.Core.Imagery;
-using DEM.Net.Core.Services.Mesh;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;

DEM.Net.Core/Services/Elevation/ElevationService.cs

@@ -44,7 +44,7 @@ public class ElevationService : IElevationService
         private readonly IRasterService _IRasterService;
         private readonly ILogger<ElevationService> _logger;
 
-        public ElevationService(IRasterService rasterService, ILogger<ElevationService> logger)
+        public ElevationService(IRasterService rasterService, ILogger<ElevationService> logger = null)
         {
             _IRasterService = rasterService;
             _logger = logger;

DEM.Net.Core/Services/Imagery/ImageryService.cs

@@ -23,7 +23,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using DEM.Net.Core.Services.Mesh;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -61,7 +60,7 @@ public class ImageryService : IImageryService
 #if NETSTANDARD
         private readonly IConfigurationRoot _config;
 
-        public ImageryService(IMeshService meshService, ILogger<ImageryService> logger)
+        public ImageryService(IMeshService meshService, ILogger<ImageryService> logger = null)
         {
             _logger = logger;
             _meshService = meshService;

DEM.Net.Core/Services/Mesh/BoxBaseThickness.cs

@@ -23,7 +23,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
-namespace DEM.Net.Core.Services.Mesh
+namespace DEM.Net.Core
 {
     public enum BoxBaseThickness
     {

DEM.Net.Core/Services/Mesh/IMeshService.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace DEM.Net.Core.Services.Mesh
+namespace DEM.Net.Core
 {
     public interface IMeshService
     {

DEM.Net.Core/Services/Mesh/MeshService.cs

@@ -31,13 +31,13 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DEM.Net.Core.Services.Mesh
+namespace DEM.Net.Core
 {
     public class MeshService : IMeshService
     {
         private readonly ILogger<MeshService> _logger;
 
-        public MeshService(ILogger<MeshService> logger)
+        public MeshService(ILogger<MeshService> logger = null)
         {
             _logger = logger;
         }

DEM.Net.Core/Services/Mesh/TriangulationResult.cs

@@ -30,7 +30,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DEM.Net.Core.Services.Mesh
+namespace DEM.Net.Core
 {
     public class TriangulationResult
     {

DEM.Net.Core/Services/Raster/GDALVRTFileService.cs

@@ -59,6 +59,7 @@ public GDALVRTFileService(string localDirectory, DEMDataSet dataSet)
         {
             _localDirectory = localDirectory;
             _dataSet = dataSet;
+            _cacheByDemName = new Dictionary<string, List<GDALSource>>();
         }
 
         /// <summary>

DEM.Net.Core/Services/Raster/RasterService.cs

@@ -52,10 +52,11 @@ public string LocalDirectory
             get { return _localDirectory; }
         }
 
-        public RasterService(ILogger<RasterService> logger)
+        public RasterService(ILogger<RasterService> logger = null)
         {
             _logger = logger;
-            _localDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), APP_NAME);
+            //_localDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), APP_NAME);
+            _localDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), APP_NAME);
             if (!Directory.Exists(_localDirectory))
                 Directory.CreateDirectory(_localDirectory);