diff --git a/src/main/java/ipos/project/UseCaseController/Administration.java b/src/main/java/ipos/project/UseCaseController/Administration.java index ae0dd08a0e2463c247b5c5e697312267a5974553..1ca7f8f1c64bedf8a811d34b71a35deaa9ebe763 100644 --- a/src/main/java/ipos/project/UseCaseController/Administration.java +++ b/src/main/java/ipos/project/UseCaseController/Administration.java @@ -79,17 +79,16 @@ public class Administration { * Function recursively transforms a placing into a ROOT-placing. In each step the placing * is transformed in a placing of the SRS that the origin of its current SRS has been defined * in. Recursion is stopped after obtaining a ROOT-placing. - * @param placing + * @param placingToBeTransformed */ - public static void transformToRootCoordinates(Placing placing) { - if (isNotRootPosition(placing.getPosition())) { - Position positionToBeTransformed = placing.getPosition(); - ReferenceSystem nextTransformationGoal_SRS = positionToBeTransformed.getReferenceSystem().getOrigin().getPosition().getReferenceSystem(); - LOG.info("INDFRO-DEBUG: (before) ReferenceSystem: " + positionToBeTransformed.getReferenceSystem().getId() + "; Position: " + PositionMonitoring.logPosition(placing)); - SRSConversion.switchSRS(positionToBeTransformed, nextTransformationGoal_SRS); // assumption: not only position is changed but also ReferenceSystem-object is updated - LOG.info("INDFRO-DEBUG: (after) ReferenceSystem: " + positionToBeTransformed.getReferenceSystem().getId() + "; Position: " + PositionMonitoring.logPosition(placing)); + public static void transformToRootCoordinates(Placing placingToBeTransformed) { + if (isNotRootPosition(placingToBeTransformed.getPosition())) { + ReferenceSystem nextTransformationGoal_SRS = placingToBeTransformed.getPosition().getReferenceSystem().getOrigin().getPosition().getReferenceSystem(); + LOG.info("INDFRO-DEBUG: (before) ReferenceSystem: " + placingToBeTransformed.getPosition().getReferenceSystem().getId() + "; Position: " + PositionMonitoring.logPosition(placingToBeTransformed)); + SRSConversion.switchSRS(placingToBeTransformed, nextTransformationGoal_SRS); // assumption: not only position is changed but also ReferenceSystem-object is updated + LOG.info("INDFRO-DEBUG: (after) ReferenceSystem: " + placingToBeTransformed.getPosition().getReferenceSystem().getId() + "; Position: " + PositionMonitoring.logPosition(placingToBeTransformed)); LOG.info("INDFRO-DEBUG:"); - transformToRootCoordinates(placing); // recursion stops when placing.getPosition() has been transformed in a ROOT-position + transformToRootCoordinates(placingToBeTransformed); // recursion stops when placing.getPosition() has been transformed in a ROOT-position } } @@ -175,9 +174,9 @@ public class Administration { private static void transformPlacingSuccessively(Placing placingToBeTransformed, List<ReferenceSystem> transformationTargets) { for (ReferenceSystem transTarget : transformationTargets){ - LOG.info("INDFRO-DEBUG: (before) ReferenceSystem: " + positionToBeTransformed.getReferenceSystem().getId() + "; Position: " + PositionMonitoring.logPosition(placing)); + LOG.info("INDFRO-DEBUG: (before) ReferenceSystem: " + placingToBeTransformed.getPosition().getReferenceSystem().getId() + "; Position: " + PositionMonitoring.logPosition(placingToBeTransformed)); SRSConversion.switchSRS(placingToBeTransformed, transTarget); - LOG.info("INDFRO-DEBUG: (after) ReferenceSystem: " + positionToBeTransformed.getReferenceSystem().getId() + "; Position: " + PositionMonitoring.logPosition(placing)); + LOG.info("INDFRO-DEBUG: (after) ReferenceSystem: " + placingToBeTransformed.getPosition().getReferenceSystem().getId() + "; Position: " + PositionMonitoring.logPosition(placingToBeTransformed)); } } }