java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
... ...
@@ -3331,7 +3331,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
3331 3331
public Map<Competitor, List<Maneuver>> loadManeuvers(TrackedRace trackedRace, Course course) {
3332 3332
final Map<Competitor, List<Maneuver>> result;
3333 3333
final Document query = new Document();
3334
- RaceIdentifier raceIdentifier = trackedRace.getRaceIdentifier();
3334
+ final RaceIdentifier raceIdentifier = trackedRace.getRaceIdentifier();
3335 3335
addRaceIdentifierToQuery(query, raceIdentifier);
3336 3336
final MongoCollection<Document> maneuversCollection = database.getCollection(CollectionNames.MANEUVERS.name());
3337 3337
final Document doc = maneuversCollection.find(query).first();
... ...
@@ -3341,8 +3341,8 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
3341 3341
for (final Document maneuversForOneCompetitorDoc : maneuversDoc) {
3342 3342
final Serializable competitorId = maneuversForOneCompetitorDoc.get(FieldNames.COMPETITOR_ID.name(), Serializable.class);
3343 3343
final Competitor competitor = baseDomainFactory.getExistingCompetitorById(competitorId);
3344
- for (final Document maneuvers : maneuversForOneCompetitorDoc.getList(FieldNames.MANEUVERS.name(), Document.class)) {
3345
- final Maneuver maneuver = loadManeuver(competitor, maneuvers, course, trackedRace);
3344
+ for (final Document maneuverDoc : maneuversForOneCompetitorDoc.getList(FieldNames.MANEUVERS.name(), Document.class)) {
3345
+ final Maneuver maneuver = loadManeuver(competitor, maneuverDoc, course, trackedRace);
3346 3346
result.computeIfAbsent(competitor, c -> new ArrayList<>()).add(maneuver);
3347 3347
}
3348 3348
}
... ...
@@ -3352,20 +3352,20 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
3352 3352
return result;
3353 3353
}
3354 3354
3355
- private Maneuver loadManeuver(Competitor competitor, Document maneuvers, Course course, TrackedRace trackedRace) {
3356
- final TimePoint timePoint = TimePoint.of( maneuvers.getLong(FieldNames.TIMEPOINT.name()));
3357
- final double maxTurningRateInDegreesPerSecond = maneuvers.getDouble(FieldNames.MAX_TURNING_RATE_IN_DEGREE_PER_SECOUND.name());
3358
- final String typeName = maneuvers.getString(FieldNames.TYPE.name());
3355
+ private Maneuver loadManeuver(Competitor competitor, Document maneuverDoc, Course course, TrackedRace trackedRace) {
3356
+ final TimePoint timePoint = TimePoint.of( maneuverDoc.getLong(FieldNames.TIMEPOINT.name()));
3357
+ final double maxTurningRateInDegreesPerSecond = maneuverDoc.getDouble(FieldNames.MAX_TURNING_RATE_IN_DEGREE_PER_SECOUND.name());
3358
+ final String typeName = maneuverDoc.getString(FieldNames.TYPE.name());
3359 3359
final ManeuverType type = ManeuverType.valueOf(typeName);
3360
- final String newTackName = maneuvers.getString(FieldNames.TACK.name());
3360
+ final String newTackName = maneuverDoc.getString(FieldNames.TACK.name());
3361 3361
final Tack newTack = Tack.valueOf(newTackName);
3362
- final int waypointIndex = maneuvers.getInteger(FieldNames.INDEX_OF_PASSED_WAYPOINT.name());
3363
- final double positionLatRad = maneuvers.getDouble(FieldNames.POSITION_LAT_RAD.name());
3364
- final double positionLngRad = maneuvers.getDouble(FieldNames.POSITION_LNG_RAD.name());
3362
+ final int waypointIndex = maneuverDoc.getInteger(FieldNames.INDEX_OF_PASSED_WAYPOINT.name());
3363
+ final double positionLatRad = maneuverDoc.getDouble(FieldNames.POSITION_LAT_RAD.name());
3364
+ final double positionLngRad = maneuverDoc.getDouble(FieldNames.POSITION_LNG_RAD.name());
3365 3365
final Position position = new RadianPosition(positionLatRad, positionLngRad);
3366
- final ManeuverCurveBoundaries mainCurveBoundaries = loadManeuverCurveBoundaries((Document) maneuvers.get(FieldNames.MAIN_CURVE_BOUNDARIES.name()));
3367
- final ManeuverCurveBoundaries maneuverCurveWithStableSpeedAndCourseBoundaries = loadManeuverCurveBoundaries((Document) maneuvers.get(FieldNames.MANEUVER_CURVE_WITH_STABLE_SPEED_AND_COURSE_BOUNDERIES.name()));
3368
- final ManeuverLoss maneuverLoss = loadManeuverLoss((Document) maneuvers.get(FieldNames.MANEUVER_LOSS.name()));
3366
+ final ManeuverCurveBoundaries mainCurveBoundaries = loadManeuverCurveBoundaries((Document) maneuverDoc.get(FieldNames.MAIN_CURVE_BOUNDARIES.name()));
3367
+ final ManeuverCurveBoundaries maneuverCurveWithStableSpeedAndCourseBoundaries = loadManeuverCurveBoundaries((Document) maneuverDoc.get(FieldNames.MANEUVER_CURVE_WITH_STABLE_SPEED_AND_COURSE_BOUNDERIES.name()));
3368
+ final ManeuverLoss maneuverLoss = loadManeuverLoss((Document) maneuverDoc.get(FieldNames.MANEUVER_LOSS.name()));
3369 3369
final MarkPassingProxy markPassingProxy = new MarkPassingProxy(timePoint, waypointIndex, competitor.getId(), trackedRace );// wie kommt man auf das Race?
3370 3370
final Maneuver maneuver;
3371 3371
if (waypointIndex == -1) {
... ...
@@ -3404,23 +3404,25 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
3404 3404
return maneuverLoss;
3405 3405
}
3406 3406
3407
- private ManeuverCurveBoundaries loadManeuverCurveBoundaries(Document maneuvers) {
3408
- final TimePoint timePointBefore = TimePoint.of( maneuvers.getLong(FieldNames.TIMEPOINT_BEFORE.name()));
3409
- final TimePoint timePointAfter = TimePoint.of( maneuvers.getLong(FieldNames.TIMEPOINT_AFTER.name()));
3410
- final Double SpeedWithBearingBeforeDegrees = maneuvers.getDouble(FieldNames.SPEED_WITH_BEARING_BEFORE_DEGREES.name());
3411
- final Double SpeedWithBearingBeforeSpeed = maneuvers.getDouble(FieldNames.SPEED_WITH_BEARING_BEFORE_SPEED.name());
3407
+ private ManeuverCurveBoundaries loadManeuverCurveBoundaries(Document document) {
3408
+ final TimePoint timePointBefore = TimePoint.of(document.getLong(FieldNames.TIMEPOINT_BEFORE.name()));
3409
+ final TimePoint timePointAfter = TimePoint.of(document.getLong(FieldNames.TIMEPOINT_AFTER.name()));
3410
+ final Double SpeedWithBearingBeforeDegrees = document.getDouble(FieldNames.SPEED_WITH_BEARING_BEFORE_DEGREES.name());
3411
+ final Double SpeedWithBearingBeforeSpeed = document.getDouble(FieldNames.SPEED_WITH_BEARING_BEFORE_SPEED.name());
3412 3412
final Bearing bearingBefore = new DegreeBearingImpl(SpeedWithBearingBeforeDegrees);
3413 3413
final SpeedWithBearing SpeedWithBearingBefore = new KnotSpeedWithBearingImpl(SpeedWithBearingBeforeSpeed, bearingBefore);
3414
- final Double SpeedWithBearingAfterDegrees = maneuvers.getDouble(FieldNames.SPEED_WITH_BEARING_AFTER_DEGREES.name());
3415
- final Double SpeedWithBearingAfterSpeed = maneuvers.getDouble(FieldNames.SPEED_WITH_BEARING_AFTER_SPEED.name());
3414
+ final Double SpeedWithBearingAfterDegrees = document.getDouble(FieldNames.SPEED_WITH_BEARING_AFTER_DEGREES.name());
3415
+ final Double SpeedWithBearingAfterSpeed = document.getDouble(FieldNames.SPEED_WITH_BEARING_AFTER_SPEED.name());
3416 3416
final Bearing bearingAfter = new DegreeBearingImpl(SpeedWithBearingAfterSpeed);
3417 3417
final SpeedWithBearing SpeedWithBearingAfter = new KnotSpeedWithBearingImpl(SpeedWithBearingAfterDegrees, bearingAfter);
3418
- final double directionChangeInDegrees = maneuvers.getDouble(FieldNames.DIRECTION_CHANGE_IN_DEGREES.name());
3419
- final double lowestSpeedDouble = maneuvers.getDouble(FieldNames.LOWEST_SPEED.name());
3418
+ final double directionChangeInDegrees = document.getDouble(FieldNames.DIRECTION_CHANGE_IN_DEGREES.name());
3419
+ final double lowestSpeedDouble = document.getDouble(FieldNames.LOWEST_SPEED.name());
3420 3420
final Speed lowestSpeed = new KnotSpeedImpl(lowestSpeedDouble);
3421
- final double highestSpeedDouble = maneuvers.getDouble(FieldNames.HIGHEST_SPEED.name());
3421
+ final double highestSpeedDouble = document.getDouble(FieldNames.HIGHEST_SPEED.name());
3422 3422
final Speed highestSpeed = new KnotSpeedImpl(highestSpeedDouble);
3423
- ManeuverCurveBoundaries maneuverCurveBoundaries = new ManeuverCurveBoundariesImpl(timePointBefore, timePointAfter, SpeedWithBearingBefore, SpeedWithBearingAfter, directionChangeInDegrees, lowestSpeed, highestSpeed );
3423
+ ManeuverCurveBoundaries maneuverCurveBoundaries = new ManeuverCurveBoundariesImpl(timePointBefore,
3424
+ timePointAfter, SpeedWithBearingBefore, SpeedWithBearingAfter, directionChangeInDegrees, lowestSpeed,
3425
+ highestSpeed);
3424 3426
return maneuverCurveBoundaries;
3425 3427
}
3426 3428
}
... ...
\ No newline at end of file