cleaning, interpolation of TopoZ value

noisemodelling-jdbc/src/test/java/org/noise_planet/noisemodelling/jdbc/AttenuationCnossosTest.java

@@ -421,6 +421,9 @@ public void northSouthTest() {
 
  //Run computation
  computeRays.run(propDataOut);
+
+ assertEquals(2, propDataOut.getPropagationPaths().size());
+
  SegmentPath s0 = propDataOut.getPropagationPaths().get(0).getSRSegment();
  SegmentPath s1 = propDataOut.getPropagationPaths().get(1).getSRSegment();
  assertEquals(s0.dp, s1.dp);
@@ -562,8 +565,6 @@ public void TC01() throws IOException {
  //Run computation
  computeRays.run(propDataOut);
 
- exportRays("src/test/resources/org/noise_planet/noisemodelling/jdbc/rays.json", propDataOut);
-
  assertEquals(1, propDataOut.getPropagationPaths().size());
 
  //Expected values

noisemodelling-pathfinder/src/main/java/org/noise_planet/noisemodelling/pathfinder/profilebuilder/CutPoint.java

@@ -27,8 +27,6 @@ public class CutPoint implements Comparable<CutPoint> {
  int buildingId = -1;
  /** Identifier of the wall containing the point. -1 if no wall. */
  int wallId = -1;
- /** Height of the building containing the point. NaN of no building. */
- double height = Double.NaN;
  /** Topographic height of the point. */
  double zGround = Double.NaN;
  /** Ground effect coefficient. 0 if there is no coefficient. */
@@ -68,7 +66,6 @@ public CutPoint(CutPoint cut) {
  this.wallId = cut.wallId;
  this.groundCoef = cut.groundCoef;
  this.wallAlpha = new ArrayList<>(cut.wallAlpha);
- this.height = cut.height;
  this.zGround = cut.zGround;
  this.corner = cut.corner;
  }
@@ -111,21 +108,13 @@ public void setGroundCoef(double groundCoef) {
  this.groundCoef = groundCoef;
  }
 
- /**
- * Sets the building height.
- * @param height The building height.
- */
- public void setHeight(double height) {
- this.height = height;
- }
-
  /**
  * Sets the topographic height.
  * @param zGround The topographic height.
  */
- /*public void setzGround(double zGround) {
+ public void setZGround(double zGround) {
  this.zGround = zGround;
- }*/
+ }
 
  /**
  * Sets the wall alpha.
@@ -175,14 +164,6 @@ public double getGroundCoef() {
  return groundCoef;
  }
 
- /**
- * Retrieve the height of the building containing the point. If there is no building, returns NaN.
- * @return The building height, or NaN if no building.
- */
- public double getHeight() {
- return height;
- }
-
  /**
  * Retrieve the topographic height of the point.
  * @return The topographic height of the point.
@@ -205,17 +186,17 @@ public ProfileBuilder.IntersectionType getType() {
 
  @Override
  public String toString() {
- String str = "";
- str += type.name();
- str += " ";
- str += "(" + coordinate.x +"," + coordinate.y +"," + coordinate.z + ") ; ";
- str += "grd : " + groundCoef + " ; ";
- str += "topoH : " + zGround + " ; ";
- str += "buildH : " + height + " ; ";
- str += "buildId : " + buildingId + " ; ";
- str += "alpha : " + wallAlpha + " ; ";
- str += "id : " + id + " ; ";
- return str;
+ return "CutPoint{" +
+  "coordinate=" + coordinate +
+  ", type=" + type +
+  ", id=" + id +
+  ", buildingId=" + buildingId +
+  ", wallId=" + wallId +
+  ", zGround=" + zGround +
+  ", groundCoef=" + groundCoef +
+  ", wallAlpha=" + wallAlpha +
+  ", corner=" + corner +
+  '}';
  }
 
  /**