diff --git a/AsbCloudInfrastructure/Services/TrajectoryVisualizationService.cs b/AsbCloudInfrastructure/Services/TrajectoryVisualizationService.cs index 56e02565..1c90e8d8 100644 --- a/AsbCloudInfrastructure/Services/TrajectoryVisualizationService.cs +++ b/AsbCloudInfrastructure/Services/TrajectoryVisualizationService.cs @@ -32,9 +32,9 @@ namespace AsbCloudInfrastructure.Services { var data = dtos[i]; var flat = GetFlat(data.WellboreDepth, prevData.WellboreDepth, prevData.ZenithAngle); - var x = prevCoordinates.X = GetX(data.AzimuthGeo, flat, prevCoordinates.X); - var y = prevCoordinates.Y = GetY(data.AzimuthGeo, flat, prevCoordinates.X); - var z = prevCoordinates.Z = GetZ(data.WellboreDepth, prevData.WellboreDepth, data.ZenithAngle, prevCoordinates.Z); + var x = prevCoordinates.X = GetX(prevData.AzimuthGeo, flat, prevCoordinates.X); + var y = prevCoordinates.Y = GetY(prevData.AzimuthGeo, flat, prevCoordinates.X); + var z = prevCoordinates.Z = GetZ(data.WellboreDepth, prevData.WellboreDepth, prevData.ZenithAngle, prevCoordinates.Z); prevData = data; var coordinates = new TrajectoryVisualizationDto @@ -50,7 +50,7 @@ namespace AsbCloudInfrastructure.Services return result; } - private double GetFlat(double depthEnd, double depthStart, double zenit) => + private double GetFlat(double depthEnd, double depthStart, double zenit) => (depthEnd - depthStart) * Math.Sin(zenit * Math.PI / 180); private double GetX(double azimuth, double flat, double prev) => diff --git a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs index 914a374c..7ba99ce0 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs @@ -73,7 +73,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests { new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 0d}, new() { AzimuthGeo = 30d, ZenithAngle = 30d, WellboreDepth = 10d}, - new() { AzimuthGeo = 20d, ZenithAngle = 20d, WellboreDepth = 20d}, + new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 20d}, }; var mock = MakePlannedTrajectoryRepositoryMock(plannedTrajectory);