diff --git a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs index 6f65e1b9..e3adac11 100644 --- a/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs +++ b/AsbCloudInfrastructure/Services/Trajectory/TrajectoryService.cs @@ -47,7 +47,6 @@ abstract class TrajectoryBaseService var geoCoordinatesArray = geoCoordinates.OrderBy(c => c.WellboreDepth).ToArray(); for (var i = 1; i < geoCoordinatesLength; i++) { - var preCoordinates = cartesianCoordinates[i - 1]; var coordinates = Calculate(cartesianCoordinates[i - 1], geoCoordinatesArray[i - 1], geoCoordinatesArray[i]); diff --git a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs index f0e47e8e..e3740ebd 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs @@ -1,5 +1,4 @@ using AsbCloudApp.Data; -using AsbCloudApp.Data.WITS; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services.Trajectory; using Moq; @@ -84,12 +83,12 @@ namespace AsbCloudWebApi.Tests.ServicesTests var lastPointFact = result.Fact!.Last(); Assert.Equal(0d, lastPointPlan.X, 0.1d); - Assert.Equal(0d, lastPointPlan.Y, 0.1d); - Assert.Equal(50d, lastPointPlan.Z, 0.1d); + Assert.Equal(-50d, lastPointPlan.Y, 0.1d); + Assert.Equal(0d, lastPointPlan.Z, 0.1d); Assert.Equal(0d, lastPointFact.X, 0.1d); - Assert.Equal(0d, lastPointFact.Y, 0.1d); - Assert.Equal(50d, lastPointFact.Z, 0.1d); + Assert.Equal(-50d, lastPointFact.Y, 0.1d); + Assert.Equal(0d, lastPointFact.Z, 0.1d); } [Fact] @@ -118,12 +117,12 @@ namespace AsbCloudWebApi.Tests.ServicesTests var tolerancePlan = 0.001d; var toleranceFact = 0.001d; - Assert.InRange(lastPointPlan.Z, 10 + tolerancePlan, 20 - tolerancePlan); - Assert.InRange(lastPointPlan.Y, 0 + tolerancePlan, 10 - tolerancePlan); + Assert.InRange(lastPointPlan.Z, -10 - tolerancePlan, 0 - tolerancePlan); + Assert.InRange(lastPointPlan.Y, -20 - tolerancePlan, -10 + tolerancePlan); Assert.InRange(lastPointPlan.X, 0 + tolerancePlan, 10 - tolerancePlan); - Assert.InRange(lastPointFact.Z, 10 + toleranceFact, 20 - toleranceFact); - Assert.InRange(lastPointFact.Y, 0 + toleranceFact, 10 - toleranceFact); + Assert.InRange(lastPointFact.Z, -10 - toleranceFact, 0 - toleranceFact); + Assert.InRange(lastPointFact.Y, -20 - toleranceFact, -10 + toleranceFact); Assert.InRange(lastPointFact.X, 0 + toleranceFact, 10 - toleranceFact); } }