From fc95ed7b2593b90c15b7b709c4b157b4aa28d149 Mon Sep 17 00:00:00 2001
From: Guylaine Prat <guylaine.prat@c-s.fr>
Date: Fri, 8 Feb 2019 15:45:34 +0100
Subject: [PATCH] Checkstyle corrections
---
.../duvenhage/DuvenhageAlgorithm.java | 103 +++++++++---------
1 file changed, 51 insertions(+), 52 deletions(-)
diff --git a/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
index b14f0dc8..d78a1c21 100644
--- a/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/intersection/duvenhage/DuvenhageAlgorithm.java
@@ -175,58 +175,57 @@ public class DuvenhageAlgorithm implements IntersectionAlgorithm {
NormalizedGeodeticPoint currentGuess = closeGuess;
NormalizedGeodeticPoint foundIntersection = null;
-
-
- if (flatBody) {
- // under the (bad) flat-body assumption, the reference point must remain
- // at DEM entry and exit, even if we already have a much better close guess :-(
- // this is in order to remain consistent with other systems
- final Tile tile = cache.getTile(currentGuess.getLatitude(), currentGuess.getLongitude());
- final Vector3D exitP = ellipsoid.pointAtAltitude(position, los, tile.getMinElevation());
- final Vector3D entryP = ellipsoid.pointAtAltitude(position, los, tile.getMaxElevation());
- final NormalizedGeodeticPoint entry = ellipsoid.transform(entryP, ellipsoid.getBodyFrame(), null,
- tile.getMinimumLongitude());
- foundIntersection = tile.cellIntersection(entry, ellipsoid.convertLos(entryP, exitP),
- tile.getFloorLatitudeIndex(currentGuess.getLatitude()),
- tile.getFloorLongitudeIndex(currentGuess.getLongitude()));
-
- } else { // with a DEM
-
- while (foundIntersection == null && (nbCall < NB_TIME_CELL_INTERSECTION)) {
-
- final Vector3D delta = ellipsoid.transform(currentGuess).subtract(position);
- final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
- final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
- ellipsoid.getBodyFrame(), null);
- final NormalizedGeodeticPoint normalizedProjected =
- new NormalizedGeodeticPoint(projected.getLatitude(),
- projected.getLongitude(),
- projected.getAltitude(),
- currentGuess.getLongitude());
- final Tile tile = cache.getTile(normalizedProjected.getLatitude(), normalizedProjected.getLongitude());
-
- foundIntersection = tile.cellIntersection(normalizedProjected,
- ellipsoid.convertLos(normalizedProjected, los),
- tile.getFloorLatitudeIndex(normalizedProjected.getLatitude()),
- tile.getFloorLongitudeIndex(normalizedProjected.getLongitude()));
-
- // For extremely rare case : the cell intersection gave no results ...
- // We use as a new guess a slightly modified projected geodetic point (which is on the LOS line)
- if (foundIntersection == null) {
- double shiftedS = s - 1;
- GeodeticPoint currentGuessGP = ellipsoid.transform(new Vector3D(1, position, shiftedS, los),
- ellipsoid.getBodyFrame(), null);
- currentGuess = new NormalizedGeodeticPoint(currentGuessGP.getLatitude(),
- currentGuessGP.getLongitude(),
- currentGuessGP.getAltitude(),
- projected.getLongitude());
- // to avoid infinite loop ...
- nbCall++;
- }
- } // end while foundIntersection = null
- } // end test on flatbody
-
- return foundIntersection;
+
+ if (flatBody) {
+ // under the (bad) flat-body assumption, the reference point must remain
+ // at DEM entry and exit, even if we already have a much better close guess :-(
+ // this is in order to remain consistent with other systems
+ final Tile tile = cache.getTile(currentGuess.getLatitude(), currentGuess.getLongitude());
+ final Vector3D exitP = ellipsoid.pointAtAltitude(position, los, tile.getMinElevation());
+ final Vector3D entryP = ellipsoid.pointAtAltitude(position, los, tile.getMaxElevation());
+ final NormalizedGeodeticPoint entry = ellipsoid.transform(entryP, ellipsoid.getBodyFrame(), null,
+ tile.getMinimumLongitude());
+ foundIntersection = tile.cellIntersection(entry, ellipsoid.convertLos(entryP, exitP),
+ tile.getFloorLatitudeIndex(currentGuess.getLatitude()),
+ tile.getFloorLongitudeIndex(currentGuess.getLongitude()));
+
+ } else { // with a DEM
+
+ while (foundIntersection == null && (nbCall < NB_TIME_CELL_INTERSECTION)) {
+
+ final Vector3D delta = ellipsoid.transform(currentGuess).subtract(position);
+ final double s = Vector3D.dotProduct(delta, los) / los.getNormSq();
+ final GeodeticPoint projected = ellipsoid.transform(new Vector3D(1, position, s, los),
+ ellipsoid.getBodyFrame(), null);
+ final NormalizedGeodeticPoint normalizedProjected =
+ new NormalizedGeodeticPoint(projected.getLatitude(),
+ projected.getLongitude(),
+ projected.getAltitude(),
+ currentGuess.getLongitude());
+ final Tile tile = cache.getTile(normalizedProjected.getLatitude(), normalizedProjected.getLongitude());
+
+ foundIntersection = tile.cellIntersection(normalizedProjected,
+ ellipsoid.convertLos(normalizedProjected, los),
+ tile.getFloorLatitudeIndex(normalizedProjected.getLatitude()),
+ tile.getFloorLongitudeIndex(normalizedProjected.getLongitude()));
+
+ // For extremely rare case : the cell intersection gave no results ...
+ // We use as a new guess a slightly modified projected geodetic point (which is on the LOS line)
+ if (foundIntersection == null) {
+ final double shiftedS = s - 1;
+ final GeodeticPoint currentGuessGP = ellipsoid.transform(new Vector3D(1, position, shiftedS, los),
+ ellipsoid.getBodyFrame(), null);
+ currentGuess = new NormalizedGeodeticPoint(currentGuessGP.getLatitude(),
+ currentGuessGP.getLongitude(),
+ currentGuessGP.getAltitude(),
+ projected.getLongitude());
+ // to avoid infinite loop ...
+ nbCall++;
+ }
+ } // end while foundIntersection = null
+ } // end test on flatbody
+
+ return foundIntersection;
}
/** {@inheritDoc} */
--
GitLab