Commit Graph
482 Commits
Author SHA1 Message Date
Axel Uhl 22e6948dc9 made compilable by adding missing implementations of setUseStartTimeInference in some mock Regatta implementations 2014-07-07 15:14:01 +02:00
Axel Uhl 6b06806531 Merge branch 'master' into bug1994 2014-07-07 15:11:15 +02:00
Axel Uhl ecdf35ade0 factored out the common boat class / existing regatta / default regatta checking logic from the three tracking management panels 2014-07-07 14:56:07 +02:00
Axel Uhl 4f15a562b3 introduced a manageable flag "useStartTimeInference" on Regatta that is evaluated by TrackedRaceImpl.getStartOfRace(), solving bug 1994 2014-07-07 11:27:25 +02:00
Axel Uhl 7497efda57 Merge branch 'master' into improved-replication
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
2014-06-29 16:31:03 +02:00
Axel Uhl 212ca8f153 Merge branch 'bug2026' into spatial-wind
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2014-06-28 14:46:52 +02:00
Axel Uhl 0e5f4c953c passing the cache through to a few more places where leg type and leg bearing are needed 2014-06-28 14:03:17 +02:00
Nicolas 09e29248c0 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-06-28 08:21:04 +02:00
Axel Uhl e8c2effb7d added checkbox to LeaderboardEditingPanel that allows user to explicitly select uncorrectedNetPoints if needed 2014-06-27 23:53:34 +02:00
Axel Uhl 332cdca4b5 reverting the performance implications of always fetching the uncorrected net points with each getLeadearboardByName call 2014-06-27 23:23:08 +02:00
Axel Uhl df49ce2d04 added missing rabbit dependency to gwt.ui.test 2014-06-26 17:04:15 +02:00
Nicolas 00c3a648b2 Finished racelog listening on MarkPassingUpdateListener. 2014-06-26 12:29:31 +02:00
Nicolas c78ac4362f Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-06-26 10:47:48 +02:00
Axel Uhl 1f9d3f7306 re-use getEstimatedSpeed calculation in SailingServiceImpl.getBoatPositions 2014-06-26 01:33:03 +02:00
Lennart Hensler a0186dbfdc Created an optimized version of getTack, if the wind is known 2014-06-25 18:20:26 +02:00
Axel Uhl 9bd8241f25 let wind estimator also use a position-based confidencer for now, even though the estimated fix's position is still null (to be changed soon) 2014-06-22 20:48:38 +02:00
Axel Uhl ee299fdf3e introduced WindPositionMode enum and use throughout 2014-06-19 16:39:15 +02:00
Nicolas 1f91d41ea7 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/KW470MarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMR2012VRMarkPassingTest.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
2014-06-17 13:51:39 +02:00
Fredrik Teschke 6d45b3249e clarify locking and order of fix loading when multiple race logs are attached to a race 2014-06-13 21:25:14 +02:00
Frederik Petersen cfe4636b1c Merge branch 'dataMining' into polar-api
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRegatta.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.polars/src/com/sap/sailing/polars/aggregation/PolarFixAggregationWorker.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RestApiApplication.java
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sse.datamining/META-INF/MANIFEST.MF
2014-06-13 14:55:02 +02:00
Nicolas 53b6c6d5b7 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/CandidateFinderTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Course.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/AbstractCandidateChooser.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/AbstractCandidateFinder.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateChooser.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
2014-06-05 18:13:54 +02:00
Axel Uhl 7fb0dfcf99 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardForKielWeekTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/SerializationWithOnlineRaceTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
	java/com.sap.sailing.domain.tractracadapter.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHP49erFX2013Test.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPArenalTest.java
	java/com.sap.sailing.domain.tractracadapter.test/src/com/sap/sailing/domain/tractracadapter/test/ClientParamsPHPLahaina3Test.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/ClientParamsPHP.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceStartedAndFinishedReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-06-03 01:47:08 +02:00
