Position Vector now always 3D with 0 altitude if not set

src/de/tud/kom/p2psim/impl/topology/util/PositionVector.java

@@ -50,7 +50,8 @@ import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.Location;
  * and removed a bug in the moveStep() function.
  * 
  * - 10.09.2018 Julian Zobel: Adapted the replace function to work properly without 
- * assertions. Replace does now fully replace the position vector entries.
+ * assertions. Replace does now fully replace the position vector entries. PVs are now
+ * always at least 3D (with 0 altitude)
  * 
  * @author Bjoern Richerzhagen, Julian Zobel
  * @version 1.2, 10.09.2018
@@ -76,6 +77,11 @@ public class PositionVector implements Location {
 		if (dimensions < 2) {
 			throw new AssertionError("Vector cannot have less than 2 dimensions.");
 		}
+		
+		// Position Vector is always at least 3D
+		if(dimensions == 2)
+			dimensions = 3;
+		
 		this.dimensions = dimensions;
 		this.values = new double[dimensions];
 	}
@@ -94,9 +100,10 @@ public class PositionVector implements Location {
 	}
 	
 	public PositionVector(double longitudeOrX, double latitudeOrY) {
-		this(2);
+		this(3);
 		this.setLatitudeOrY(latitudeOrY);
 		this.setLongitudeOrX(longitudeOrX);		
+		this.setAltitude(0);
 	}
 	
 	public PositionVector(double longitudeOrX, double latitudeOrY, double altitude) {
@@ -106,15 +113,15 @@ public class PositionVector implements Location {
 		this.setAltitude(altitude);
 	}
 
-	public PositionVector(Location location) {	
-		if(location.hasAltitude()) {
-			this.dimensions = 3;
-			this.values = new double[3];
+	public PositionVector(Location location) {			
+		this.dimensions = 3;
+		this.values = new double[3];
+		
+		if(location.hasAltitude()) {			
 			this.setAltitude(location.getAltitude());
 		}
 		else {
-			this.dimensions = 2;
-			this.values = new double[2];			
+			this.setAltitude(0);
 		}
 		
 		this.setLatitudeOrY(location.getLatitudeOrY());
@@ -161,11 +168,7 @@ public class PositionVector implements Location {
 	
 	@Override
 	public void setAltitude(double altitude) {
-		if(hasAltitude()) {		
-			this.setEntry(2, altitude);
-		}	
-		else 
-			throw new AssertionError("Setting altitude only possible with three dimensional PositionVector");
+		this.setEntry(2, altitude);		
 	}
 	
 	@Override
@@ -380,10 +383,8 @@ public class PositionVector implements Location {
 			throw new AssertionError(
 					"Cast to Coordinate only possible with two or three dimensional PositionVector");
 		}
-		if (this.dimensions == 2)
-			return new Coordinate(getX(), getY());
-		else
-			return new Coordinate(getX(), getY(), getZ());
+		
+		return new Coordinate(getX(), getY(), getZ());
 	}
 
 	@Override