From 4fdd45049a47e90e994e8153cf6b3dd329400638 Mon Sep 17 00:00:00 2001
From: sesteves <sroesteves@gmail.com>
Date: Fri, 8 Jul 2016 19:28:36 +0100
Subject: [PATCH] minor
---
.../atmosphericrefraction/AtmosphericRefraction.java | 3 ++-
.../rugged/atmosphericrefraction/MultiLayerModel.java | 10 +++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/orekit/rugged/atmosphericrefraction/AtmosphericRefraction.java b/src/main/java/org/orekit/rugged/atmosphericrefraction/AtmosphericRefraction.java
index 05bee9ec..4e5e0ba0 100644
--- a/src/main/java/org/orekit/rugged/atmosphericrefraction/AtmosphericRefraction.java
+++ b/src/main/java/org/orekit/rugged/atmosphericrefraction/AtmosphericRefraction.java
@@ -18,6 +18,7 @@ package org.orekit.rugged.atmosphericrefraction;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+import org.orekit.rugged.raster.Tile;
/**
* Interface for atmospheric refraction.
@@ -25,6 +26,6 @@ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
*/
public interface AtmosphericRefraction {
- double getDeviation(Vector3D pos, Vector3D los, Vector3D zenith, double altitude);
+ double getDeviation(Vector3D pos, Vector3D los, Vector3D zenith, double altitude, Tile tile);
}
diff --git a/src/main/java/org/orekit/rugged/atmosphericrefraction/MultiLayerModel.java b/src/main/java/org/orekit/rugged/atmosphericrefraction/MultiLayerModel.java
index d2b54f90..1ebaa007 100644
--- a/src/main/java/org/orekit/rugged/atmosphericrefraction/MultiLayerModel.java
+++ b/src/main/java/org/orekit/rugged/atmosphericrefraction/MultiLayerModel.java
@@ -18,6 +18,9 @@ package org.orekit.rugged.atmosphericrefraction;
import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
import org.apache.commons.math3.util.FastMath;
+import org.orekit.rugged.raster.Tile;
+import org.orekit.rugged.utils.ExtendedEllipsoid;
+import org.orekit.rugged.utils.NormalizedGeodeticPoint;
import java.util.Collections;
import java.util.Map;
@@ -53,7 +56,10 @@ public class MultiLayerModel implements AtmosphericRefraction {
}
@Override
- public double getDeviation(Vector3D pos, Vector3D los, Vector3D zenith, double altitude) {
+ public double getDeviation(Vector3D pos, Vector3D los, Vector3D zenith, double altitude, Tile tile) {
+
+ new ExtendedEllipsoid(ellipsoid.getEquatorialRadius(), ellipsoid.getFlattening(),
+ ellipsoid.getBodyFrame());
double incidenceAngleSin = FastMath.sin(Vector3D.angle(los, zenith));
double previousRefractionIndex = -1;
@@ -73,6 +79,8 @@ public class MultiLayerModel implements AtmosphericRefraction {
previousRefractionIndex = entry.getValue();
}
+ NormalizedGeodeticPoint geodeticPoint = tile.cellIntersection(pos, los, 0, 0);
+
return pos.getX() + xDistance;
}
}
--
GitLab