mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-04 01:59:35 +00:00
renamed variables and fields and parameters for useInternalMarkPassingAlgorithm
This commit is contained in:
1 parent
976cc7d9be
commit
361d8c7679
14 files changed
+55
-51
No files matched your search
+2
-1
@@ -110,7 +110,8 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS
|
||||
Util.Pair<String, List<TracTracRaceRecordDTO>> listTracTracRacesInEvent(String eventJsonURL, boolean listHiddenRaces) throws Exception;
|
||||
|
||||
void trackWithTracTrac(RegattaIdentifier regattaToAddTo, Iterable<TracTracRaceRecordDTO> rrs, String liveURI,
|
||||
String storedURI, String courseDesignUpdateURI, boolean trackWind, boolean correctWindByDeclination, boolean simulateWithStartTimeNow, boolean ignoreTracTracMarkPassings, String tracTracUsername, String tracTracPassword) throws Exception;
|
||||
String storedURI, String courseDesignUpdateURI, boolean trackWind, boolean correctWindByDeclination,
|
||||
boolean simulateWithStartTimeNow, boolean useInternalMarkPassingAlgorithm, String tracTracUsername, String tracTracPassword) throws Exception;
|
||||
|
||||
void trackWithSwissTiming(RegattaIdentifier regattaToAddTo, Iterable<SwissTimingRaceRecordDTO> rrs, String hostname, int port,
|
||||
boolean trackWind, boolean correctWindByDeclination) throws Exception;
|
||||
|
||||
+2
-2
@@ -111,7 +111,7 @@ public interface SailingServiceAsync extends BuildVersionRetriever, FileStorageM
|
||||
* first mark passing for the first waypoint will be set to "now." It will delay the forwarding of all
|
||||
* events received such that they seem to be sent in "real-time." So, more or less the time points
|
||||
* attached to the events sent to the receivers will again approximate the wall time.
|
||||
* @param ignoreTracTracMarkPassings
|
||||
* @param useInternalMarkPassingAlgorithm
|
||||
* whether or not to ignore the TracTrac-provided mark passings; if <code>true</code>, a separate mark
|
||||
* passing calculator is used, and the TracTrac-provided ones are ignored.
|
||||
* @param storedURImay
|
||||
@@ -120,7 +120,7 @@ public interface SailingServiceAsync extends BuildVersionRetriever, FileStorageM
|
||||
*/
|
||||
void trackWithTracTrac(RegattaIdentifier regattaToAddTo,
|
||||
Iterable<TracTracRaceRecordDTO> rrs, String liveURI, String storedURI, String courseDesignUpdateURI, boolean trackWind, boolean correctWindByDeclination,
|
||||
boolean simulateWithStartTimeNow, boolean ignoreTracTracMarkPassings, String tracTracUsername, String tracTracPassword, AsyncCallback<Void> callback);
|
||||
boolean simulateWithStartTimeNow, boolean useInternalMarkPassingAlgorithm, String tracTracUsername, String tracTracPassword, AsyncCallback<Void> callback);
|
||||
|
||||
void trackWithSwissTiming(RegattaIdentifier regattaToAddTo, Iterable<SwissTimingRaceRecordDTO> rrs,
|
||||
String hostname, int port, boolean trackWind, boolean correctWindByDeclination,
|
||||
|
||||
+5
-5
@@ -1012,14 +1012,15 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
@Override
|
||||
public void trackWithTracTrac(RegattaIdentifier regattaToAddTo, Iterable<TracTracRaceRecordDTO> rrs, String liveURI, String storedURI,
|
||||
String courseDesignUpdateURI, boolean trackWind, final boolean correctWindByDeclination,
|
||||
final boolean simulateWithStartTimeNow, final boolean ignoreTracTracMarkPassings, String tracTracUsername, String tracTracPassword)
|
||||
final boolean simulateWithStartTimeNow, final boolean useInternalMarkPassingAlgorithm, String tracTracUsername, String tracTracPassword)
|
||||
throws Exception {
|
||||
logger.info("tracWithTracTrac for regatta " + regattaToAddTo + " for race records " + rrs + " with liveURI " + liveURI
|
||||
+ " and storedURI " + storedURI);
|
||||
for (TracTracRaceRecordDTO rr : rrs) {
|
||||
// reload JSON and load clientparams.php
|
||||
RaceRecord record = getTracTracAdapter().getSingleTracTracRaceRecord(new URL(rr.jsonURL), rr.id, /*loadClientParams*/true);
|
||||
logger.info("Loaded race " + record.getName() + " in " + record.getEventName() + " start:" + record.getRaceStartTime() + " trackingStart:" + record.getTrackingStartTime() + " trackingEnd:" + record.getTrackingEndTime());
|
||||
logger.info("Loaded race " + record.getName() + " in " + record.getEventName() + " start:" + record.getRaceStartTime() +
|
||||
" trackingStart:" + record.getTrackingStartTime() + " trackingEnd:" + record.getTrackingEndTime());
|
||||
// note that the live URI may be null for races that were put into replay mode
|
||||
final String effectiveLiveURI;
|
||||
if (!record.getRaceStatus().equals(TracTracConnectionConstants.REPLAY_STATUS)) {
|
||||
@@ -1038,13 +1039,12 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
effectiveStoredURI = storedURI;
|
||||
}
|
||||
final RaceHandle raceHandle = getTracTracAdapter().addTracTracRace(getService(), regattaToAddTo,
|
||||
record.getParamURL(), effectiveLiveURI == null ? null : new URI(effectiveLiveURI),
|
||||
new URI(effectiveStoredURI),
|
||||
record.getParamURL(), effectiveLiveURI == null ? null : new URI(effectiveLiveURI), new URI(effectiveStoredURI),
|
||||
new URI(courseDesignUpdateURI), new MillisecondsTimePoint(record.getTrackingStartTime().asMillis()),
|
||||
new MillisecondsTimePoint(record.getTrackingEndTime().asMillis()),
|
||||
getRaceLogStore(), getRegattaLogStore(),
|
||||
RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS, simulateWithStartTimeNow,
|
||||
ignoreTracTracMarkPassings, tracTracUsername, tracTracPassword, record.getRaceStatus(), record.getRaceVisibility());
|
||||
useInternalMarkPassingAlgorithm, tracTracUsername, tracTracPassword, record.getRaceStatus(), record.getRaceVisibility());
|
||||
if (trackWind) {
|
||||
new Thread("Wind tracking starter for race " + record.getEventName() + "/" + record.getName()) {
|
||||
public void run() {
|
||||
|
||||
Reference in new issue
Block a user