eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-15 10:18:45 +00:00
Code Activity

bug5970: evaluate optionalTrueHeading in BoatCanvas if present

Browse Source
This commit is contained in:
Axel Uhl
2024-02-20 17:06:19 +01:00
parent b26c15c765
commit 9a939b14cd
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/BoatOverlay.java
+4 -6
View File
@@ -12,7 +12,6 @@ import com.sap.sailing.domain.common.Tack;
import com.sap.sailing.domain.common.dto.BoatClassDTO;
import com.sap.sailing.domain.common.dto.BoatDTO;
import com.sap.sailing.gwt.ui.shared.GPSFixDTOWithSpeedWindTackAndLegType;
import com.sap.sailing.gwt.ui.shared.SpeedWithBearingDTO;
import com.sap.sailing.gwt.ui.shared.racemap.BoatClassVectorGraphics;
import com.sap.sailing.gwt.ui.shared.racemap.CanvasOverlayV3;
import com.sap.sse.common.Color;
@@ -99,11 +98,10 @@ public class BoatOverlay extends CanvasOverlayV3 {
setCanvasPosition(boatPositionInPx.getX() - getCanvas().getCoordinateSpaceWidth() / 2,
boatPositionInPx.getY() - getCanvas().getCoordinateSpaceHeight() / 2);
// now rotate the canvas accordingly
SpeedWithBearingDTO speedWithBearing = boatFix.speedWithBearing;
if (speedWithBearing == null) {
speedWithBearing = new SpeedWithBearingDTO(0, 0);
}
updateDrawingAngleAndSetCanvasRotation(coordinateSystem.mapDegreeBearing(speedWithBearing.bearingInDegrees - ORIGINAL_BOAT_IMAGE_ROTATIION_ANGLE));
final double trueHeadingInDegrees = boatFix.optionalTrueHeading != null
? boatFix.optionalTrueHeading.getDegrees()
: (boatFix.speedWithBearing == null ? 0 : boatFix.speedWithBearing.bearingInDegrees);
updateDrawingAngleAndSetCanvasRotation(coordinateSystem.mapDegreeBearing(trueHeadingInDegrees - ORIGINAL_BOAT_IMAGE_ROTATIION_ANGLE));
}
}