eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-09 04:21:01 +00:00
Code Activity

fixed regular expression for next race number determination; put races into LOADING mode to accelerate mark pinging

Browse Source 
Change-Id: I54a0edb18cf56cf732824cde6c00f933216b84ec
This commit is contained in:
Axel Uhl committed 2018-04-30 14:25:26 +02:00
1 parent 3a5b2fbe54
commit ccd63cf2a9
2 files changed
+9 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionAllInOneImporter.java
+1 -1
View File
@@ -397,7 +397,7 @@ public class ExpeditionAllInOneImporter {
private int getNextAvailableStartBasedSessionCount(Regatta regatta) {
int maxNumberFound = 0;
final Pattern pattern = Pattern.compile(START_PER_SESSION_RACE_COLUMN_NAME_PREFIX+"\\([0-9]+\\)");
final Pattern pattern = Pattern.compile(START_PER_SESSION_RACE_COLUMN_NAME_PREFIX+"([0-9]+)");
for (final RaceColumn raceColumn : regatta.getRaceColumns()) {
Matcher matcher = pattern.matcher(raceColumn.getName());
if (matcher.matches()) {
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/ExpeditionCourseInferrer.java
+8
View File
@@ -21,6 +21,7 @@ import com.sap.sailing.domain.base.RaceColumn;
import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.base.SharedDomainFactory;
import com.sap.sailing.domain.common.PassingInstruction;
import com.sap.sailing.domain.common.TrackedRaceStatusEnum;
import com.sap.sailing.domain.common.impl.DegreePosition;
import com.sap.sailing.domain.common.sensordata.ExpeditionExtendedSensorDataMetadata;
import com.sap.sailing.domain.common.tracking.GPSFix;
@@ -29,6 +30,7 @@ import com.sap.sailing.domain.racelogtracking.RaceLogTrackingAdapter;
import com.sap.sailing.domain.trackimport.FormatNotSupportedException;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.impl.TrackedRaceStatusImpl;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.trackfiles.impl.CompressedStreamsUtil;
import com.sap.sailing.server.trackfiles.impl.ExpeditionExtendedDataImporterImpl;
@@ -135,9 +137,15 @@ public class ExpeditionCourseInferrer {
* up in the tracked races. If not found, such marks are defined through the regatta log.
*/
public void setStartLine(ExpeditionStartData startData, Iterable<DynamicTrackedRace> trackedRaces, RacingEventService racingEventService) {
for (final DynamicTrackedRace trackedRace : trackedRaces) {
trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.LOADING, 0.5));
}
for (final DynamicTrackedRace trackedRace : trackedRaces) {
setStartLine(startData, trackedRace, racingEventService);
}
for (final DynamicTrackedRace trackedRace : trackedRaces) {
trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.TRACKING, 1.0));
}
}
private void setStartLine(ExpeditionStartData startData, DynamicTrackedRace trackedRace, RacingEventService racingEventService) {