This commit is contained in:
ai.astrakhantsev 2023-02-20 11:12:39 +05:00
parent bd5260edd1
commit d852fb3640
2 changed files with 5 additions and 5 deletions

View File

@ -32,9 +32,9 @@ namespace AsbCloudInfrastructure.Services
{ {
var data = dtos[i]; var data = dtos[i];
var flat = GetFlat(data.WellboreDepth, prevData.WellboreDepth, prevData.ZenithAngle); var flat = GetFlat(data.WellboreDepth, prevData.WellboreDepth, prevData.ZenithAngle);
var x = prevCoordinates.X = GetX(data.AzimuthGeo, flat, prevCoordinates.X); var x = prevCoordinates.X = GetX(prevData.AzimuthGeo, flat, prevCoordinates.X);
var y = prevCoordinates.Y = GetY(data.AzimuthGeo, flat, prevCoordinates.X); var y = prevCoordinates.Y = GetY(prevData.AzimuthGeo, flat, prevCoordinates.X);
var z = prevCoordinates.Z = GetZ(data.WellboreDepth, prevData.WellboreDepth, data.ZenithAngle, prevCoordinates.Z); var z = prevCoordinates.Z = GetZ(data.WellboreDepth, prevData.WellboreDepth, prevData.ZenithAngle, prevCoordinates.Z);
prevData = data; prevData = data;
var coordinates = new TrajectoryVisualizationDto var coordinates = new TrajectoryVisualizationDto
@ -50,7 +50,7 @@ namespace AsbCloudInfrastructure.Services
return result; 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); (depthEnd - depthStart) * Math.Sin(zenit * Math.PI / 180);
private double GetX(double azimuth, double flat, double prev) => private double GetX(double azimuth, double flat, double prev) =>

View File

@ -73,7 +73,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests
{ {
new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 0d}, new() { AzimuthGeo = 0d, ZenithAngle = 0d, WellboreDepth = 0d},
new() { AzimuthGeo = 30d, ZenithAngle = 30d, WellboreDepth = 10d}, 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); var mock = MakePlannedTrajectoryRepositoryMock(plannedTrajectory);