Wiki where useful information regarding this project can be found.
-
-### The Pitch
-
-Like businesses, sailors need the latest information to make strategic decisions - but they need it even faster. One wrong tack, a false estimation of the current, or the slightest wind shift can cost the skipper the entire race. As premium sponsor of the Kieler Woche 2011, and co-sponsor of Sailing Team Germany (STG), SAP is showing how innovative IT solutions providing real time data analysis can give teams the competitive edge.
-
-SAP is at the center of today’s technology revolution, developing innovations that not only help businesses run like never before, but also improve the lives of people everywhere. As market leader in enterprise application software, SAP SE (NYSE: SAP) helps companies of all sizes and industries run better. From back office to boardroom, warehouse to storefront, desktop to mobile device – SAP empowers people and organizations to work together more efficiently and use business insight more effectively to stay ahead of the competition. SAP applications and services enable more than 258,000 customers to operate profitably, adapt continuously, and grow sustainably.
-
-# Table of Contents
-
-## Information
-
-### General
-
-* [[Information about this Wiki and HowTo|wiki/info/general/wiki]]
-* [[General Project Information|wiki/info/general/general-information]]
-* [[Inventory|wiki/info/general/inventar-liste]]
-
-### Landscape and Development
-
-* [[Architecture and Infrastructure|wiki/info/landscape/architecture-and-infrastructure]]
- * [[Runtime Environment|wiki/info/landscape/runtime-environment]]
- * [[Basic architectual principles|wiki/info/landscape/basic-architectural-principles]]
- * [[User Management|wiki/info/landscape/usermanagement]]
- * [[Development Environment|wiki/info/landscape/development-environment]]
- * [[Production Environment|wiki/info/landscape/production-environment]]
- * [[Typical Development Scenarios|wiki/info/landscape/typical-development-scenarios]]
-* [[RaceLog Tracking Server Architecture|wiki/info/landscape/server]]
- * Environment Overview [[PDF|wiki/info/mobile/event-tracking/architecture.pdf]] | [[SVG|wiki/info/mobile/event-tracking/architecture.svg]]
-* Amazon
- * [[Amazon EC2|wiki/info/landscape/amazon-ec2]]
- * [[EC2 Backup Strategy|wiki/info/landscape/amazon-ec2-backup-strategy]]
- * [[Creating an EC2 image from scratch|wiki/info/landscape/creating-ec2-image-from-scratch]]
- * [[EC2 mail relaying|wiki/info/landscape/mail-relaying]]
-* [[Building and Deploying|wiki/info/landscape/building-and-deploying]]
-* [[Data Mining Architecture|wiki/info/landscape/data-mining-architecture]]
-* [[Typical Data Mining Scenarios|wiki/info/landscape/typical-data-mining-scenarios]]
-* [[Create clickable UI prototypes with Axure|wiki/info/landscape/ui-clickable-prototypes]]
-* [[Webdesign|wiki/info/landscape/webdesign]]
-
-### Mobile
-
-* [[Mobile Development|wiki/info/mobile/mobile-development]]
-* Tracking App
- * [[Tracking App Specification|wiki/info/mobile/app-spec/app-spec]]
- * [[Event Tracking|wiki/info/mobile/event-tracking/event-tracking]]
- * [[Steps for setting up Smartphone Tracking|wiki/info/mobile/smartphone-tracking-steps]]
- * [[Tracking App Prototype Architecture|wiki/info/mobile/app]]
-* Racecommittee App
- * [[Racecommittee App|wiki/info/mobile/racecommittee-app]]
- * [[Environment|wiki/info/mobile/racecommittee-app-environment]]
- * [[Administrator|wiki/info/mobile/racecommittee-app-administrator]]
- * [[User|wiki/info/mobile/racecommittee-app-user]]
-* [[Android and Release Build|wiki/info/mobile/android-and-release-build]]
-* [[Energy consumption of mobile apps|wiki/info/mobile/energy-consumption]]
-* [[Data consumption of mobile apps|wiki/info/mobile/data-consumption]]
-* [[Mobile Sailing Analytics|wiki/info/mobile/mobilesailinganalytics]]
-* [[Push Notifications|wiki/info/mobile/push-notifications]]
-
-### API
-
-* [[Web Services API|wiki/info/api/sailing-webservices]]
-* [[API v1|wiki/info/api/api-v1]]
-* [[Tracking App API|wiki/info/api/tracking-app-api]]
-* [[Training API v1 draft|wiki/info/api/training-api-v1-draft]]
-
-### Security
- * [[Fortify Tests|wiki/info/security/fortify]]
- * [[SSL / HTTPS Support|wiki/info/security/ssl-support]]
-
-### Miscellaneous
-
-* [[Big Data - Numbers|wiki/info/misc/big-data-numbers]]
-* [[Data Quality|wiki/info/misc/data-quality]]
-* [[Sailing Domain Algorithms|wiki/info/misc/sailing-domain-algorithms]]
-* [[Google Analytics (Web Page Tracking)|wiki/info/misc/ganalytics]]
-* [[S3 Development Sample|wiki/info/misc/s3-sample]]
-
-* [[FAQ for League Operators|wiki/info/misc/league-operators-faq]]
-* [[Prionet related information|wiki/info/misc/prionet-related-information]]
-* [[TracTrac Workshop 2013|wiki/info/misc/tractracworkshop2013]]
-
-## HowTo
-
-* [[Onboarding|wiki/howto/onboarding]]
-
-
-### Development
-
-* [[Create boat graphics for the 2D race viewer|wiki/howto/development/boatgraphicssvg]]
-* [[Continuous Integration with Hudson/Jenkins|wiki/howto/development/ci]]
-* [[Dispatch|wiki/howto/development/dispatch]]
-* [[Working with GWT UI Binder|wiki/howto/development/gwt-ui-binder]]
-* [[Java De(Serialization) and Circular Dependencies|wiki/howto/development/java-de-serialization-and-circular-dependencies]]
-* [[JMX Support|wiki/howto/development/jmx]]
-* [[Working with GWT Locally|wiki/howto/development/local-gwt]]
-* [[Log File Analysis|wiki/howto/development/log-file-analysis]]
-* [[UI Tests with Selenium|wiki/howto/development/selenium-ui-tests]]
-* [[Profiling|wiki/howto/development/profiling]]
-* [[Working with GWT Super Dev Mode|wiki/howto/development/super-dev-mode]]
-
-### For Event Managers
-
-* [[Set up local network with replication server|wiki/howto/eventmanagers/event-network-with-replica]]
-* [[Operating Igtimi WindBots|wiki/howto/eventmanagers/windbot-operations]]
-* [[Linking Race Videos|wiki/howto/eventmanagers/linking-race-videos]]
-* [[Import official results|wiki/howto/eventmanagers/results-import]]
-
-### Setup
-
-* [[Configure Races on Server|wiki/howto/setup/configure-races-on-server]]
-* [[Setting up internal Jenkins on SAP Monsoon|wiki/howto/setup/setting-up-jenkins-on-sap-monsoon]]
-
-### Miscellaneous
-
-* [[Cook Book|wiki/howto/misc/cook-book]]
-* [[Polars|wiki/howto/misc/polars]]
-* [[Server Replication|wiki/howto/misc/server-replication]]
-* [[TracTrac|wiki/howto/misc/tractrac-lifecycle]]
-* [[UI Tests|wiki/howto/misc/ui-tests-tutorial]]
-* [[Uploading Media Content|wiki/howto/misc/uploading-media-content]]
-* [[Monitoring Apache and RabbitMQ|wiki/misc/monitoring-apache-and-rabbitmq]]
-
-## Projects
-* [[Analytics on a stick|wiki/projects/analytics-on-a-stick]]
-
-## Events and Planning
-* [[Project Planning (bigger development)|wiki/events/planning]]
-* [[General Event Planning|wiki/events/general-event-planning]]
-* [[Information about Extreme Sailing Series|wiki/events/extreme-sailing-series]]
-* [[Travemünder Woche 2014 event page|wiki/events/tw2014]]
-* [[505 worlds Kiel 2014 event page|wiki/events/505-worlds-kiel-2014]]
-* [[Kieler Woche event page|wiki/events/kieler-woche-2015]]
-* [[Charleston Race Week 2016|wiki/events/Charleston-Race-Week-2016]]
-* [[Sailing Leagues 2016|wiki/events/sailing-Leagues-2016]]
-
-## Planning
-* [[Overview|https://wiki.sapsailing.com/pages/wiki/planning/]]
-
-## Internal services (not related to wiki but useful)
-
-* [Bugzilla Issue Tracking System](http://bugzilla.sapsailing.com/bugzilla/)
-* [GIT Repository (SAP)](ssh://git.wdf.sap.corp:29418/SAPSail/sapsailingcapture.git)
-* [Maven Repository Browser](http://maven.sapsailing.com/maven/) (see [[how to setup repository for Android builds|wiki/info/mobile/racecommittee-app-environment]])
-* [Main Sailing Website](http://www.sapsailing.com)
-* [Visitor Statistics](http://analysis.sapsailing.com/)
+# Welcome to the SAP Sailing Wiki
+
+This is the What's New - SAP Sailing Analytics
+
March 2017
+-
+
- The SAP Sailing Analytics are now also available in French, Portugese, as well as Spanish. + Find the language chooser in the lower right corner of the footer, or when signed in, go to your user + profile and set your preferred language. + +
- The application's locale now switches based on the client's "Accept-Language" HTTP header field. + This means that the application in all its parts will show in the user's default language if + supported, defaulting to English otherwise. + +
February 2017
- The definition of "ride height" for foiling sensors has been changed. Instead of showing
diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
index 604d7abfe9e..90007ee2c92 100755
--- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
+++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
@@ -35,6 +35,7 @@ import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl;
import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore;
import com.sap.sailing.domain.regattalog.impl.EmptyRegattaLogStore;
import com.sap.sailing.domain.test.AbstractTracTracLiveTest;
+import com.sap.sailing.domain.test.PositionAssert;
import com.sap.sailing.domain.tracking.DynamicRaceDefinitionSet;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
import com.sap.sailing.domain.tracking.DynamicTrackedRegatta;
@@ -124,9 +125,9 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive
result.lockForRead();
try {
for (Wind wind : result.getRawFixes()) {
- assertEquals(pos, wind.getPosition());
- assertEquals(10., wind.getKnots(), 0.000000000001);
- assertEquals(myBearingDeg, wind.getBearing().getDegrees(), 0.000000001);
+ PositionAssert.assertPositionEquals(pos, wind.getPosition(), /* deg delta */ 0.000001);
+ assertEquals(10., wind.getKnots(), 0.01);
+ assertEquals(myBearingDeg, wind.getBearing().getDegrees(), 0.01);
myBearingDeg += 1.1;
}
} finally {
diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java
index ae1fb17f687..9ec6ea13e9a 100644
--- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java
+++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java
@@ -12,6 +12,7 @@ import java.util.Set;
import org.junit.Test;
import com.mongodb.MongoException;
+import com.sap.sailing.domain.tracking.RaceTracker;
import com.sap.sailing.domain.tracking.RaceTrackingConnectivityParameters;
import com.sap.sailing.domain.tractracadapter.DomainFactory;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
@@ -47,7 +48,8 @@ public class TracTracConnectivityParamsLoadAndStoreTest extends AbstractConnecti
paramURL, /* live URI */ null, storedURI, courseDesignUpdateURI, startOfTracking, endOfTracking,
delayToLiveInMillis, offsetToStartTimeOfSimulatedRace, useInternalMarkPassingAlgorithm,
/* raceLogStore */ null, /* regattaLogStore */ null, DomainFactory.INSTANCE, tracTracUsername, tracTracPassword,
- raceStatus, raceVisibility, trackWind, correctWindDirectionByMagneticDeclination, /* preferReplayIfAvailable */ false);
+ raceStatus, raceVisibility, trackWind, correctWindDirectionByMagneticDeclination, /* preferReplayIfAvailable */ false,
+ /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS);
// store
mongoObjectFactory.addConnectivityParametersForRaceToRestore(tracTracParams);
// load
diff --git a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/Activator.java b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/Activator.java
index e0e35e98af7..a70d40b4e3e 100644
--- a/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/Activator.java
+++ b/java/com.sap.sailing.polars.datamining/src/com/sap/sailing/polars/datamining/Activator.java
@@ -1,5 +1,6 @@
package com.sap.sailing.polars.datamining;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -46,7 +47,8 @@ public class Activator extends AbstractDataMiningActivator {
public Activator() {
dataRetrieverChainDefinitions = new PolarsDataRetrievalChainDefinitions();
- sailingServerStringMessages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, getClassLoader());
+ sailingServerStringMessages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, getClassLoader(),
+ StandardCharsets.UTF_8.name());
}
@Override
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java
index 40e01f6ce29..332fc9f4346 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java
@@ -20,7 +20,7 @@ public abstract class HostPage extends PageObject {
/**
* The default timeout of 60 seconds for the initialization of the page object.
*/
- protected static final int DEFAULT_PAGE_LOAD_TIMEOUT = 60;
+ protected static final int DEFAULT_PAGE_LOAD_TIMEOUT = 120;
public static final String getGWTCodeServer() {
String codeServer = System.getProperty(GWT_CODE_SERVER_PARAMETER_NAME);
diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogSuppressedMarkPassingsEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogSuppressedMarkPassingsEventDeserializer.java
index 124ef6e6352..4c7b24bb0f6 100644
--- a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogSuppressedMarkPassingsEventDeserializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogSuppressedMarkPassingsEventDeserializer.java
@@ -23,7 +23,8 @@ public class RaceLogSuppressedMarkPassingsEventDeserializer extends BaseRaceLogE
@Override
protected RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint createdAt, AbstractLogEventAuthor author,
TimePoint timePoint, int passId, List
competitors) throws JsonDeserializationException { - Integer indexOfFirstWaypoint = (Integer) object.get(RaceLogSuppressedMarkPassingsEventSerializer.FIELD_INDEX_OF_FIRST_SUPPRESSED_WAYPOINTS); + final Number indexOfFirstWaypointAsNumber = (Number) object.get(RaceLogSuppressedMarkPassingsEventSerializer.FIELD_INDEX_OF_FIRST_SUPPRESSED_WAYPOINTS); + Integer indexOfFirstWaypoint = indexOfFirstWaypointAsNumber==null?null:indexOfFirstWaypointAsNumber.intValue(); return new RaceLogSuppressedMarkPassingsEventImpl(createdAt, timePoint, author, id, competitors, passId, indexOfFirstWaypoint); } } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java index 85ca57badff..f7102d090a3 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java @@ -1,6 +1,7 @@ package com.sap.sailing.server.gateway.jaxrs.api; import java.util.ArrayList; +import java.util.Comparator; import java.util.Date; import java.util.HashSet; import java.util.Iterator; @@ -9,6 +10,8 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; @@ -33,6 +36,7 @@ import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaName; import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; @@ -44,6 +48,7 @@ import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.ranking.RankingMetric.RankingInfo; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.GPSFixTrack; +import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; @@ -868,6 +873,102 @@ public class RegattasResource extends AbstractSailingServerResource { return response; } + /** + * @return the actual or anticipated start order for the race identified by {@coode regattaName} and {@code raceName}. + * Those competitors for which a start mark passing is already known are sorted by those start mark passings. All other + * boats are ordered by their geometrical distance from the start line or the windward distance from the start mark + * if the start for some reason is defined by a single mark. See {@link #compareDistanceFromStartLine(Competitor, Competitor)}. + */ + @GET + @Produces("application/json;charset=UTF-8") + @Path("{regattaname}/races/{racename}/startorder") + public Response getStartOrder(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { + Response response; + Regatta regatta = findRegattaByName(regattaName); + if (regatta == null) { + response = Response.status(Status.NOT_FOUND) + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) + .build(); + } else { + RaceDefinition race = findRaceByName(regatta, raceName); + if (race == null) { + response = Response.status(Status.NOT_FOUND) + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.").type(MediaType.TEXT_PLAIN) + .build(); + } else { + final TrackedRace trackedRace = findTrackedRace(regattaName, raceName); + Course course = trackedRace.getRace().getCourse(); + final List competitors = new ArrayList<>(); + final Waypoint firstWaypoint = course.getFirstWaypoint(); + final TimePoint timeToUseForStart; + if (trackedRace.getStartOfRace() != null) { + timeToUseForStart = trackedRace.getStartOfRace(); + } else { + timeToUseForStart = MillisecondsTimePoint.now(); + } + if (firstWaypoint != null) { + final List startWaypointMarkPositions = + StreamSupport.stream(firstWaypoint.getMarks().spliterator(), /* parallel */ false). + map(mark->trackedRace.getTrack(mark)).filter(markTrack->markTrack!=null). + map(markTrack->markTrack.getEstimatedPosition(timeToUseForStart, /* extrapolate */ false)). + collect(Collectors.toList()); + Util.addAll(trackedRace.getRace().getCompetitors(), competitors); + competitors.sort((a, b)->{ + final MarkPassing aStartMarkPassing = trackedRace.getMarkPassing(a, firstWaypoint); + final MarkPassing bStartMarkPassing = trackedRace.getMarkPassing(b, firstWaypoint); + final int result; + if (aStartMarkPassing == null) { + if (bStartMarkPassing == null) { + result = compareDistanceFromStartLine(trackedRace, startWaypointMarkPositions, timeToUseForStart, a, b); + } else { + result = 1; // b consider less than a because it has a start mark passing and therefore is assumed to have started before a + } + } else if (bStartMarkPassing == null) { + result = -1; // a consider less than b because it has a start mark passing and therefore is assumed to have started before b + } else { + // both have a start mark passing; compare time points + result = aStartMarkPassing.getTimePoint().compareTo(bStartMarkPassing.getTimePoint()); + } + return result; + }); + } + CompetitorJsonSerializer serializer = new CompetitorJsonSerializer(); + JSONArray result = new JSONArray(); + for (final Competitor c : competitors) { + JSONObject jsonCompetitor = serializer.serialize(c); + result.add(jsonCompetitor); + } + String json = result.toJSONString(); + return Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + } + } + return response; + } + + private int compareDistanceFromStartLine(TrackedRace trackedRace, Iterable startWaypointMarkPositions, + TimePoint timeToUseForStart, Competitor a, Competitor b) { + final Position aPos = trackedRace.getTrack(a).getEstimatedPosition(timeToUseForStart, /* extrapolate */ true); + final Position bPos = trackedRace.getTrack(b).getEstimatedPosition(timeToUseForStart, /* extrapolate */ true); + final Distance aDist = aPos==null?null:getDistanceFromStartWaypoint(aPos, startWaypointMarkPositions); + final Distance bDist = bPos==null?null:getDistanceFromStartWaypoint(bPos, startWaypointMarkPositions); + return Comparator. nullsLast(Comparator.naturalOrder()).compare(aDist, bDist); + } + + private Distance getDistanceFromStartWaypoint(Position pos, Iterable startWaypointMarkPositions) { + final Distance result; + if (Util.isEmpty(startWaypointMarkPositions)) { + result = null; + } else if (Util.size(startWaypointMarkPositions) == 1) { + // single mark start; strange, but possible: + result = startWaypointMarkPositions.iterator().next().getDistance(pos); + } else { + final Position first = Util.get(startWaypointMarkPositions, 0); + final Position second = Util.get(startWaypointMarkPositions, 1); + result = pos.getDistanceToLine(first, second).abs(); + } + return result; + } + @GET @Produces("application/json;charset=UTF-8") @Path("{regattaname}/races") diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/AbstractWindImportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/AbstractWindImportServlet.java index ac71c18fbc4..9b362a2d53f 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/AbstractWindImportServlet.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/AbstractWindImportServlet.java @@ -186,6 +186,7 @@ public abstract class AbstractWindImportServlet extends SailingServerHttpServlet raceEntry.update(wind); } } + getService().getPolarDataService().insertExistingFixes(trackedRace); } } // Use text/html to prevent browsers from wrapping the response body, diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/expedition/WindLogParser.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/expedition/WindLogParser.java index 42e2b4b1238..14f5ac5a897 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/expedition/WindLogParser.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/windimport/expedition/WindLogParser.java @@ -32,7 +32,6 @@ public class WindLogParser { * */ private static class WindBuffer { - /** * The 1900 Date System http://support.microsoft.com/kb/180162/en-us */ @@ -49,7 +48,6 @@ public class WindLogParser { public void updateTime(String time_ExcelEpoch) { if (!time_ExcelEpoch.trim().isEmpty()) { - BigDecimal timeStamp = new BigDecimal(time_ExcelEpoch); long millisecondsSinceExcelEpochStart = timeStamp.multiply(MILLISECONDS_PER_DAY).longValue(); this.timePoint = new MillisecondsTimePoint(EXCEL_EPOCH_START.getTimeInMillis() + millisecondsSinceExcelEpochStart); @@ -59,7 +57,6 @@ public class WindLogParser { public void updateWindData(String trueWindSpeedData, String trueWindDirectionData) { if (!trueWindSpeedData.trim().isEmpty() && !trueWindDirectionData.trim().isEmpty()) { - double trueWindSpeed = Double.parseDouble(trueWindSpeedData); double trueWindDirection = Double.parseDouble(trueWindDirectionData); Bearing trueWindBearing = new DegreeBearingImpl(trueWindDirection + 180); @@ -91,15 +88,8 @@ public class WindLogParser { position = null; trueWindSpeedWithBearing = null; } - } -// private static final int CSV_INDEX_TIME_STAMP = 0; -// private static final int CSV_INDEX_TRUE_WIND_SPEED = 5; -// private static final int CSV_INDEX_TRUE_WIND_DIRECTION = 6; -// private static final int CSV_INDEX_LAT = 37; -// private static final int CSV_INDEX_LONG = 38; - private static final String COL_NAME_TIME_STAMP = "GPS Time"; private static final String COL_NAME_TRUE_WIND_SPEED = "Tws"; private static final String COL_NAME_TRUE_WIND_DIRECTION = "Twd"; @@ -139,7 +129,6 @@ public class WindLogParser { lon = i; break; } - } if (gpsTime == null || trueWindSpeed == null || trueWindDirection == null || lat == null || lon == null) { throw new RuntimeException("Unexpected csv header for Expedition wind import: " + headerLine); diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java index ff35ebd6f41..1897dee07c4 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java @@ -1,7 +1,6 @@ package com.sap.sailing.server.replication.test; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; @@ -57,6 +56,7 @@ import com.sap.sailing.domain.persistence.PersistenceFactory; import com.sap.sailing.domain.persistence.media.MediaDBFactory; import com.sap.sailing.domain.racelog.tracking.EmptySensorFixStore; import com.sap.sailing.domain.ranking.OneDesignRankingMetric; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.test.TrackBasedTest; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.TrackedRace; @@ -158,7 +158,7 @@ public class InitialLoadReplicationObjectIdentityTest extends AbstractServerRepl WindTrack masterRCWindFixes = masterTrackedRace.getOrCreateWindTrack(new WindSourceImpl(WindSourceType.RACECOMMITTEE)); masterRCWindFixes.lockForRead(); try { - assertEquals(masterWindFix, masterRCWindFixes.getRawFixes().iterator().next()); + PositionAssert.assertWindEquals(masterWindFix, masterRCWindFixes.getRawFixes().iterator().next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.01); } finally { masterRCWindFixes.unlockAfterRead(); } @@ -233,7 +233,7 @@ public class InitialLoadReplicationObjectIdentityTest extends AbstractServerRepl try { Iterator replicaRCWindFixesIter = replicaRCWindFixes.getRawFixes().iterator(); replicaRCWindFixesIter.next(); - assertEquals(replicaWindFix, replicaRCWindFixesIter.next()); + PositionAssert.assertWindEquals(replicaWindFix, replicaRCWindFixesIter.next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.02); } finally { replicaRCWindFixes.unlockAfterRead(); } diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java index 279a13d9c83..4b7c1667942 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java @@ -20,6 +20,7 @@ import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; import com.sap.sailing.domain.regattalog.impl.EmptyRegattaLogStore; import com.sap.sailing.domain.test.AbstractTracTracLiveTest; import com.sap.sailing.domain.tracking.RaceHandle; +import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.RaceTrackingConnectivityParameters; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.server.RacingEventService; @@ -72,7 +73,7 @@ public class TrackRaceBoatCompetitorMetadataReplicationTest extends AbstractServ startOfTracking, endOfTracking, /* delayToLiveInMillis */ 0l, /* offsetToStartTimeOfSimulatedRace */null, /*ignoreTracTracMarkPassings*/ false, EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, tracTracUsername, tracTracPassword, "", "", /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ false, - /* preferReplayIfAvailable */ false); + /* preferReplayIfAvailable */ false, /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); } private void startTracking() throws Exception, InterruptedException { diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java index 947ea39cbc0..9fa2b1ea6bb 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java @@ -31,6 +31,7 @@ import com.sap.sailing.domain.regattalog.impl.EmptyRegattaLogStore; import com.sap.sailing.domain.test.AbstractTracTracLiveTest; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.RaceHandle; +import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.RaceTrackingConnectivityParameters; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.server.RacingEventService; @@ -90,7 +91,7 @@ public class TrackRaceReplicationTest extends AbstractServerReplicationTest { startOfTracking, endOfTracking, /* delayToLiveInMillis */ 0l, /* offsetToStartTimeOfSimulatedRace */null, /*ignoreTracTracMarkPassings*/ false, EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, tracTracUsername, tracTracPassword, "", "", /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ false, - /* preferReplayIfAvailable */ false); + /* preferReplayIfAvailable */ false, /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); } private void startTracking() throws Exception, InterruptedException { diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java index e1627fad87f..06ba867545a 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java @@ -44,6 +44,7 @@ import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.persistence.MongoWindStore; import com.sap.sailing.domain.persistence.MongoWindStoreFactory; import com.sap.sailing.domain.persistence.PersistenceFactory; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRegatta; import com.sap.sailing.domain.tracking.GPSFixTrack; @@ -130,7 +131,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio competitorTrack.lockForRead(); try { assertEquals(1, Util.size(competitorTrack.getRawFixes())); - assertEquals(fix, competitorTrack.getRawFixes().iterator().next()); + PositionAssert.assertGPSFixEquals(fix, competitorTrack.getRawFixes().iterator().next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.01); assertNotSame(fix, competitorTrack.getRawFixes().iterator().next()); } finally { competitorTrack.unlockAfterRead(); @@ -151,7 +152,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio replicaMarkTrack.lockForRead(); try { assertEquals(1, Util.size(replicaMarkTrack.getRawFixes())); - assertEquals(replicaMarkTrack.getRawFixes().iterator().next(), fix); + PositionAssert.assertGPSFixEquals(replicaMarkTrack.getRawFixes().iterator().next(), fix, /* pos deg delta */ 0.0000001); assertNotSame(fix, replicaMarkTrack.getRawFixes().iterator().next()); } finally { replicaMarkTrack.unlockAfterRead(); @@ -174,7 +175,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio try { assertEquals(1, Util.size(replicaWindTrack.getRawFixes())); Wind replicaWind = replicaWindTrack.getRawFixes().iterator().next(); - assertEquals(wind, replicaWind); + PositionAssert.assertWindEquals(wind, replicaWind, /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.02, /* knot speed delta */ 0.02); assertNotSame(wind, replicaWind); } finally { replicaWindTrack.unlockAfterRead(); diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java index fa18de8ae77..33d122a22b9 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java @@ -37,6 +37,8 @@ import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.persistence.MongoWindStoreFactory; import com.sap.sailing.domain.persistence.PersistenceFactory; +import com.sap.sailing.domain.racelog.tracking.GPSFixStore; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRegatta; import com.sap.sailing.domain.tracking.GPSFixTrack; @@ -157,7 +159,7 @@ public class TrackedRaceWithGPSFixStoreContentsReplicationTest extends AbstractS competitorTrack.lockForRead(); try { assertEquals(1, Util.size(competitorTrack.getRawFixes())); - assertEquals(fix, competitorTrack.getRawFixes().iterator().next()); + PositionAssert.assertGPSFixEquals(fix, competitorTrack.getRawFixes().iterator().next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.01); assertNotSame(fix, competitorTrack.getRawFixes().iterator().next()); } finally { competitorTrack.unlockAfterRead(); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MasterDataImporterMediaTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MasterDataImporterMediaTest.java index fa75b4e28ed..de884290bcf 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MasterDataImporterMediaTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MasterDataImporterMediaTest.java @@ -26,6 +26,7 @@ import org.mockito.Mockito; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaNameAndRaceName; +import com.sap.sailing.domain.common.impl.MasterDataImportObjectCreationCountImpl; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.domain.persistence.DomainObjectFactory; import com.sap.sailing.domain.persistence.MongoObjectFactory; @@ -68,7 +69,7 @@ public class MasterDataImporterMediaTest { @Test public void testEmptyImportList_NoOverride() throws Exception { createRacingEventService(); - racingEventService.mediaTracksImported(mediaTracksToImport, NO_OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), NO_OVERRIDE); verify(racingEventService, never()).mediaTrackAdded(any(MediaTrack.class)); verify(racingEventService, never()).mediaTrackDeleted(any(MediaTrack.class)); @@ -81,7 +82,7 @@ public class MasterDataImporterMediaTest { @Test public void testEmptyImportList_WithOverride() throws Exception { createRacingEventService(); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); verify(racingEventService, never()).mediaTrackAdded(any(MediaTrack.class)); verify(racingEventService, never()).mediaTrackDeleted(any(MediaTrack.class)); @@ -101,7 +102,7 @@ public class MasterDataImporterMediaTest { MediaTrack mediaTrackToImport = new MediaTrack(dbId, "title", "url", MillisecondsTimePoint.now(), MillisecondsDurationImpl.ONE_HOUR, MimeType.mp3, assignedRaces); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); Iterable allMediaTracks = racingEventService.getAllMediaTracks(); assertThat(Util.size(allMediaTracks), is(1)); @@ -132,7 +133,7 @@ public class MasterDataImporterMediaTest { MediaTrack mediaTrackToImport = new MediaTrack(existingMediaTrack.dbId, existingMediaTrack.title, existingMediaTrack.url, existingMediaTrack.startTime, existingMediaTrack.duration, mimeType, existingMediaTrack.assignedRaces); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); Iterable allMediaTracksAfterImport = racingEventService.getAllMediaTracks(); assertThat(allMediaTracksAfterImport, is(allMediaTracksBeforeImport)); @@ -160,7 +161,7 @@ public class MasterDataImporterMediaTest { MediaTrack mediaTrackToImport = new MediaTrack(dbId2, existingMediaTrack.title, existingMediaTrack.url, existingMediaTrack.startTime, existingMediaTrack.duration, mimeType, existingMediaTrack.assignedRaces); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); Iterable allMediaTracksAfterImport = racingEventService.getAllMediaTracks(); assertThat(Util.size(allMediaTracksAfterImport), is(2)); @@ -189,7 +190,7 @@ public class MasterDataImporterMediaTest { assertThat(existingMediaTrack.title, is(not(mediaTrackToImport.title))); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); Iterable allMediaTracksAfterImport = racingEventService.getAllMediaTracks(); assertThat(Util.size(allMediaTracksAfterImport), is(1)); @@ -220,7 +221,7 @@ public class MasterDataImporterMediaTest { assertThat(existingMediaTrack.title, is(not(mediaTrackToImport.title))); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); Iterable allMediaTracksAfterImport = racingEventService.getAllMediaTracks(); assertThat(Util.size(allMediaTracksAfterImport), is(1)); @@ -251,7 +252,7 @@ public class MasterDataImporterMediaTest { assertThat(existingMediaTrack.title, is(not(mediaTrackToImport.title))); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, NO_OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), NO_OVERRIDE); Iterable allMediaTracksAfterImport = racingEventService.getAllMediaTracks(); assertThat(Util.size(allMediaTracksAfterImport), is(1)); @@ -282,7 +283,7 @@ public class MasterDataImporterMediaTest { assertThat(existingMediaTrack.url, is(not(mediaTrackToImport.url))); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); Iterable allMediaTracksAfterImport = racingEventService.getAllMediaTracks(); assertThat(Util.size(allMediaTracksAfterImport), is(1)); @@ -313,7 +314,7 @@ public class MasterDataImporterMediaTest { assertThat(existingMediaTrack.startTime, is(not(mediaTrackToImport.startTime))); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); Iterable allMediaTracksAfterImport = racingEventService.getAllMediaTracks(); assertThat(Util.size(allMediaTracksAfterImport), is(1)); @@ -343,7 +344,7 @@ public class MasterDataImporterMediaTest { assertThat(existingMediaTrack.duration, is(not(mediaTrackToImport.duration))); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); Iterable allMediaTracksAfterImport = racingEventService.getAllMediaTracks(); assertThat(Util.size(allMediaTracksAfterImport), is(1)); @@ -376,7 +377,7 @@ public class MasterDataImporterMediaTest { assertThat(mediaTrackToImport.assignedRaces.size(), is(2)); mediaTracksToImport.add(mediaTrackToImport); - racingEventService.mediaTracksImported(mediaTracksToImport, OVERRIDE); + racingEventService.mediaTracksImported(mediaTracksToImport, new MasterDataImportObjectCreationCountImpl(), OVERRIDE); Iterable allMediaTracksAfterImport = racingEventService.getAllMediaTracks(); assertThat(Util.size(allMediaTracksAfterImport), is(1)); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java index ec41b6df4e8..88cdb29ee79 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -21,6 +21,7 @@ import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; import com.sap.sailing.domain.regattalog.impl.EmptyRegattaLogStore; import com.sap.sailing.domain.tracking.RaceHandle; import com.sap.sailing.domain.tracking.RaceListener; +import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.TrackedRegatta; import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants; @@ -73,7 +74,8 @@ public class RaceTrackerTest { service, paramUrl, liveUri, storedUri, courseDesignUpdateUri, EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, /* timeoutInMilliseconds */60000, tracTracUsername, tracTracPassword, TracTracConnectionConstants.ONLINE_STATUS, TracTracConnectionConstants.ONLINE_VISIBILITY, - /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ false); + /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ false, + /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); logger.info("Calling raceHandle.getRaces()"); RaceDefinition race = raceHandle.getRace(); // wait for RaceDefinition to be completely wired in Regatta logger.info("Obtained race: "+race); @@ -133,7 +135,7 @@ public class RaceTrackerTest { EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, /* timeoutInMilliseconds */60000, tracTracUsername, tracTracPassword, TracTracConnectionConstants.ONLINE_STATUS, TracTracConnectionConstants.ONLINE_VISIBILITY, /* trackWind */ false, - /* correctWindDirectionByMagneticDeclination */ false); + /* correctWindDirectionByMagneticDeclination */ false, /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); TrackedRegatta newTrackedRegatta = myRaceHandle.getTrackedRegatta(); assertNotSame(oldTrackedRegatta, newTrackedRegatta); TrackedRace newTrackedRace = getTrackedRace(newTrackedRegatta); @@ -162,7 +164,7 @@ public class RaceTrackerTest { EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, /* timeoutInMilliseconds */60000, tracTracUsername, tracTracPassword, TracTracConnectionConstants.ONLINE_STATUS, TracTracConnectionConstants.ONLINE_VISIBILITY, /* trackWind */ false, - /* correctWindDirectionByMagneticDeclination */ false); + /* correctWindDirectionByMagneticDeclination */ false, /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); TrackedRegatta newTrackedEvent = myRaceHandle.getTrackedRegatta(); TrackedRace newTrackedRace = getTrackedRace(newTrackedEvent); // expecting a new tracked race to be created when starting over with tracking diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java index a066b9d3e15..ae25eebe128 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java @@ -42,6 +42,7 @@ import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.leaderboard.impl.LowPoint; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; @@ -146,8 +147,22 @@ public class WindByRaceLogTest { try { windTrack.lockForRead(); - assertTrue(Util.contains(windTrack.getFixes(), wind1)); - assertTrue(Util.contains(windTrack.getFixes(), wind2)); + boolean foundWind1 = false; + boolean foundWind2 = false; + for (Wind w : windTrack.getFixes()) { + try { + PositionAssert.assertWindEquals(w, wind1, /* posDegDelta */ 0.000001, /* bearingDegreeDelta */ 0.01, /* knotSpeedDelta */ 0.01); + foundWind1 = true; + } catch (AssertionError e) { + } + try { + PositionAssert.assertWindEquals(w, wind2, /* posDegDelta */ 0.000001, /* bearingDegreeDelta */ 0.01, /* knotSpeedDelta */ 0.01); + foundWind2 = true; + } catch (AssertionError e) { + } + } + assertTrue(foundWind1); + assertTrue(foundWind2); } finally { windTrack.unlockAfterRead(); } @@ -172,7 +187,15 @@ public class WindByRaceLogTest { try { windTrack.lockForRead(); - assertTrue(Util.contains(windTrack.getFixes(), wind1)); + boolean foundWind1 = false; + for (Wind w : windTrack.getFixes()) { + try { + PositionAssert.assertWindEquals(w, wind1, /* posDegDelta */ 0.000001, /* bearingDegreeDelta */ 0.01, /* knotSpeedDelta */ 0.01); + foundWind1 = true; + } catch (AssertionError e) { + } + } + assertTrue(foundWind1); } finally { windTrack.unlockAfterRead(); } diff --git a/java/com.sap.sailing.server.trackfiles.test/resources/FMU_out_new.txt b/java/com.sap.sailing.server.trackfiles.test/resources/FMU_out_new.txt new file mode 100755 index 00000000000..d93a9867c48 --- /dev/null +++ b/java/com.sap.sailing.server.trackfiles.test/resources/FMU_out_new.txt @@ -0,0 +1,10 @@ +#------------------------------------------------------------ +#-- File created 08/03/2017 at 05:38:19 +#------------------------------------------------------------ +jjlDATE jjlTIME Epoch RideHeight RideHeightPortHull RideHeightStbdHull Heel Trim ImuSensor_GyroX ImuSensor_GyroY ImuSensor_GyroZ ImuSensor_Pitch ImuSensor_Roll ImuSensor_Yaw ImuSensor_LinearAccX ImuSensor_LinearAccY ImuSensor_LinearAccZ Hb_Z Dn_Z Db_Z LKF_ride_hgh LKF_ride_hgh_Position LKF_ride_hgh_Velocity LKF_ride_hgh_Acceleration LKF_ride_hgh_PositionError LKF_ride_hgh_VelocityError LKF_ride_hgh_AccelerationError Gps_Gga_PosFixTime Gps_Gga_Lat Gps_Gga_Lon Gps_Gga_QI Gps_Gga_HDOP Gps_Gga_AntHeight Gps_Vtg_TMG Gps_Vtg_SOGKnots Gps_Rmc_MagVar Gps_EastVelocity Gps_NorthVelocity Gps_UpVelocity BravoNet_Node0x0A0_Ch0 BravoNet_Node0x0A0_Voltage BravoNet_Node0x0A0_Temperature BravoNet_Node0x0A0_Current SyncTimeDiff SyncTimeSync SyncTimeUpdateCount SyncTimePercentageToSync ES_OnTimeSync +20170308.000000 53819.390491 1488951499390.000000 0.313796 -0.714744 -0.853481 -1.500000 3.200000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.100172 -0.314127 -0.330172 0.016091 -0.314174 -0.004288 -0.000000 0.121613 1.403056 0.062733 53819.200000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.001831 24.295210 21.217340 0.015640 542266653.468207 0.000000 1.000000 0.000000 0.000000 +20170308.000000 53819.487567 1488951499481.000000 0.313992 -0.714548 -0.853286 -1.500000 3.200000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.100172 -0.314127 -0.330172 0.016090 -0.314261 -0.002298 0.000000 0.097345 0.648185 0.049813 53819.400000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.295210 21.000116 0.023460 0.000077 1.000000 1.000000 0.000000 1.000000 +20170308.000000 53819.585786 1488951499572.000000 0.314025 -0.714515 -0.853253 -1.500000 3.200000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.099696 -0.313652 -0.329696 0.019540 -0.313953 -0.000227 0.000001 0.086096 0.423595 0.043597 53819.400000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.295210 20.782894 0.046921 0.000077 1.000000 1.000000 0.000000 1.000000 +20170308.000000 53819.685771 1488951499682.000000 0.313923 -0.714617 -0.853355 -1.500000 3.200000 -0.086588 -0.214116 0.175599 -0.000000 0.000000 0.000000 -0.258920 0.519435 -0.087402 -0.099696 -0.313652 -0.329696 0.019270 -0.313730 0.000672 0.000839 0.075893 0.287746 0.038563 53819.600000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.253178 21.000116 0.046921 -0.000199 1.000000 1.000000 0.000000 1.000000 +20170308.000000 53819.782123 1488951499772.000000 0.313831 -0.714709 -0.853447 -1.500000 3.200000 0.013137 -0.213877 0.120009 -1.060399 -3.133662 0.001262 -0.108944 0.029720 0.070589 -0.099696 -0.313652 -0.329696 0.015927 -0.313576 0.001633 0.003961 0.069401 0.222243 0.035510 53819.600000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.295210 21.000116 0.046921 -0.000199 1.000000 1.000000 0.000000 1.000000 +20170308.000000 53819.880156 1488951499863.000000 0.314961 -0.768407 -0.798152 -0.321583 2.797351 0.072364 -0.168356 0.209327 -1.091322 -3.133510 0.016635 -0.068841 0.000188 0.184953 -0.099696 -0.324611 -0.329696 0.016254 -0.318301 -0.005391 0.019517 0.064999 0.178037 0.033119 53819.800000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.295210 21.000116 0.031281 -0.000724 1.000000 1.000000 0.000000 1.000000 diff --git a/java/com.sap.sailing.server.trackfiles.test/resources/Undefined Race - BRAVO.txt b/java/com.sap.sailing.server.trackfiles.test/resources/Undefined Race - BRAVO.txt index df22ca99e10..1ef50c43ef3 100644 --- a/java/com.sap.sailing.server.trackfiles.test/resources/Undefined Race - BRAVO.txt +++ b/java/com.sap.sailing.server.trackfiles.test/resources/Undefined Race - BRAVO.txt @@ -1,7 +1,7 @@ #------------------------------------------------------------ #-- File created 09/04/2016 at 23:26:40 #------------------------------------------------------------ -jjlDATE jjlTIME Epoch RideHeight RideHeightPortHull RideHeightStbdHull Heel Trim ImuSensor_GyroX ImuSensor_GyroY ImuSensor_GyroZ ImuSensor_Pitch ImuSensor_Roll ImuSensor_Yaw ImuSensor_LinearAccX ImuSensor_LinearAccY ImuSensor_LinearAccZ Hb_Z Dn_Z Db_Z LKF_ride_hgh LKF_ride_hgh_Position LKF_ride_hgh_Velocity LKF_ride_hgh_Acceleration LKF_ride_hgh_PositionError LKF_ride_hgh_VelocityError LKF_ride_hgh_AccelerationError Gps_Gga_PosFixTime Gps_Gga_Lat Gps_Gga_Lon Gps_Gga_QI Gps_Gga_HDOP Gps_Gga_AntHeight Gps_Vtg_TMG Gps_Vtg_SOGKnots Gps_Rmc_MagVar Gps_EastVelocity Gps_NorthVelocity Gps_UpVelocity BravoNet_Node0x0A0_Ch0 BravoNet_Node0x0A0_Voltage BravoNet_Node0x0A0_Temperature BravoNet_Node0x0A0_Current +jjlDATE jjlTIME Epoch RideHeight RideHeightPortHull RideHeightStbdHull Heel Trim ImuSensor_GyroX ImuSensor_GyroY ImuSensor_GyroZ ImuSensor_Pitch ImuSensor_Roll ImuSensor_Yaw ImuSensor_LinearAccX ImuSensor_LinearAccY ImuSensor_LinearAccZ Hb_Z Dn_Z Db_Z LKF_ride_hgh LKF_ride_hgh_Position LKF_ride_hgh_Velocity LKF_ride_hgh_Acceleration LKF_ride_hgh_PositionError LKF_ride_hgh_VelocityError LKF_ride_hgh_AccelerationError Gps_Gga_PosFixTime Gps_Gga_Lat Gps_Gga_Lon Gps_Gga_QI Gps_Gga_HDOP Gps_Gga_AntHeight Gps_Vtg_TMG Gps_Vtg_SOGKnots Gps_Rmc_MagVar Gps_EastVelocity Gps_NorthVelocity Gps_UpVelocity BravoNet_Node0x0A0_Ch0 BravoNet_Node0x0A0_Voltage BravoNet_Node0x0A0_Temperature BravoNet_Node0x0A0_Current 20160409.000000 232640.908740 1460244399905.000000 0.757862 0.650044 0.865680 2.095203 -10.572519 0.014012 0.080612 0.075319 -10.572519 -2.095203 358.804353 -0.021935 0.017397 0.000239 -0.673131 -0.757548 -0.743131 0.013623 -0.757862 -0.004228 -0.018140 0.074238 0.272712 0.037974 212640.800000 5232.276310 1325.488310 1.000000 1.100000 80.800000 306.100000 0.370000 3.200000 -0.170000 0.130000 -0.000000 0.733032 24.043011 36.640236 0.054741 20160409.000000 232641.008763 1460244399995.000000 0.758014 0.650158 0.865870 2.095937 -10.571562 0.032092 0.217810 -0.023014 -10.571683 -2.096830 358.798479 -0.028412 0.021632 -0.027246 -0.673131 -0.757548 -0.743131 0.019586 -0.758014 -0.005095 -0.018096 0.069231 0.211765 0.035063 212640.800000 5232.276310 1325.488310 1.000000 1.100000 80.800000 306.100000 0.370000 3.200000 -0.150000 0.110000 -0.000000 0.733032 24.000978 35.988564 0.054741 20160409.000000 232641.105742 1460244400089.000000 0.758203 0.650319 0.866087 2.096466 -10.570188 0.073738 0.193435 0.107095 -10.570447 -2.097253 358.792882 -0.042638 0.045676 -0.010817 -0.673131 -0.757547 -0.743131 0.019374 -0.758203 -0.006152 -0.018839 0.064587 0.170564 0.032760 212641.000000 5232.276260 1325.488390 1.000000 1.100000 80.800000 306.100000 0.300000 3.200000 -0.150000 0.110000 -0.000000 0.733032 24.043011 35.988564 0.054741 diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java index 064f35a4b2d..2112fffb572 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java @@ -48,6 +48,11 @@ public class BravoDataImportTest { testImport(ImportData.FILE_UNDEFINED_RACE_BRAVO); } + @Test + public void testFileImportNewFormat() throws FormatNotSupportedException, IOException { + testImport(ImportData.FILE_NEW_BRAVO_FORMAT); + } + @Test public void testDefaultHeaderNoDataImport() throws FormatNotSupportedException, IOException { testImport(ImportData.DUMMY_DEFAULT_HEADER_NO_DATA); @@ -64,7 +69,6 @@ public class BravoDataImportTest { } private void testImport(ImportData importData) throws FormatNotSupportedException, IOException { - bravoDataImporter.importFixes(importData.getInputStream(), (fixes, device) -> { for (DoubleVectorFix fix : fixes) { callbackCallCount++; @@ -85,6 +89,12 @@ public class BravoDataImportTest { return getClass().getResourceAsStream("/Undefined Race - BRAVO.txt"); } }, + FILE_NEW_BRAVO_FORMAT(6, 1) { + @Override + protected InputStream getInputStream() { + return getClass().getResourceAsStream("/FMU_out_new.txt"); + } + }, DUMMY_DEFAULT_HEADER_NO_DATA(0, 0) { @Override protected InputStream getInputStream() { diff --git a/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/BravoDataImporterImpl.java b/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/BravoDataImporterImpl.java index f18665cde9d..25dd4f54226 100644 --- a/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/BravoDataImporterImpl.java +++ b/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/BravoDataImporterImpl.java @@ -6,8 +6,10 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Serializable; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; @@ -142,10 +144,12 @@ public class BravoDataImporterImpl implements DoubleVectorFixImporter { String header = headerTokens[j]; colIndicesInFile.put(header, j); } - List columnsInFix = metadata.getFileColumns(); - if (colIndicesInFile.size() != columnsInFix.size() || !colIndicesInFile.keySet().containsAll(columnsInFix)) { - LOG.log(Level.SEVERE, "Missing headers"); - throw new RuntimeException("Missing headers in import files"); + List requiredColumnsInFix = metadata.getTrackColumns(); + if (!colIndicesInFile.keySet().containsAll(requiredColumnsInFix)) { + final Set missingColumns = new HashSet<>(requiredColumnsInFix); + missingColumns.removeAll(colIndicesInFile.keySet()); + LOG.log(Level.SEVERE, "Missing headers: "+missingColumns); + throw new RuntimeException("Missing headers "+missingColumns+" in import files"); } return colIndicesInFile; } diff --git a/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties b/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties index f2963fcde53..6dce21058a6 100644 --- a/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties +++ b/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties @@ -1,6 +1,6 @@ -raceInRegattaOfEvent=race {0} in regatta '{1}' of event '{2}' -raceInFleetInRegattaOfEvent=race {0} ({3}) in regatta '{1}' of event '{2}' -leaderboardOfEvent=leaderboard '{0}' of event '{1}' +raceInRegattaOfEvent=race {0} in regatta ''{1}'' of event ''{2}'' +raceInFleetInRegattaOfEvent=race {0} ({3}) in regatta ''{1}'' of event ''{2}'' +leaderboardOfEvent=leaderboard ''{0}'' of event ''{1}'' leaderboardShowResultsLinkTitle=Show results racesOverviewLinkTitle=Show races overview diff --git a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties index f287ccc8493..6c1cf2bb65a 100644 --- a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties +++ b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_de.properties @@ -3,32 +3,32 @@ raceInFleetInRegattaOfEvent=Wettfahrt {0} ({3}) der Regatta "{1}" bei Veranstalt leaderboardOfEvent=Rangliste "{0}" bei Veranstaltung "{1}" leaderboardShowResultsLinkTitle=Ergebnisse anzeigen -racesOverviewLinkTitle=Wettfahrtbersicht anzeigen +racesOverviewLinkTitle=Wettfahrtübersicht anzeigen raceboardShowRaceLinkTitle=Wettfahrt anzeigen raceboardRaceAnalysisLinkTitle=Wettfahrtanalyse anzeigen -boatClassRaceFinishedSubject=Wettfahrt fr Bootsklasse {0} beendet - Neue Ergebnisse verfgbar +boatClassRaceFinishedSubject=Wettfahrt für Bootsklasse {0} beendet - Neue Ergebnisse verfügbar # 0: boatClassName, 1: raceDescription -boatClassRaceFinishedBody=Neue Ergebnisse fr Bootsklasse {0} in {1} sind verfgbar. +boatClassRaceFinishedBody=Neue Ergebnisse für Bootsklasse {0} in {1} sind verfügbar. -boatClassScoreCorrectionSubject=Neue Ergebnisse fr Bootsklasse {0} verfgbar +boatClassScoreCorrectionSubject=Neue Ergebnisse für Bootsklasse {0} verfügbar # 0: boatClassName, 1: leaderboardDescription -boatClassScoreCorrectionBody=Neue Ergebnisse fr Bootsklasse {0} in {1} sind verfgbar. +boatClassScoreCorrectionBody=Neue Ergebnisse für Bootsklasse {0} in {1} sind verfügbar. competitorPassesFinishSubject=Teilnehmer {0} hat eine Wettfahrt beendet # 0: competitorName, 1: raceDescription -competitorPassesFinishBody=Teilnehmer {0} hat bei {1} die Ziellinie berquert. +competitorPassesFinishBody=Teilnehmer {0} hat bei {1} die Ziellinie überquert. -competitorScoreCorrectionSubject=Neue Ergebnisse fr Teilnehmer {0} +competitorScoreCorrectionSubject=Neue Ergebnisse für Teilnehmer {0} # 0: competitorName, 1: leaderboardDescription -competitorScoreCorrectionBody=Fr Teilnehmer {0} in {1} sind neue Ergebnisse verfgbar. +competitorScoreCorrectionBody=Für Teilnehmer {0} in {1} sind neue Ergebnisse verfügbar. boatClassUpcomingRaceSubject=Wettfahrt in Bootsklasse {0} startet bald # 0: boatClassName, 1: raceDescription, 2: time boatClassUpcomingRaceBody=In Bootsklasse {0} startet {1} um etwa {2}. -subscriptionInformation=Bei dieser Mail handelt es sich um eine automatisierte Benachrichtigung von SAP Sailing Analytics. Die Benachrichtigungen knnen im Benutzerprofil (s.u.) abgeschaltet werden. +subscriptionInformation=Bei dieser Mail handelt es sich um eine automatisierte Benachrichtigung von SAP Sailing Analytics. Die Benachrichtigungen können im Benutzerprofil (s.u.) abgeschaltet werden. userProfile=Benutzerprofil imprint=Impressum -privacy=Datenschutzerklrung +privacy=Datenschutzerklärung salutation=Hallo {0}, diff --git a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_es.properties b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_es.properties index 460799fdd60..acf808bfae3 100644 --- a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_es.properties +++ b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_es.properties @@ -1,6 +1,6 @@ -raceInRegattaOfEvent=Carrera {0} en regata '{1}' de evento '{2}' -raceInFleetInRegattaOfEvent=Carrera {0} ({3}) en regata '{1}' de evento '{2}' -leaderboardOfEvent=Clasificación '{0}' de evento '{1}' +raceInRegattaOfEvent=Carrera {0} en regata ''{1}'' de evento ''{2}'' +raceInFleetInRegattaOfEvent=Carrera {0} ({3}) en regata ''{1}'' de evento ''{2}'' +leaderboardOfEvent=Clasificación ''{0}'' de evento ''{1}'' leaderboardShowResultsLinkTitle=Mostrar resultados racesOverviewLinkTitle=Mostrar resumen de carreras diff --git a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_ja.properties b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_ja.properties index 70685488714..1886059db81 100644 --- a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_ja.properties +++ b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_ja.properties @@ -1,6 +1,6 @@ -raceInRegattaOfEvent=イベント '{2}’ のレガッタ '{1}' のレース {0} -raceInFleetInRegattaOfEvent=イベント '{2}’ のレガッタ '{1}' のレース {0} ({3}) -leaderboardOfEvent=イベント '{1}’ のリーダーボード '{0}' +raceInRegattaOfEvent=イベント ''{2}'’ のレガッタ ''{1}'' のレース {0} +raceInFleetInRegattaOfEvent=イベント ''{2}’’ のレガッタ ''{1}'' のレース {0} ({3}) +leaderboardOfEvent=イベント ''{1}'’ のリーダーボード ''{0}'' leaderboardShowResultsLinkTitle=結果の表示 racesOverviewLinkTitle=レース概要の表示 diff --git a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_pt.properties b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_pt.properties index f7b946053a7..20dc0722d9d 100644 --- a/java/com.sap.sailing.server/resources/stringmessages/StringMessages_pt.properties +++ b/java/com.sap.sailing.server/resources/stringmessages/StringMessages_pt.properties @@ -1,6 +1,6 @@ -raceInRegattaOfEvent=corrida {0} na regata '{1}' do evento '{2}' -raceInFleetInRegattaOfEvent=corrida {0} ({3}) na regata '{1}' do evento '{2}' -leaderboardOfEvent=painel de classificação '{0}' do evento '{1}' +raceInRegattaOfEvent=corrida {0} na regata ''{1}'' do evento ''{2}'' +raceInFleetInRegattaOfEvent=corrida {0} ({3}) na regata ''{1}'' do evento ''{2}'' +leaderboardOfEvent=painel de classificação ''{0}'' do evento ''{1}'' leaderboardShowResultsLinkTitle=Visualizar resultados racesOverviewLinkTitle=Visualizar síntese de corridas diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java index 6596ebe725d..1abb66bc1b5 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java @@ -42,6 +42,7 @@ import com.sap.sailing.domain.base.configuration.DeviceConfigurationMatcher; import com.sap.sailing.domain.base.configuration.RegattaConfiguration; import com.sap.sailing.domain.common.DataImportProgress; import com.sap.sailing.domain.common.DataImportSubProgress; +import com.sap.sailing.domain.common.MasterDataImportObjectCreationCount; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RaceFetcher; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; @@ -447,11 +448,11 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch * In contrast to mediaTracksAdded, this method takes mediaTracks with a given dbId. * Checks if the track already exists in the library and the database and adds/stores it * accordingly. If a track already exists and override, its properties are checked for changes - * @param mediaTrack * @param override If true, track properties (title, url, start time, duration, not mime type!) will be * overwritten with the values from the track to be imported. + * @param mediaTrack */ - void mediaTracksImported(Iterable mediaTracksToImport, boolean override); + void mediaTracksImported(Iterable mediaTracksToImport, MasterDataImportObjectCreationCount creatingCount, boolean override) throws Exception; Iterable getMediaTracksForRace(RegattaAndRaceIdentifier regattaAndRaceIdentifier); diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 41d0ce96686..b5492956fa5 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -92,6 +92,7 @@ import com.sap.sailing.domain.base.impl.RemoteSailingServerReferenceImpl; import com.sap.sailing.domain.common.DataImportProgress; import com.sap.sailing.domain.common.DataImportSubProgress; import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.MasterDataImportObjectCreationCount; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RaceIdentifier; @@ -1707,7 +1708,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes } @Override - public void correctedScoreChanced(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, + public void correctedScoreChanged(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, Double newCorrectedScore) { notifyForCompetitorIfNotAlreadyNotifiedRecently(competitor, raceColumn); } @@ -3163,36 +3164,47 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes } @Override - public void mediaTracksImported(Iterable mediaTracksToImport, boolean override) { + public void mediaTracksImported(Iterable mediaTracksToImport, MasterDataImportObjectCreationCount creationCount, boolean override) throws Exception { + Exception firstException = null; for (MediaTrack trackToImport : mediaTracksToImport) { - MediaTrack existingTrack = mediaLibrary.lookupMediaTrack(trackToImport); - if (existingTrack == null) { - mediaDB.insertMediaTrackWithId(trackToImport.dbId, trackToImport.title, trackToImport.url, - trackToImport.startTime, trackToImport.duration, trackToImport.mimeType, - trackToImport.assignedRaces); - mediaTrackAdded(trackToImport); - } else if (override) { - - // Using fine-grained update methods. - // Rationale: Changes on more than one track property are rare - // and don't justify the introduction of a new set - // of methods (including replication). - if (!Util.equalsWithNull(existingTrack.title, trackToImport.title)) { - mediaTrackTitleChanged(trackToImport); - } - if (!Util.equalsWithNull(existingTrack.url, trackToImport.url)) { - mediaTrackUrlChanged(trackToImport); - } - if (!Util.equalsWithNull(existingTrack.startTime, trackToImport.startTime)) { - mediaTrackStartTimeChanged(trackToImport); - } - if (!Util.equalsWithNull(existingTrack.duration, trackToImport.duration)) { - mediaTrackDurationChanged(trackToImport); - } - if (!Util.equalsWithNull(existingTrack.assignedRaces, trackToImport.assignedRaces)) { - mediaTrackAssignedRacesChanged(trackToImport); - } - } + try { + MediaTrack existingTrack = mediaLibrary.lookupMediaTrack(trackToImport); + if (existingTrack == null) { + mediaDB.insertMediaTrackWithId(trackToImport.dbId, trackToImport.title, trackToImport.url, + trackToImport.startTime, trackToImport.duration, trackToImport.mimeType, + trackToImport.assignedRaces); + mediaTrackAdded(trackToImport); + } else if (override) { + // Using fine-grained update methods. + // Rationale: Changes on more than one track property are rare + // and don't justify the introduction of a new set + // of methods (including replication). + if (!Util.equalsWithNull(existingTrack.title, trackToImport.title)) { + mediaTrackTitleChanged(trackToImport); + } + if (!Util.equalsWithNull(existingTrack.url, trackToImport.url)) { + mediaTrackUrlChanged(trackToImport); + } + if (!Util.equalsWithNull(existingTrack.startTime, trackToImport.startTime)) { + mediaTrackStartTimeChanged(trackToImport); + } + if (!Util.equalsWithNull(existingTrack.duration, trackToImport.duration)) { + mediaTrackDurationChanged(trackToImport); + } + if (!Util.equalsWithNull(existingTrack.assignedRaces, trackToImport.assignedRaces)) { + mediaTrackAssignedRacesChanged(trackToImport); + } + } + creationCount.addOneMediaTrack(); + } catch (Exception e) { + logger.log(Level.SEVERE, "Problem importing media track "+trackToImport+"; continuing with other media tracks.", e); + if (firstException == null) { + firstException = e; + } + } + } + if (firstException != null) { + throw firstException; } } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java index c1cbdd01d08..3a67ddc49ed 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java @@ -67,7 +67,7 @@ public abstract class NotificationSetNotification implements MailNotification private final PreferenceObjectBasedNotificationSet associatedNotificationSet; private static final ResourceBundleStringMessagesImpl messages = new ResourceBundleStringMessagesImpl( SailingNotificationServiceImpl.STRING_MESSAGES_BASE_NAME, - NotificationSetNotification.class.getClassLoader()); + NotificationSetNotification.class.getClassLoader(), StandardCharsets.UTF_8.name()); public NotificationSetNotification(T objectToNotifyAbout, PreferenceObjectBasedNotificationSet associatedNotificationSet) { this.objectToNotifyAbout = objectToNotifyAbout; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java index ffc5b2960dc..07342614dfa 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java @@ -2,6 +2,7 @@ package com.sap.sailing.server.notification.impl; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.text.DateFormat; import java.util.HashSet; import java.util.LinkedHashSet; @@ -74,7 +75,7 @@ public class SailingNotificationServiceImpl implements SailingNotificationServic CompetitorResultsNotificationSet competitorResults) throws MalformedURLException { this.mailQueue = mailQueue; this.messages = new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, - this.getClass().getClassLoader()); + this.getClass().getClassLoader(), StandardCharsets.UTF_8.name()); this.defaultBaseURL = new URL("https://www.sapsailing.com"); toStop.add(this.boatClassResults = boatClassResults); @@ -157,13 +158,11 @@ public class SailingNotificationServiceImpl implements SailingNotificationServic String eventName = event.getName(); String leaderboardDisplayName = leaderboard.getDisplayName() != null ? leaderboard.getDisplayName() : leaderboard.getName(); - if (Util.size(raceColumn.getFleets()) > 1) { return messages.get(locale, "raceInFleetInRegattaOfEvent", raceName, leaderboardDisplayName, eventName, fleet.getName()); } else { return messages.get(locale, "raceInRegattaOfEvent", raceName, leaderboardDisplayName, eventName); - } } @@ -171,7 +170,6 @@ public class SailingNotificationServiceImpl implements SailingNotificationServic String eventName = event.getName(); String leaderboardDisplayName = leaderboard.getDisplayName() != null ? leaderboard.getDisplayName() : leaderboard.getName(); - return messages.get(locale, "leaderboardOfEvent", leaderboardDisplayName, eventName); } @@ -253,7 +251,6 @@ public class SailingNotificationServiceImpl implements SailingNotificationServic public void notifyUserOnBoatClassWhenScoreCorrectionsAreAvailable(BoatClass boatClass, Leaderboard leaderboard) { // TODO don't send notifications when a notification for the same boatClass / leaderboard has already been sent shortly before doWithEvent(leaderboard, (event, leaderboardGroup) -> { - mailQueue.addNotification(new NotificationSetNotification (boatClass, boatClassResults) { @Override protected NotificationMailTemplate getMailTemplate(BoatClass objectToNotifyAbout, Locale locale) { @@ -272,7 +269,6 @@ public class SailingNotificationServiceImpl implements SailingNotificationServic public void notifyUserOnBoatClassUpcomingRace(BoatClass boatClass, Leaderboard leaderboard, RaceColumn raceColumn, Fleet fleet, TimePoint when) { doWithEvent(leaderboard, (event, leaderboardGroup) -> { - mailQueue.addNotification(new NotificationSetNotification (boatClass, boatClassUpcomingRace) { @Override protected NotificationMailTemplate getMailTemplate(BoatClass objectToNotifyAbout, Locale locale) { diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java index d861dd49adc..a6c387b5346 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.UUID; +import java.util.logging.Level; import java.util.logging.Logger; import com.sap.sailing.domain.abstractlog.race.RaceLog; @@ -31,10 +32,10 @@ import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.impl.MasterDataImportObjectCreationCountImpl; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixImpl; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixMovingImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl; import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.LeaderboardGroup; @@ -132,11 +133,11 @@ public class ImportMasterDataOperation extends if (masterData.getDeviceConfigurations() != null) { importDeviceConfigurations(toState); } + toState.mediaTracksImported(masterData.getFilteredMediaTracks(), creationCount, override); dataImportLock.getProgress(importOperationId).setResult(creationCount); - toState.mediaTracksImported(masterData.getFilteredMediaTracks(), override); return creationCount; } catch (Exception e) { - logger.severe("Error during execution of ImportMasterDataOperation"); + logger.log(Level.SEVERE, "Error during execution of ImportMasterDataOperation", e); throw new RuntimeException("Error during execution of ImportMasterDataOperation", e); } finally { LockUtil.unlockAfterWrite(dataImportLock); @@ -388,7 +389,7 @@ public class ImportMasterDataOperation extends for (Wind fix : windTrackToReadFrom.getRawFixes()) { Wind existingFix = windTrackToWriteTo.getFirstRawFixAtOrAfter(fix.getTimePoint()); if (existingFix == null || !(existingFix.equals(fix) && fix.getTimePoint().equals(existingFix.getTimePoint()) - && fix.getPosition().equals(existingFix.getPosition()))) { + && Util.equalsWithNull(fix.getPosition(), existingFix.getPosition()))) { windTrackToWriteTo.add(fix); } else { logger.info("Didn't add wind fix in import, because equal fix was already there."); @@ -415,12 +416,12 @@ public class ImportMasterDataOperation extends DeviceIdentifier device = entry.getKey(); final Collection fixesToAddAsBatch = new ArrayList<>(BATCH_SIZE_FOR_IMPORTING_FIXES); for (Timed fixToAdd : entry.getValue()) { - if (fixToAdd instanceof CompactGPSFixMovingImpl) { - CompactGPSFixMovingImpl gpsFix = (CompactGPSFixMovingImpl) fixToAdd; + if (fixToAdd instanceof VeryCompactGPSFixMovingImpl) { + VeryCompactGPSFixMovingImpl gpsFix = (VeryCompactGPSFixMovingImpl) fixToAdd; fixToAdd = new GPSFixMovingImpl(gpsFix.getPosition(), fixToAdd.getTimePoint(), - ((CompactGPSFixMovingImpl) fixToAdd).getSpeed()); - } else if (fixToAdd instanceof CompactGPSFixImpl) { - CompactGPSFixImpl gpsFix = (CompactGPSFixImpl) fixToAdd; + ((VeryCompactGPSFixMovingImpl) fixToAdd).getSpeed()); + } else if (fixToAdd instanceof VeryCompactGPSFixImpl) { + VeryCompactGPSFixImpl gpsFix = (VeryCompactGPSFixImpl) fixToAdd; fixToAdd = new GPSFixImpl(gpsFix.getPosition(), fixToAdd.getTimePoint()); } fixesToAddAsBatch.add(fixToAdd); diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/SetSuppressedFlagForCompetitorInLeaderboard.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/SetSuppressedFlagForCompetitorInLeaderboard.java index e7b0f707ead..72d9ddc6417 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/SetSuppressedFlagForCompetitorInLeaderboard.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/SetSuppressedFlagForCompetitorInLeaderboard.java @@ -20,8 +20,10 @@ public class SetSuppressedFlagForCompetitorInLeaderboard extends AbstractLeaderb public Void internalApplyTo(RacingEventService toState) throws Exception { Leaderboard leaderboard = toState.getLeaderboardByName(getLeaderboardName()); Competitor competitor = leaderboard.getCompetitorByIdAsString(competitorIdAsString); - leaderboard.setSuppressed(competitor, suppressed); - toState.updateStoredLeaderboard(leaderboard); + if (competitor != null) { + leaderboard.setSuppressed(competitor, suppressed); + toState.updateStoredLeaderboard(leaderboard); + } return null; } diff --git a/java/com.sap.sailing.www/release_notes_admin.html b/java/com.sap.sailing.www/release_notes_admin.html old mode 100644 new mode 100755 index b03ba35e2ba..811fd6afd85 --- a/java/com.sap.sailing.www/release_notes_admin.html +++ b/java/com.sap.sailing.www/release_notes_admin.html @@ -23,7 +23,28 @@ Release Notes - Administration Console
-Febrbuary 2017
+March 2017
+-
+
- A more compact internal storage format for GPS and Wind fixes is now being used. Instead of a full + 64-bit "double" value for all components such at latitude, longitude, speed over ground or course over + ground, "smaller" data types such as "int" and "short" are now employed. The reduction of accuracy + that this brings about is negligible given the accuracy of the tracking systems used. For example, + the latitude values are encoded such that while covering the full range from -90° to +90°, the + resolution is at 4.6mm. Similarly, speeds are represented in their compact form in such a way + that speeds up to 500kts can be represented at a resolution of 0.015kts. + +
- When a race cannot be loaded successfully through the TracTrac connector, e.g., because its boat + class does not match the regatta's boat class, the tracker is now stopped, and a SEVERE log message + is written, giving the reason for the failure to load the race. This gives administrators an opportunity + to correct any errors in the underlying data and try again. Previously, tracking such a + was not possible without a server re-start because the tracker continued to exist. + +
- The application's locale now switches based on the client's "Accept-Language" HTTP header field. + This means that the application as well as all its parts, including the administration console, + will show in the user's default language if supported, defaulting to English otherwise. + +
February 2017
- Wind data in GRIB format can now be imported in the "Wind" sub-tab of the "Tracked Races" tab
in the AdminConsole. When one or more races are being tracked, with a tracking time
diff --git a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/FoilingData.java b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/FoilingData.java
new file mode 100644
index 00000000000..88f107a05ba
--- /dev/null
+++ b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/FoilingData.java
@@ -0,0 +1,164 @@
+package com.sap.sailing.xmlexport;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.base.Fleet;
+import com.sap.sailing.domain.base.RaceColumn;
+import com.sap.sailing.domain.base.SpeedWithConfidence;
+import com.sap.sailing.domain.base.impl.SpeedWithConfidenceImpl;
+import com.sap.sailing.domain.common.Bearing;
+import com.sap.sailing.domain.common.Position;
+import com.sap.sailing.domain.common.SpeedWithBearing;
+import com.sap.sailing.domain.common.WindSource;
+import com.sap.sailing.domain.common.WindSourceType;
+import com.sap.sailing.domain.common.impl.KnotSpeedImpl;
+import com.sap.sailing.domain.common.impl.WindSourceImpl;
+import com.sap.sailing.domain.common.sensordata.BravoSensorDataMetadata;
+import com.sap.sailing.domain.common.tracking.BravoFix;
+import com.sap.sailing.domain.leaderboard.Leaderboard;
+import com.sap.sailing.domain.tracking.BravoFixTrack;
+import com.sap.sailing.domain.tracking.DynamicSensorFixTrack;
+import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
+import com.sap.sailing.domain.tracking.TrackedRace;
+import com.sap.sailing.domain.tracking.WindTrack;
+import com.sap.sailing.domain.tracking.WindWithConfidence;
+import com.sap.sailing.server.RacingEventService;
+import com.sap.sse.common.Duration;
+import com.sap.sse.common.TimePoint;
+
+public class FoilingData {
+
+ private final HttpServletRequest req;
+ private final HttpServletResponse res;
+ private final RacingEventService service;
+ private final boolean useProvidedLeaderboard;
+
+ public FoilingData(HttpServletRequest req, HttpServletResponse res, RacingEventService service) {
+ this.req = req;
+ this.res = res;
+ this.service = service;
+ this.useProvidedLeaderboard = false;
+ }
+
+ public String getAttribute(String name) {
+ return this.req.getParameter(name);
+ }
+
+ public RacingEventService getService() {
+ return service;
+ }
+
+ public Leaderboard getLeaderboard() throws IOException, ServletException {
+ Leaderboard leaderboard = null;
+ if (!useProvidedLeaderboard) {
+ final String leaderboardName = getAttribute("name");
+ if (leaderboardName == null) {
+ throw new ServletException("Use the name= parameter to specify the leaderboard");
+ }
+ leaderboard = getService().getLeaderboardByName(leaderboardName);
+ if (leaderboard == null) {
+ throw new ServletException("Leaderboard " + leaderboardName + " not found.");
+ }
+ }
+ return leaderboard;
+ }
+
+ public void perform() throws Exception {
+ StringBuffer result = new StringBuffer();
+ result.append("TimePoint").append(";");
+ result.append("RegattaName").append(";");
+ result.append("RaceName").append(";");
+ result.append("LegIndexStartingAtZero").append(";");
+ result.append("LegType").append(";");
+ result.append("CompetitorName").append(";");
+ result.append("CompetitorSailId").append(";");
+ result.append("CompetitorUUID").append(";");
+ result.append("SpeedOverGroundInKnots").append(";");
+ result.append("RideHeightInMeter").append(";");
+ result.append("RideHeightPortInMeter").append(";");
+ result.append("RideHeightStarboardInMeter").append(";");
+ result.append("Heel").append(";");
+ result.append("Pitch").append(";");
+ result.append("AveragedWindSpeedInKnots").append(";");
+ result.append("WindDirectionInDegrees").append(";");
+ result.append("CompetitorBearingInDegrees").append(";");
+ result.append("BearingDifferenceBetweenCompetitorAndWindInDegrees").append("\n");
+ Leaderboard leaderboard = getLeaderboard();
+ for (RaceColumn raceColumn : leaderboard.getRaceColumns()) {
+ for (Fleet fleet : raceColumn.getFleets()) {
+ TrackedRace trackedRace = raceColumn.getTrackedRace(fleet);
+ if (trackedRace != null) {
+ final List
allCompetitors = trackedRace.getCompetitorsFromBestToWorst(/*timePoint*/trackedRace.getEndOfRace()); + for (Competitor competitor : allCompetitors) { + DynamicSensorFixTrack windSourcesToDeliver = new ArrayList (); + final WindSource windSource = new WindSourceImpl(WindSourceType.COMBINED); + windSourcesToDeliver.add(windSource); + final WindTrack windTrack = trackedRace.getOrCreateWindTrack(windSource); + final TimePoint toTimePoint = trackedRace.getEndOfRace(); + TimePoint timePointToConsider = fromTimePoint; + int attemptedNumberOfFixes = 0; + while (toTimePoint == null ? (attemptedNumberOfFixes<5) : (timePointToConsider.compareTo(toTimePoint) < 0)) { + BravoFix bravoFixAtTimepoint = sensorTrack.getFirstFixAtOrAfter(timePointToConsider); + if (bravoFixAtTimepoint != null) { + SpeedWithBearing speedOfCompetitor = trackedRace.getTrack(competitor).getEstimatedSpeed(timePointToConsider); + double rideHeight = bravoFixAtTimepoint.get(BravoSensorDataMetadata.RIDE_HEIGHT); + double rideHeightPort = bravoFixAtTimepoint.get(BravoSensorDataMetadata.RIDE_HEIGHT_PORT_HULL); + double rideHeightStarboard = bravoFixAtTimepoint.get(BravoSensorDataMetadata.RIDE_HEIGHT_STBD_HULL); + double heel = bravoFixAtTimepoint.get(BravoSensorDataMetadata.HEEL); + double pitch = bravoFixAtTimepoint.get(BravoSensorDataMetadata.PITCH); + WindWithConfidence windFixSpeed = new SpeedWithConfidenceImpl (new KnotSpeedImpl(windFix.getObject().getKnots()), windFix.getConfidence(), timePointToConsider); + Bearing windFixBearing = windFix.getObject().getBearing(); + TrackedLegOfCompetitor leg = trackedRace.getTrackedLeg(competitor, timePointToConsider); + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-M-dd HH:mm:ss"); + result.append(simpleDateFormat.format(timePointToConsider.asDate())).append(";"); + result.append(trackedRace.getRaceIdentifier().getRegattaName()).append(";"); + result.append(trackedRace.getRaceIdentifier().getRaceName()).append(";"); + if (leg != null) { + result.append(trackedRace.getRace().getCourse().getLegs().indexOf(leg.getLeg())).append(";"); + result.append(leg.getTrackedLeg().getLegType(timePointToConsider).name()).append(";"); + } else { + result.append("-1").append(";"); + result.append("UNKNOWN").append(";"); + } + result.append(competitor.getName()).append(";"); + result.append(competitor.getBoat().getSailID()).append(";"); + result.append(competitor.getId()).append(";"); + result.append(speedOfCompetitor != null ? speedOfCompetitor.getKnots() : "0.0").append(";"); + result.append(rideHeight).append(";"); + result.append(rideHeightPort).append(";"); + result.append(rideHeightStarboard).append(";"); + result.append(heel).append(";"); + result.append(pitch).append(";"); + result.append(windFixSpeed.getObject().getKnots()).append(";"); + result.append(windFixBearing.reverse().getDegrees()).append(";"); + result.append(speedOfCompetitor != null ? speedOfCompetitor.getBearing().getDegrees() : "0.0").append(";"); + result.append(speedOfCompetitor != null ? speedOfCompetitor.getBearing().getDifferenceTo(windFixBearing.reverse()).getDegrees() : "0.0").append("\n"); + } + timePointToConsider = timePointToConsider.plus(samplingInterval); + attemptedNumberOfFixes++; + } + } + } + } + } + } + res.setContentType("text/csv"); + res.addHeader("Content-Disposition", "attachment; filename=" + leaderboard.getName() + ".csv"); + res.getOutputStream().write(result.toString().getBytes("UTF-8")); + res.getOutputStream().flush(); + } +} diff --git a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/XmlExportServlet.java b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/XmlExportServlet.java index cbc00e3debd..e937cc87a81 100755 --- a/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/XmlExportServlet.java +++ b/java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/XmlExportServlet.java @@ -20,6 +20,10 @@ public class XmlExportServlet extends SailingServerHttpServlet { final LeaderboardData leaderboardData = new LeaderboardData(req, res, getService()); leaderboardData.perform(); return; + } else if ("foiling".equalsIgnoreCase(action)) { + final FoilingData foilingData = new FoilingData(req, res, getService()); + foilingData.perform(); + return; } throw new ServletException("Unknown domain " + action); } diff --git a/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages.properties b/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages.properties index 93761cc079d..d1a9faacb08 100644 --- a/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages.properties +++ b/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages.properties @@ -13,4 +13,9 @@ increment=Increment illegalDimension=Illegal Dimension DistanceTraveled=Distance Traveled # This message is only contains in the Test_StringMessages.properties for default locale to test the fallback behavior -DefaultTestMessage=Default \ No newline at end of file +DefaultTestMessage=Default +MessageWithSingleQuote=A Single '' Quote +MessageWithOpeningCurlyBrace=An opening '{' curly brace +MessageWithEscapedParameters='{0}' '{1} {2}' +MessageWithEscapedSingleQuotesAndParameters=''{0}'' '' ''{1}'' +MessageWithMultipleParameterOccurrencesOutOfOrder={2} {2} {0} {1} {0} \ No newline at end of file diff --git a/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages_de.properties b/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages_de.properties index f9e08823bb1..e58d2aaf0d7 100644 --- a/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages_de.properties +++ b/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages_de.properties @@ -11,4 +11,9 @@ SailID=Segelnummer TestCluster=Test Cluster Deutsch increment=Inkrementieren illegalDimension=Illegale Dimension -DistanceTraveled=Gefahrene Distanz \ No newline at end of file +DistanceTraveled=Gefahrene Distanz +MessageWithSingleQuote=Ein einfaches '' Anführungszeichen +MessageWithOpeningCurlyBrace=Eine öffnende '{' geschweifte Klammer +MessageWithEscapedParameters='{0}' '{1} {2}' +MessageWithEscapedSingleQuotesAndParameters=''{0}'' '' ''{1}'' +MessageWithMultipleParameterOccurrencesOutOfOrder={2} {2} {0} {1} {0} \ No newline at end of file diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java index 6a6ef866454..a18d844fd6f 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java @@ -22,6 +22,11 @@ public class TestI18N { private static final String SIMPLE_TEST_MESSAGE_KEY = "SimpleTestMessage"; private static final String DEFAULT_TEST_MESSAGE_KEY = "DefaultTestMessage"; private static final String TEST_MESSAGE_WITH_PARAMETERS = "TestMessageWithParameters"; + private static final String TEST_MESSAGE_WITH_SINGLE_QUOTE = "MessageWithSingleQuote"; + private static final String TEST_MESSAGE_WITH_OPENING_CURLY_BRACE = "MessageWithOpeningCurlyBrace"; + private static final String TEST_MESSAGE_WITH_ESCAPED_PARAMETERS = "MessageWithEscapedParameters"; + private static final String TEST_MESSAGE_WITH_PARAMETERS_AND_ESCAPED_SINGLE_QUOTES = "MessageWithEscapedSingleQuotesAndParameters"; + private static final String TEST_MESSAGE_WITH_MULTIPLE_OUT_OF_ORDER_PARAMS = "MessageWithMultipleParameterOccurrencesOutOfOrder"; private ResourceBundleStringMessages testStringMessages; @@ -30,6 +35,36 @@ public class TestI18N { testStringMessages = TestsUtil.getTestStringMessages(); } + @Test + public void testMultipleOutOfOrderParams() { + assertThat(testStringMessages.get(DEFAULT_LOCALE, TEST_MESSAGE_WITH_MULTIPLE_OUT_OF_ORDER_PARAMS, "First", "Second", "Third"), is("Third Third First Second First")); + assertThat(testStringMessages.get(Locale.GERMAN, TEST_MESSAGE_WITH_MULTIPLE_OUT_OF_ORDER_PARAMS, "First", "Second", "Third"), is("Third Third First Second First")); + } + + @Test + public void testEscapedSingleQuotesWithParameters() { + assertThat(testStringMessages.get(DEFAULT_LOCALE, TEST_MESSAGE_WITH_PARAMETERS_AND_ESCAPED_SINGLE_QUOTES, "First", "Second"), is("'First' ' 'Second'")); + assertThat(testStringMessages.get(Locale.GERMAN, TEST_MESSAGE_WITH_PARAMETERS_AND_ESCAPED_SINGLE_QUOTES, "First", "Second"), is("'First' ' 'Second'")); + } + + @Test + public void testSingleQuoteInString() { + assertThat(testStringMessages.get(DEFAULT_LOCALE, TEST_MESSAGE_WITH_SINGLE_QUOTE), is("A Single ' Quote")); + assertThat(testStringMessages.get(Locale.GERMAN, TEST_MESSAGE_WITH_SINGLE_QUOTE), is("Ein einfaches ' Anführungszeichen")); + } + + @Test + public void testCurlyBracesInString() { + assertThat(testStringMessages.get(DEFAULT_LOCALE, TEST_MESSAGE_WITH_OPENING_CURLY_BRACE), is("An opening { curly brace")); + assertThat(testStringMessages.get(Locale.GERMAN, TEST_MESSAGE_WITH_OPENING_CURLY_BRACE), is("Eine öffnende { geschweifte Klammer")); + } + + @Test + public void testEscapedParametersInString() { + assertThat(testStringMessages.get(DEFAULT_LOCALE, TEST_MESSAGE_WITH_ESCAPED_PARAMETERS), is("{0} {1} {2}")); + assertThat(testStringMessages.get(Locale.GERMAN, TEST_MESSAGE_WITH_ESCAPED_PARAMETERS), is("{0} {1} {2}")); + } + @Test public void testGettingASimpleMessage() { assertThat(testStringMessages.get(DEFAULT_LOCALE, SIMPLE_TEST_MESSAGE_KEY), is("English")); diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java index aa4dee88b7d..94f70080799 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java @@ -1,5 +1,7 @@ package com.sap.sse.datamining.test.util; +import java.nio.charset.StandardCharsets; + import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionRegistry; import com.sap.sse.datamining.components.management.DataRetrieverChainDefinitionRegistry; @@ -33,7 +35,8 @@ public class TestsUtil { public static ResourceBundleStringMessages getTestStringMessages() { if (TEST_STRING_MESSAGES == null) { - TEST_STRING_MESSAGES = new ResourceBundleStringMessagesImpl(TEST_STRING_MESSAGES_BASE_NAME, TestsUtil.class.getClassLoader()); + TEST_STRING_MESSAGES = new ResourceBundleStringMessagesImpl(TEST_STRING_MESSAGES_BASE_NAME, + TestsUtil.class.getClassLoader(), StandardCharsets.UTF_8.name()); } return TEST_STRING_MESSAGES; @@ -43,7 +46,9 @@ public class TestsUtil { if (EXTENDED_STRING_MESSAGES == null) { EXTENDED_STRING_MESSAGES = new CompoundResourceBundleStringMessages(); EXTENDED_STRING_MESSAGES.addStringMessages(getTestStringMessages()); - EXTENDED_STRING_MESSAGES.addStringMessages(new ResourceBundleStringMessagesImpl(PRODUCTIVE_STRING_MESSAGES_BASE_NAME, TestsUtil.class.getClassLoader())); + EXTENDED_STRING_MESSAGES + .addStringMessages(new ResourceBundleStringMessagesImpl(PRODUCTIVE_STRING_MESSAGES_BASE_NAME, + TestsUtil.class.getClassLoader(), StandardCharsets.UTF_8.name())); } return EXTENDED_STRING_MESSAGES; diff --git a/java/com.sap.sse.datamining/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sse.datamining/.settings/org.eclipse.core.resources.prefs index 7484d54359a..e4965b3a4b1 100644 --- a/java/com.sap.sse.datamining/.settings/org.eclipse.core.resources.prefs +++ b/java/com.sap.sse.datamining/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,7 @@ eclipse.preferences.version=1 +encoding//resources/stringmessages/StringMessages_es.properties=UTF-8 encoding//resources/stringmessages/StringMessages_fr.properties=UTF-8 encoding//resources/stringmessages/StringMessages_ja.properties=UTF-8 +encoding//resources/stringmessages/StringMessages_pt.properties=UTF-8 encoding//resources/stringmessages/StringMessages_ru.properties=UTF-8 encoding//resources/stringmessages/StringMessages_zh.properties=UTF-8 diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java index af07400a2c2..9b636c4c8d0 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java @@ -1,5 +1,6 @@ package com.sap.sse.datamining.impl; +import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.HashSet; import java.util.Map.Entry; @@ -72,7 +73,8 @@ public class DataMiningFrameworkActivator implements BundleActivator { dataRetrieverChainDefinitionRegistry, aggregationProcessorDefinitionRegistry, queryDefinitionRegistry); - dataMiningServer.addStringMessages(new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, this.getClass().getClassLoader())); + dataMiningServer.addStringMessages(new ResourceBundleStringMessagesImpl(STRING_MESSAGES_BASE_NAME, + this.getClass().getClassLoader(), StandardCharsets.UTF_8.name())); for (AggregationProcessorDefinition aggregationProcessorDefinition : getDefaultAggregationProcessors()) { dataMiningServer.registerAggregationProcessor(aggregationProcessorDefinition); } diff --git a/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages_de.properties b/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages_de.properties index a323dfb22bc..fd7ec714e47 100644 --- a/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages_de.properties +++ b/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages_de.properties @@ -1,7 +1,7 @@ -s3Desc=Dateien in Amazon S3 speichern. Dateiname wird als aus zuflliger UUID und original Dateiendung generiert. +s3Desc=Dateien in Amazon S3 speichern. Dateiname wird als aus zufälliger UUID und original Dateiendung generiert. s3AccessIdDesc=Zugriffs-ID (leer lassen, um ~/.aws/credentials zu benutzen) -s3AccessKeyDesc=Geheimer Zugrifss-Schlssel (leer lassen, um ~/.aws/credentials zu benutzen) -s3BucketNameDesc=Name des "Buckets" der benutzt werden soll (muss in S3 existieren, und die Zugriffsrechte mssen korrekt gesetzt sein). -localDesc=Dateien werden im lokalen Dateisystem gespeichert. Sie werden in localPath+fileName gespeichert, der Zugriff erfolgt ber baseUrl+fileName. Bitte beachten: baseUrl muss auch fr andere Server-Instanzen erreichbar sein. Das kann z.B. durch ein Mounten eines auf static.sapsailing.com gehosteten Netwerk-Dateisystems unter localPath erreicht werden. +s3AccessKeyDesc=Geheimer Zugrifss-Schlüssel (leer lassen, um ~/.aws/credentials zu benutzen) +s3BucketNameDesc=Name des "Buckets" der benutzt werden soll (muss in S3 existieren, und die Zugriffsrechte müssen korrekt gesetzt sein). +localDesc=Dateien werden im lokalen Dateisystem gespeichert. Sie werden in localPath+fileName gespeichert, der Zugriff erfolgt über baseUrl+fileName. Bitte beachten: baseUrl muss auch für andere Server-Instanzen erreichbar sein. Das kann z.B. durch ein Mounten eines auf static.sapsailing.com gehosteten Netwerk-Dateisystems unter localPath erreicht werden. localBaseUrlDesc=Base URL + fileName = URL unter der die hochgeladene Datei erreichbar ist localLocalPathDesc=Lokaler Pfad zum Ablegen der Dateien \ No newline at end of file diff --git a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/FileStorageI18n.java b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/FileStorageI18n.java index addf93e3e61..a8700e48d6a 100644 --- a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/FileStorageI18n.java +++ b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/FileStorageI18n.java @@ -1,10 +1,13 @@ package com.sap.sse.filestorage.impl; +import java.nio.charset.StandardCharsets; + import com.sap.sse.i18n.ResourceBundleStringMessages; import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; public class FileStorageI18n { private static final String RESOURCE_BASE_NAME = "stringmessages/FileStorageStringMessages"; - public static final ResourceBundleStringMessages STRING_MESSAGES = new ResourceBundleStringMessagesImpl(RESOURCE_BASE_NAME, FileStorageI18n.class.getClassLoader()); + public static final ResourceBundleStringMessages STRING_MESSAGES = new ResourceBundleStringMessagesImpl( + RESOURCE_BASE_NAME, FileStorageI18n.class.getClassLoader(), StandardCharsets.UTF_8.name()); } diff --git a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/MongoFileStorageServicePropertyStoreImpl.java b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/MongoFileStorageServicePropertyStoreImpl.java index 9e0988cb7d9..a605439dc28 100644 --- a/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/MongoFileStorageServicePropertyStoreImpl.java +++ b/java/com.sap.sse.filestorage/src/com/sap/sse/filestorage/impl/MongoFileStorageServicePropertyStoreImpl.java @@ -2,6 +2,7 @@ package com.sap.sse.filestorage.impl; import java.util.HashMap; import java.util.Map; +import java.util.logging.Logger; import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObjectBuilder; @@ -12,6 +13,7 @@ import com.sap.sse.filestorage.FileStorageServicePropertyStore; import com.sap.sse.mongodb.MongoDBService; public class MongoFileStorageServicePropertyStoreImpl implements FileStorageServicePropertyStore { + private static final Logger logger = Logger.getLogger(MongoFileStorageServicePropertyStoreImpl.class.getName()); public static final String PROPERTIES_COLLECTION_NAME = "FileStorageServiceProperties"; public static final String ACTIVE_SERVICE_COLLECTION_NAME = "ActiveFileStorageService"; private final DBCollection propertiesCollection; @@ -23,10 +25,16 @@ public class MongoFileStorageServicePropertyStoreImpl implements FileStorageServ public MongoFileStorageServicePropertyStoreImpl(MongoDBService dbService) { propertiesCollection = dbService.getDB().getCollection(PROPERTIES_COLLECTION_NAME); - DBObject index = new BasicDBObjectBuilder().add(FieldNames.SERVICE_NAME.name(), true) - .add(FieldNames.PROPERTY_NAME.name(), true).get(); - propertiesCollection.createIndex(index, "unique service name/property name combination", true); - + DBObject index = new BasicDBObjectBuilder().add(FieldNames.SERVICE_NAME.name(), 1) + .add(FieldNames.PROPERTY_NAME.name(), 1).get(); + try { + propertiesCollection.createIndex(index, "unique service name/property name combination", true); + } catch (Exception e) { + logger.info("Problem creating index, probably due to index format change; dropping indexes and creating again..."); + // could be that the index was created with different properties; need to remove and create again: + propertiesCollection.dropIndexes(); + propertiesCollection.createIndex(index, "unique service name/property name combination", true); + } activeServiceCollection = dbService.getDB().getCollection(ACTIVE_SERVICE_COLLECTION_NAME); } diff --git a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java index cea1755f607..f95629286a3 100644 --- a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java +++ b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java @@ -19,6 +19,7 @@ import java.net.URL; import java.net.URLConnection; import java.util.ArrayList; import java.util.List; +import java.util.Random; import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; @@ -131,7 +132,7 @@ public abstract class AbstractServerReplicationTestSetUp - + @@ -47,7 +47,7 @@ - + diff --git a/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/SecurityLocalesAllPermutations.gwt.xml b/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/SecurityLocalesAllPermutations.gwt.xml index 12ba011bc60..40025c2d48d 100644 --- a/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/SecurityLocalesAllPermutations.gwt.xml +++ b/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/SecurityLocalesAllPermutations.gwt.xml @@ -4,4 +4,5 @@ + diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java index eadfc41af1d..f9f5db22343 100644 --- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java @@ -33,7 +33,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { @Override public void storeUser(User user) { DBCollection usersCollection = db.getCollection(CollectionNames.USERS.name()); - usersCollection.createIndex(new BasicDBObject(FieldNames.User.NAME.name(), null)); + usersCollection.createIndex(new BasicDBObject(FieldNames.User.NAME.name(), 1)); DBObject dbUser = new BasicDBObject(); DBObject query = new BasicDBObject(FieldNames.User.NAME.name(), user.getName()); dbUser.put(FieldNames.User.NAME.name(), user.getName()); @@ -86,7 +86,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { @Override public void storeSettings(Map * ResourceBundleStringMessages.Util.getLocaleFor(localeInfoName); *
@@ -24,23 +31,46 @@ public interface ResourceBundleStringMessages { public String getResourceBaseName(); public String get(Locale locale, String messageKey); + public String get(Locale locale, String messageKey, String... parameters); - + public static final class Util { private static final Locale FALLBACK_LOCALE = Locale.ROOT; - public static final Control CONTROL = new Control() { - @Override - public Locale getFallbackLocale(String baseName, Locale locale) { - if (baseName == null) throw new NullPointerException(); - return locale.equals(FALLBACK_LOCALE) ? null : FALLBACK_LOCALE; - } - }; - + + public static Control createControl(String encoding) { + return new Control() { + @Override + public Locale getFallbackLocale(String baseName, Locale locale) { + return locale.equals(FALLBACK_LOCALE) ? null : FALLBACK_LOCALE; + } + + @Override + public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, + boolean reload) throws IllegalAccessException, InstantiationException, IOException { + String localeExt = ""; + if (!locale.getLanguage().isEmpty()) { + localeExt = "_" + locale.getLanguage(); + } + if (format.contains("class")) { + return null; + } + String classPathFilePath = baseName + localeExt + ".properties"; + try (InputStream is = loader.getResourceAsStream(classPathFilePath);) { + if (is == null) { + return null; + } + return new PropertyResourceBundle(new InputStreamReader(is, encoding)); + } + } + }; + + } + public static Locale getLocaleFor(String localeInfoName) { return Locale.forLanguageTag(localeInfoName); } - - private Util () { + + private Util() { } } } diff --git a/java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java b/java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java index 755ae9ed026..6c6d61a5788 100644 --- a/java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java +++ b/java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java @@ -1,21 +1,30 @@ package com.sap.sse.i18n.impl; +import java.nio.charset.StandardCharsets; import java.util.Locale; import java.util.ResourceBundle; +import java.util.ResourceBundle.Control; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import com.sap.sse.i18n.ResourceBundleStringMessages; public class ResourceBundleStringMessagesImpl implements ResourceBundleStringMessages { - private static final String MESSAGE_PARAMETER_START = "{"; - private static final String MESSAGE_PARAMETER_END = "}"; - private final String resourceBaseName; private final ClassLoader resourceClassLoader; + private String encoding; + public ResourceBundleStringMessagesImpl(String resourceBaseName, ClassLoader resourceClassLoader, String encoding) { + this.resourceBaseName = resourceBaseName; + this.resourceClassLoader = resourceClassLoader; + this.encoding = encoding; + } + public ResourceBundleStringMessagesImpl(String resourceBaseName, ClassLoader resourceClassLoader) { this.resourceBaseName = resourceBaseName; this.resourceClassLoader = resourceClassLoader; + this.encoding = StandardCharsets.ISO_8859_1.name(); } @Override @@ -25,19 +34,63 @@ public class ResourceBundleStringMessagesImpl implements ResourceBundleStringMes @Override public String get(Locale locale, String messageKey, String... parameters) { - String result = getResourceBundle(locale).getString(messageKey); - for (int i = 0; i < parameters.length; i++) { - String target = MESSAGE_PARAMETER_START + i + MESSAGE_PARAMETER_END; - result = result.replace(target, parameters[i]); + final String message = getResourceBundle(locale).getString(messageKey); + final StringBuilder result = new StringBuilder(); + boolean withinQuotedArea = false; + for (int i=0; iAll Classes - + @@ -14,6 +14,7 @@- AbstractAttachable
- CreateModelException +
- DataSource
- EventType
- IAttachable
- IAttachmentKey @@ -37,6 +38,7 @@
- IEventFactory
- IEventMessageListener
- IEventSubscriber +
- IExtent
- IGeoCoordinate
- IIdentifiable
- ILiveDataEvent diff --git a/java/com.tractrac.clientmodule/javadoc/allclasses-noframe.html b/java/com.tractrac.clientmodule/javadoc/allclasses-noframe.html index 5141cbb0cce..2ce68ebe1c8 100755 --- a/java/com.tractrac.clientmodule/javadoc/allclasses-noframe.html +++ b/java/com.tractrac.clientmodule/javadoc/allclasses-noframe.html @@ -2,9 +2,9 @@ - +
- AbstractAttachable
- CreateModelException +
- DataSource
- EventType
- IAttachable
- IAttachmentKey @@ -37,6 +38,7 @@
- IEventFactory
- IEventMessageListener
- IEventSubscriber +
- IExtent
- IGeoCoordinate
- IIdentifiable
- ILiveDataEvent diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/IIdentifiable.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/IIdentifiable.html index 9492d492d83..0b765adeb63 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/IIdentifiable.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/IIdentifiable.html @@ -2,9 +2,9 @@ - +
All Classes - + @@ -14,6 +14,7 @@IIdentifiable - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/INamed.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/INamed.html index 6468c81199e..417fdce74fd 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/INamed.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/INamed.html @@ -2,9 +2,9 @@ - +INamed - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/ModelLocator.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/ModelLocator.html index ae65c92b7f7..e1e79ae60c4 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/ModelLocator.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/ModelLocator.html @@ -2,9 +2,9 @@ - +ModelLocator - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/AbstractAttachable.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/AbstractAttachable.html index 38aad0e3192..72d510de9a9 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/AbstractAttachable.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/AbstractAttachable.html @@ -2,9 +2,9 @@ - +AbstractAttachable - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachable.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachable.html index 1ec28d7b4b4..5a83ea6eb5c 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachable.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachable.html @@ -2,9 +2,9 @@ - +IAttachable - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentKey.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentKey.html index 8ad21a3ab94..ca59ba35b02 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentKey.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentKey.html @@ -2,9 +2,9 @@ - +IAttachmentKey - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentManager.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentManager.html index 316b10ffab0..092ad80102d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentManager.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentManager.html @@ -2,9 +2,9 @@ - +IAttachmentManager - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-frame.html index 1e18edcce7e..fe6f81f8b18 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-frame.html @@ -2,9 +2,9 @@ - +com.tractrac.model.lib.api.attachment - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-summary.html index f0daf6f5027..4328cd04606 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-summary.html @@ -2,9 +2,9 @@ - +com.tractrac.model.lib.api.attachment - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-tree.html index f34990ed89e..dd90a447ce4 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-tree.html @@ -2,9 +2,9 @@ - +com.tractrac.model.lib.api.attachment Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassing.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassing.html index 8545c8b9b44..1947744110d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassing.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassing.html @@ -2,9 +2,9 @@ - +IControlPassing - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassings.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassings.html index 18ffb2870fa..4a5c8bde5ff 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassings.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassings.html @@ -2,9 +2,9 @@ - +IControlPassings - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IMessageData.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IMessageData.html index f018c64e374..6c46fb7c22a 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IMessageData.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IMessageData.html @@ -2,9 +2,9 @@ - +IMessageData - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPosition.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPosition.html index 7900eecc0c1..0f4db8a93be 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPosition.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPosition.html @@ -2,9 +2,9 @@ - +IPosition - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionFactory.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionFactory.html index 71e893e4ed1..3b0d167eced 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionFactory.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionFactory.html @@ -2,9 +2,9 @@ - +IPositionFactory - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionOffset.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionOffset.html index 672add36389..b117f50b281 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionOffset.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionOffset.html @@ -2,9 +2,9 @@ - +IPositionOffset - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionSnapped.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionSnapped.html index b84155cfeb4..d2e48ffa570 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionSnapped.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionSnapped.html @@ -2,9 +2,9 @@ - +IPositionSnapped - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IStartStopData.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IStartStopData.html index f4fbf377e26..f120f3de3dc 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IStartStopData.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IStartStopData.html @@ -2,9 +2,9 @@ - +IStartStopData - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/ITimeData.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/ITimeData.html index 11e80755e12..5a5c58af6cf 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/ITimeData.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/ITimeData.html @@ -2,9 +2,9 @@ - +ITimeData - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-frame.html index eb6a26e0012..a47158fb949 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-frame.html @@ -2,9 +2,9 @@ - +com.tractrac.model.lib.api.data - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-summary.html index e1840cb3bcc..b1dba5e600d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-summary.html @@ -2,9 +2,9 @@ - +com.tractrac.model.lib.api.data - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-tree.html index e4bd9d9035f..b3d721180d6 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-tree.html @@ -2,9 +2,9 @@ - +com.tractrac.model.lib.api.data Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/CreateModelException.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/CreateModelException.html index 018b2a199b9..ddd02166c06 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/CreateModelException.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/CreateModelException.html @@ -2,9 +2,9 @@ - +CreateModelException - + @@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";