Axel Uhl 6b4f2eecab moved AbstractListFilter and related UI components to com.sap.sse.common and com.sap.sse.gwt, respectively 2014-06-03 00:13:41 +02:00
Axel Uhl 53a0b36e8e consolidated all Util stuff in com.sap.sse.common.Util now 2014-06-03 00:01:14 +02:00
Axel Uhl cb9354b1a0 moved Util from com.sap.sailing.common to com.sap.sse.common 2014-06-02 23:57:16 +02:00
Axel Uhl 0c47e86304 moved Pair and Triple from com.sap.sailing.common.Util to com.sap.sse.common.Util and introduced all missing dependencies on com.sap.sse.common 2014-06-02 23:31:26 +02:00
Nicolas df1614a12d Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
2014-05-27 16:24:37 +02:00
Axel Uhl 86c8d73274 Merge branch 'master' into tracapi 2014-05-21 14:03:06 +02:00
Axel Uhl 2a38f8eb86 fix for bug 1958: whether or not a LeaderboardDTO has overall details is now rememberd; leaderboard is fetched again with progress indication if required 2014-05-21 13:58:13 +02:00
Axel Uhl 5c2fc3b888 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-05-13 20:21:33 +02:00
Nicolas 69f3c5c460 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/Track.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
2014-05-13 15:53:28 +02:00
Fredrik Teschke 9c3524bddc fixed error introduced by using two locks for wind and gps fix store in tracked race 2014-05-08 18:16:30 +02:00
Nicolas fd2de1d475 Fixed problems after merge and started adding and removal of waypoints. 2014-05-06 15:07:10 +02:00
Nicolas 9a5e4d5853 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/Candidate.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateChooser.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
2014-05-05 17:37:22 +02:00
Fredrik Teschke bf8ebdc09a fixed locking bug that was introduced by e022fe57e0 2014-05-02 12:08:59 +02:00
Fredrik Teschke fb0f187d55 Merge branch 'gpsfixstore-independent-of-race' into ftes-gpximport
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/SailingDomain.gwt.xml
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-05-01 23:05:08 +02:00
Axel Uhl 356968b852 Merge branch 'master' into tracapi
Conflicts:
	java/target/refreshInstance.sh
2014-05-01 19:06:25 +02:00
Axel Uhl 48e9aba687 introduced signed cross track error; renamed previous cross track error calculations to "absolute" accordingly 2014-04-29 18:27:55 +02:00
Axel Uhl 626bf0b672 as part of bug 1903, renamed RacesHandle to RaceHandle 2014-04-29 15:51:08 +02:00
Fredrik Teschke 2f3e1f9d66 Merge remote-tracking branch 'origin/gpsfixstore-independent-of-race' into gpsfixstore-independent-of-race 2014-04-29 13:40:41 +02:00
Fredrik Teschke e022fe57e0 used separate flags and logs for loading from windStore and gpSFixStore in tracked race 2014-04-28 23:54:18 +02:00
Axel Uhl b576a7a141 Merge branch 'master' into gpsfixstore-independent-of-race
Conflicts were mainly around the introduction of GPSFixStore combined with the introduction of raceName in the SwissTiming connector and
the StartList coming from Manage2Sail

Conflicts:
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/AbstractFilterablePanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-04-28 15:14:04 +02:00
Axel Uhl 3cf0df7f3e removed export of igtimiadapter.impo to gwt.ui.test as it doesn't seem to be required 2014-04-27 13:45:43 +02:00
Axel Uhl dbe5f24b0a Merge branch 'master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2014-04-26 13:14:29 +02:00
Axel Uhl 2442f5b015 Merge branch 'master' into swisstiming-2.0 2014-04-25 14:37:15 +02:00
Axel Uhl 9ddd7a8621 formatting changes; is the code formatter installed? 2014-04-25 13:10:44 +02:00
fmittag 1abb9cf876 fixed SwissTiming tracking into an existing regatta + race name cleanup 2014-04-25 12:06:05 +02:00
Axel Uhl e19209a61c in addition to the race column names for which to load details, added a parameter addOverallDetails
that controls whether a leaderboardDTO shall have overall details; the leaderboard cache and the
LiveLeaderboardUpdater consider this parameter in how they cache their DTOs.
2014-04-24 19:13:05 +02:00
fmittag e9f9aa34fa first version of reading the startlist from Manage2Sail insteaf of the STL message 2014-04-23 21:38:10 +02:00
Lennart Hensler f6b8f8c427 Implemented and tested the new wind chart recalculation algorithm 2014-04-20 18:34:48 +02:00