diff --git a/doc/SAPSailingAnalyticsArchitecture.docx b/doc/SAPSailingAnalyticsArchitecture.docx
index 69a1c175b74..1cccb1d7b6b 100755
Binary files a/doc/SAPSailingAnalyticsArchitecture.docx and b/doc/SAPSailingAnalyticsArchitecture.docx differ
diff --git a/doc/SWISSTIMING_DATA_EXPORT b/doc/SWISSTIMING_DATA_EXPORT
new file mode 100644
index 00000000000..4b9b8967a04
--- /dev/null
+++ b/doc/SWISSTIMING_DATA_EXPORT
@@ -0,0 +1,11 @@
+Exporting swisstiming 'Store and forward' messages
+------------------------------------------------------
+
+27012: local MongoDB "winddb" instance
+
+ /opt/mongodb/bin/mongoexport --port 27017 -d winddb -c SWISSTIMING_CONFIGURATIONS > /tmp/swisstiming_configurations.json
+ /opt/mongodb/bin/mongoexport --port 27017 -d winddb -c LAST_MESSAGE_COUNT > /tmp/swisstiming_last_message_count.json
+ /opt/mongodb/bin/mongoexport --port 27017 -d winddb -c RACES_MASTERDATA > /tmp/swisstiming_races_masterdata.json
+ /opt/mongodb/bin/mongoexport --port 27017 -d winddb -c RACES_MESSAGES > /tmp/swisstiming_races_massages.json
+ /opt/mongodb/bin/mongoexport --port 27017 -d winddb -c COMMAND_MESSAGES > /tmp/swisstiming_command_messages.json
+
diff --git a/doc/sailmaster_datainterface_protocol_en.pdf b/doc/sailmaster_datainterface_protocol_en.pdf
new file mode 100755
index 00000000000..484f37e954e
Binary files /dev/null and b/doc/sailmaster_datainterface_protocol_en.pdf differ
diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/SailingDomain.gwt.xml b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/SailingDomain.gwt.xml
index e299065a4a1..8f4e14f1af2 100755
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/SailingDomain.gwt.xml
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/SailingDomain.gwt.xml
@@ -2,4 +2,5 @@
+
diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
index f983b8b83ee..89137f5cfeb 100755
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
@@ -24,6 +24,8 @@ public enum DetailType implements Serializable {
TACK(0, ASCENDING), JIBE(0, ASCENDING), PENALTY_CIRCLE(0, ASCENDING), MARK_PASSING(0, ASCENDING), CURRENT_LEG(0, ASCENDING),
DISPLAY_LEGS(0, NONE), TIME_TRAVELED(0, ASCENDING),
TOTAL_TIME_SAILED_DOWNWIND_IN_SECONDS(1, ASCENDING),
+ TOTAL_TIME_SAILED_UPWIND_IN_SECONDS(1, ASCENDING),
+ TOTAL_TIME_SAILED_REACHING_IN_SECONDS(1, ASCENDING),
MAXIMUM_SPEED_OVER_GROUND_IN_KNOTS(1, DESCENDING),
TOTAL_TIME_SAILED_IN_SECONDS(1, ASCENDING), RACE_CURRENT_SPEED_OVER_GROUND_IN_KNOTS(2, DESCENDING);
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/MeterDistance.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterDistance.java
similarity index 88%
rename from java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/MeterDistance.java
rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterDistance.java
index 89a1b802f1d..bba0652a1d4 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/MeterDistance.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/MeterDistance.java
@@ -1,4 +1,4 @@
-package com.sap.sailing.domain.base.impl;
+package com.sap.sailing.domain.common.impl;
import com.sap.sailing.domain.common.AbstractDistance;
import com.sap.sailing.domain.common.Distance;
diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
index c2181bdfbb6..15129d303c1 100755
--- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
+++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
@@ -39,8 +39,9 @@ public interface MongoObjectFactory {
void renameLeaderboard(String oldName, String newName);
/**
- * Stores the group, if it doesn't exist or updates it.
- * Leaderboards in the group, which aren't stored in the database, will be stored.
+ * Stores the group, if it doesn't exist or updates it. Leaderboards in the group, which aren't stored in the
+ * database, will be stored. If the leaderboard group has an {@link LeaderboardGroup#getOverallLeaderboard() overall
+ * leaderboard}, it will be stored / updated as well.
*/
void storeLeaderboardGroup(LeaderboardGroup leaderboardGroup);
diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DelayedLeaderboardCorrectionsImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DelayedLeaderboardCorrectionsImpl.java
index ebd15e75456..7ce625d2b22 100755
--- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DelayedLeaderboardCorrectionsImpl.java
+++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DelayedLeaderboardCorrectionsImpl.java
@@ -198,6 +198,14 @@ public class DelayedLeaderboardCorrectionsImpl implements DelayedLeaderboardCorr
public void raceColumnRemovedFromContainer(RaceColumn raceColumn) {
}
+ @Override
+ public void raceColumnMoved(RaceColumn raceColumn, int newIndex) {
+ }
+
+ @Override
+ public void factorChanged(RaceColumn raceColumn, Double oldFactor, Double newFactor) {
+ }
+
@Override
public boolean isTransient() {
return false;
diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
index b64cce23c8b..369645c739b 100755
--- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
+++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
@@ -220,6 +220,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
DelayedLeaderboardCorrections loadedLeaderboardCorrections = new DelayedLeaderboardCorrectionsImpl(result);
loadLeaderboardCorrections(dbLeaderboard, loadedLeaderboardCorrections, scoreCorrection);
loadSuppressedCompetitors(dbLeaderboard, loadedLeaderboardCorrections);
+ loadColumnFactors(dbLeaderboard, result);
// add the leaderboard to the registry
if (leaderboardRegistry != null) {
leaderboardRegistry.addLeaderboard(result);
@@ -230,6 +231,17 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
return result;
}
+ private void loadColumnFactors(DBObject dbLeaderboard, Leaderboard result) {
+ DBObject dbColumnFactors = (DBObject) dbLeaderboard.get(FieldNames.LEADERBOARD_COLUMN_FACTORS.name());
+ if (dbColumnFactors != null) {
+ for (String encodedRaceColumnName : dbColumnFactors.keySet()) {
+ double factor = ((Number) dbColumnFactors.get(encodedRaceColumnName)).doubleValue();
+ String raceColumnName = MongoUtils.unescapeDollarAndDot(encodedRaceColumnName);
+ result.getRaceColumnByName(raceColumnName).setFactor(factor);
+ }
+ }
+ }
+
private void loadSuppressedCompetitors(DBObject dbLeaderboard,
DelayedLeaderboardCorrections loadedLeaderboardCorrections) {
BasicDBList dbSuppressedCompetitorNames = (BasicDBList) dbLeaderboard.get(FieldNames.LEADERBOARD_SUPPRESSED_COMPETITORS.name());
@@ -432,6 +444,11 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
DBCollection leaderboardCollection = database.getCollection(CollectionNames.LEADERBOARDS.name());
String name = (String) o.get(FieldNames.LEADERBOARD_GROUP_NAME.name());
String description = (String) o.get(FieldNames.LEADERBOARD_GROUP_DESCRIPTION.name());
+ boolean displayGroupsInReverseOrder = false; // default value
+ Object displayGroupsInReverseOrderObj = o.get(FieldNames.LEADERBOARD_GROUP_DISPLAY_IN_REVERSE_ORDER.name());
+ if(displayGroupsInReverseOrderObj != null) {
+ displayGroupsInReverseOrder = (Boolean) displayGroupsInReverseOrderObj;
+ }
ArrayList leaderboards = new ArrayList();
BasicDBList dbLeaderboardIds = (BasicDBList) o.get(FieldNames.LEADERBOARD_GROUP_LEADERBOARDS.name());
for (Object object : dbLeaderboardIds) {
@@ -443,7 +460,7 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
}
}
logger.info("loaded leaderboard group "+name);
- LeaderboardGroupImpl result = new LeaderboardGroupImpl(name, description, leaderboards);
+ LeaderboardGroupImpl result = new LeaderboardGroupImpl(name, description, displayGroupsInReverseOrder, leaderboards);
Object overallLeaderboardIdOrName = o.get(FieldNames.LEADERBOARD_GROUP_OVERALL_LEADERBOARD.name());
if (overallLeaderboardIdOrName != null) {
final DBObject dbOverallLeaderboard;
diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
index 6fd0e70e5f8..1d6d88fd5ae 100755
--- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
+++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
@@ -47,10 +47,11 @@ public enum FieldNames {
LEADERBOARD_NAME, LEADERBOARD_SUPPRESSED_COMPETITORS, LEADERBOARD_COLUMNS, LEADERBOARD_COLUMN_NAME, LEADERBOARD_COMPETITOR_DISPLAY_NAMES,
LEADERBOARD_IS_MEDAL_RACE_COLUMN, LEADERBOARD_CARRIED_POINTS, LEADERBOARD_SCORE_CORRECTIONS, LEADERBOARD_DISCARDING_THRESHOLDS,
LEADERBOARD_SCORE_CORRECTION_MAX_POINTS_REASON, LEADERBOARD_CORRECTED_SCORE, LEADERBOARD_SCORE_CORRECTION_TIMESTAMP,
- LEADERBOARD_SCORE_CORRECTION_COMMENT,
+ LEADERBOARD_SCORE_CORRECTION_COMMENT, LEADERBOARD_COLUMN_FACTORS,
// leaderboard group
LEADERBOARD_GROUP_NAME, LEADERBOARD_GROUP_DESCRIPTION, LEADERBOARD_GROUP_LEADERBOARDS, LEADERBOARD_GROUP_OVERALL_LEADERBOARD,
+ LEADERBOARD_GROUP_DISPLAY_IN_REVERSE_ORDER,
// race ID to regatta name
RACE_ID_AS_STRING;
diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
index 1e56c3c9f77..866b1f1f2ec 100755
--- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
+++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
@@ -152,10 +152,22 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
// at least store the scoring scheme
dbLeaderboard.put(FieldNames.SCORING_SCHEME_TYPE.name(), leaderboard.getScoringScheme().getType().name());
}
+ storeColumnFactors(leaderboard, dbLeaderboard);
storeLeaderboardCorrectionsAndDiscards(leaderboard, dbLeaderboard);
leaderboardCollection.update(query, dbLeaderboard, /* upsrt */ true, /* multi */ false);
}
+ private void storeColumnFactors(Leaderboard leaderboard, BasicDBObject dbLeaderboard) {
+ DBObject raceColumnFactors = new BasicDBObject();
+ for (RaceColumn raceColumn : leaderboard.getRaceColumns()) {
+ Double explicitFactor = raceColumn.getExplicitFactor();
+ if (explicitFactor != null) {
+ raceColumnFactors.put(MongoUtils.escapeDollarAndDot(raceColumn.getName()), explicitFactor);
+ }
+ }
+ dbLeaderboard.put(FieldNames.LEADERBOARD_COLUMN_FACTORS.name(), raceColumnFactors);
+ }
+
private void storeRegattaLeaderboard(RegattaLeaderboard leaderboard, DBObject dbLeaderboard) {
dbLeaderboard.put(FieldNames.REGATTA_NAME.name(), leaderboard.getRegatta().getName());
}
@@ -234,6 +246,8 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
}
}
if (!dbCorrectionForRace.isEmpty()) {
+ // using the column name as the key for the score corrections requires re-writing the score corrections
+ // of a meta-leaderboard if the name of one of its leaderboards changes
dbScoreCorrections.put(raceColumn.getName(), dbCorrectionForRace);
}
}
@@ -276,6 +290,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
BasicDBObject dbLeaderboardGroup = new BasicDBObject();
dbLeaderboardGroup.put(FieldNames.LEADERBOARD_GROUP_NAME.name(), leaderboardGroup.getName());
dbLeaderboardGroup.put(FieldNames.LEADERBOARD_GROUP_DESCRIPTION.name(), leaderboardGroup.getDescription());
+ dbLeaderboardGroup.put(FieldNames.LEADERBOARD_GROUP_DISPLAY_IN_REVERSE_ORDER.name(), leaderboardGroup.isDisplayGroupsInReverseOrder());
final Leaderboard overallLeaderboard = leaderboardGroup.getOverallLeaderboard();
if (overallLeaderboard != null) {
BasicDBObject overallLeaderboardQuery = new BasicDBObject(FieldNames.LEADERBOARD_NAME.name(), overallLeaderboard.getName());
diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/StoreAndForward.java b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/StoreAndForward.java
index 0f9927a7cce..f4aae46fa6f 100755
--- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/StoreAndForward.java
+++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/StoreAndForward.java
@@ -157,7 +157,7 @@ public class StoreAndForward implements Runnable {
if (lastMessageCountRecord == null) {
lastMessageCountCollection.insert(new BasicDBObject().append(FieldNames.LAST_MESSAGE_COUNT.name(), 0l));
}
- return lastMessageCountRecord == null ? 0 : (Long) lastMessageCountRecord.get(FieldNames.LAST_MESSAGE_COUNT.name());
+ return lastMessageCountRecord == null ? 0 : ((Number) lastMessageCountRecord.get(FieldNames.LAST_MESSAGE_COUNT.name())).longValue();
}
/**
@@ -241,13 +241,23 @@ public class StoreAndForward implements Runnable {
}
public static void main(String[] args) throws InterruptedException, IOException {
- int listenPort = Integer.valueOf(args[0]);
- int clientPort = Integer.valueOf(args[1]);
+ String hostname = null;
+ int i=0;
+ if (args[i].equals("-h")) {
+ hostname = args[++i];
+ i++;
+ }
+ int sailMasterPort = Integer.valueOf(args[i++]);
+ int clientPort = Integer.valueOf(args[i++]);
MongoDBService mongoDBService = MongoDBService.INSTANCE;
mongoDBService.setConfiguration(MongoDBConfiguration.getDefaultConfiguration());
SwissTimingAdapterPersistence swissTimingAdapterPersistence = SwissTimingAdapterPersistence.INSTANCE;
- new StoreAndForward(listenPort, clientPort, SwissTimingFactory.INSTANCE, swissTimingAdapterPersistence, mongoDBService);
+ if (hostname == null) {
+ new StoreAndForward(sailMasterPort, clientPort, SwissTimingFactory.INSTANCE, swissTimingAdapterPersistence, mongoDBService);
+ } else {
+ new StoreAndForward(hostname, sailMasterPort, clientPort, SwissTimingFactory.INSTANCE, swissTimingAdapterPersistence, mongoDBService);
+ }
}
public void run() {
diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
index 2c2515ced74..9e3e309a191 100755
--- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
+++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
@@ -125,7 +125,7 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
List result = new ArrayList