eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-13 22:15:26 +00:00
Code Activity

bug4425 added rateofTurn, belowln

Browse Source
This commit is contained in:
Kai Boernert committed 2018-03-27 11:57:11 +02:00
1 parent 307c4e93cc
commit 9eaddbf823
3 files changed
+14 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
+7
View File
@@ -612,6 +612,13 @@ public class LeaderboardEntryDTO implements Serializable {
}
}
public void setExpeditionRateOfTurn(Double expeditionRateOfTurn) {
if (expeditionRateOfTurn != null) {
ensureExpeditionHolder();
expeditionDataHolder.expeditionRateOfTurn = expeditionRateOfTurn;
}
}
public Double getExpeditionAWA() {
return expeditionDataHolder == null ? null : expeditionDataHolder.expeditionAWA;
}
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/sensordata/ExpeditionExtendedSensorDataMetadata.java
+2 -2
View File
@@ -46,8 +46,8 @@ public enum ExpeditionExtendedSensorDataMetadata {
EXPEDITION_HDG("Hdg", BravoExtendedSensorDataMetadata.EXPEDITION_HDG), //
EXPEDITION_TMTOGUN("TmToGun", BravoExtendedSensorDataMetadata.EXPEDITION_TMTOGUN), //
EXPEDITION_TMTOBURN("TmToBurn", BravoExtendedSensorDataMetadata.EXPEDITION_TMTOBURN), //
EXPEDITION_BELOWLN("BelowLn", BravoExtendedSensorDataMetadata.EXPEDITION_TMTOBURN), //
EXPEDITION_RATE_OF_TURN("ROT", BravoExtendedSensorDataMetadata.EXPEDITION_TMTOBURN), //
EXPEDITION_BELOWLN("BelowLn", BravoExtendedSensorDataMetadata.EXPEDITION_BELOWLN), //
EXPEDITION_RATE_OF_TURN("ROT", BravoExtendedSensorDataMetadata.EXPEDITION_RATE_OF_TURN), //
EXPEDITION_BARO("Baro", BravoExtendedSensorDataMetadata.EXPEDITION_BARO), //
EXPEDITION_LOAD_P("Load P", BravoExtendedSensorDataMetadata.EXPEDITION_LOAD_P), //
EXPEDITION_LOAD_S("Load S", BravoExtendedSensorDataMetadata.EXPEDITION_LOAD_S), //
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java
+5 -5
View File
@@ -67,6 +67,7 @@ public class BravoFixTrackImpl<ItemType extends WithID & Serializable> extends S
private transient TimeRangeCache<Pair<Double, Long>> expeditionHeadingCache;
private transient TimeRangeCache<Pair<Double, Long>> expeditionTimeToGunCache;
private transient TimeRangeCache<Pair<Double, Long>> expeditionRudderCache;
private transient TimeRangeCache<Pair<Double, Long>> expeditionRateOfTurnCache;
/**
* If a GPS track was provided at construction time, remember it non-transiently. It is needed when restoring
@@ -143,6 +144,7 @@ public class BravoFixTrackImpl<ItemType extends WithID & Serializable> extends S
this.expeditionHeadingCache = createTimeRangeCache(trackedItem, "expeditionHeadingCache");
this.expeditionTimeToGunCache = createTimeRangeCache(trackedItem, "expeditionTimeToGunCache");
this.expeditionRudderCache = createTimeRangeCache(trackedItem, "expeditionRudderCache");
this.expeditionRateOfTurnCache = createTimeRangeCache(trackedItem, "expeditionRateOfTurnCache");
}
public GPSFixTrack<ItemType, GPSFixMoving> getGpsTrack() {
@@ -213,7 +215,7 @@ public class BravoFixTrackImpl<ItemType extends WithID & Serializable> extends S
expeditionCOGCache, expeditionForestayLoadCache, expeditionRakeCache, expeditionCourseDetailCache,
expeditionBaroCache, expeditionJibCarPortCache, expeditionJibCarStbdCache, expeditionLoadPCache,
expeditionLoadSCache, expeditionMastButtCache, expeditionHeadingCache, expeditionTimeToGunCache,
expeditionRudderCache);
expeditionRudderCache, expeditionRateOfTurnCache);
}
return added;
}
@@ -565,8 +567,7 @@ public class BravoFixTrackImpl<ItemType extends WithID & Serializable> extends S
@Override
public Double getAverageExpeditionRateOfTurnIfAvailable(TimePoint start, TimePoint endTimePoint){
//column currently unkown
return null;
return getAverageOfBravoExtenededFixValueWithCachingForDouble(start, endTimePoint, BravoExtendedFix::getExpeditionRateOfTurn, expeditionRateOfTurnCache);
}
@Override
@@ -802,8 +803,7 @@ public class BravoFixTrackImpl<ItemType extends WithID & Serializable> extends S
@Override
public Double getExpeditionRateOfTurnIfAvailable(TimePoint at){
//column currently unkown
return null;
return getExpeditionValueForDouble(at, BravoExtendedFix::getExpeditionRateOfTurn);
}
@Override