Merge branch 'develop'

Author: xfischer

DEM.Net.Extension.Osm/Implementation/DefaultProcessor/DefaultOsmProcessor.cs

@@ -17,15 +17,15 @@ namespace DEM.Net.Extension.Osm
     public class DefaultOsmProcessor
     {
         private readonly DEMNetOptions _options;
-        private readonly IElevationService _elevationService;
+        private readonly ElevationService _elevationService;
         private readonly SharpGltfService _gltfService;
-        private readonly IMeshService _meshService;
+        private readonly MeshService _meshService;
         private readonly OsmService _osmService;
         private readonly ILogger<DefaultOsmProcessor> _logger;
 
-        public DefaultOsmProcessor(IElevationService elevationService
+        public DefaultOsmProcessor(ElevationService elevationService
             , SharpGltfService gltfService
-            , IMeshService meshService
+            , MeshService meshService
             , OsmService osmService
             , IOptions<DEMNetOptions> options
             , ILogger<DefaultOsmProcessor> logger)

DEM.Net.Extension.Osm/Implementation/_Processor/IOsmProcessor.cs

@@ -19,9 +19,9 @@ public interface IOsmProcessor
         string[] RelationsFilter { get; set; }
         string[] NodesFilter { get; set; }
 
-        void Init(IElevationService elevationService
+        void Init(ElevationService elevationService
             , SharpGltfService gltfService
-            , IMeshService meshService
+            , MeshService meshService
             , OsmService osmService
             , ILogger logger);
 

DEM.Net.Extension.Osm/Implementation/_Processor/OsmProcessorStage.cs

@@ -12,15 +12,15 @@ namespace DEM.Net.Extension.Osm
     public abstract class OsmProcessorStage<T> : IOsmProcessor
         where T : CommonModel
     {
-        protected IElevationService _elevationService;
+        protected ElevationService _elevationService;
         protected SharpGltfService _gltfService;
-        protected IMeshService _meshService;
+        protected MeshService _meshService;
         protected OsmService _osmService;
         protected ILogger _logger;
 
-        public void Init(IElevationService elevationService
+        public void Init(ElevationService elevationService
             , SharpGltfService gltfService
-            , IMeshService meshService
+            , MeshService meshService
             , OsmService osmService
             , ILogger logger)
         {

Samples/Helladic/HelladicSample.cs

@@ -26,19 +26,19 @@ public class HelladicSample
     {
         private readonly DefaultOsmProcessor _sampleOsmProcessor;
         private readonly ImageryService _imageryService;
-        private readonly IElevationService _elevationService;
+        private readonly ElevationService _elevationService;
         private readonly SharpGltfService _gltfService;
-        private readonly IMeshService _meshService;
+        private readonly MeshService _meshService;
         private readonly SketchFab.SketchFabApi _sketchFabApi;
         private readonly string _sketchFabToken;
         private readonly ILogger _logger;
 
 
         public HelladicSample(DefaultOsmProcessor sampleOsmProcessor
                 , ImageryService imageryService
-                , IElevationService elevationService
+                , ElevationService elevationService
                 , SharpGltfService gltfService
-                , IMeshService meshService
+                , MeshService meshService
                 , SketchFab.SketchFabApi sketchFabApi
                 , IOptions<AppSecrets> secrets
                 , ILogger<HelladicSample> logger)

Samples/Osm/OsmExtensionSample.cs

@@ -23,15 +23,15 @@ public class OsmExtensionSample
     {
         private readonly DefaultOsmProcessor _osmProcessor;
         private readonly ImageryService _imageryService;
-        private readonly IElevationService _elevationService;
+        private readonly ElevationService _elevationService;
         private readonly SharpGltfService _gltfService;
         private readonly ILogger _logger;
 
         private float ZScale = 2f;
 
         public OsmExtensionSample(DefaultOsmProcessor osmProcessor
                 , ImageryService imageryService
-                , IElevationService elevationService
+                , ElevationService elevationService
                 , SharpGltfService gltfService
                 , ILogger<OsmExtensionSample> logger)
         {

Samples/SampleApplication.cs

@@ -43,12 +43,12 @@ namespace SampleApp
     public class SampleApplication
     {
         private readonly ILogger<SampleApplication> _logger;
-        private readonly IRasterService rasterService;
+        private readonly RasterService rasterService;
         private readonly IServiceProvider services;
         private const string DATA_FILES_PATH = null; //@"C:\Users\ElevationAPI\AppData\Local"; // Leave to null for default location (Environment.SpecialFolder.LocalApplicationData)
 
         public SampleApplication(ILogger<SampleApplication> logger, IServiceProvider services,
-            IRasterService rasterService)
+            RasterService rasterService)
         {
             _logger = logger;
             this.rasterService = rasterService;