Simon Pamies
7360e41155
Revamped TracTracRaceTrackerImpl to make status of a race available to the tracker - this is useful to control caching
2014-02-06 18:55:21 +00:00
Nick Klose
25fd24b656
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
2014-02-06 11:44:52 +01:00
Axel Uhl
796f407a11
increasing number for TTCM progress back-drops allowed before ERROR is signaled from 3 to 6 after conversation with Jorge
2014-02-05 15:23:18 +01:00
Nick Klose
6a89ca1d07
Fixed Activator and getCrossingBearing().
2014-01-30 14:27:52 +01:00
Axel Uhl
31074ccf2d
fixed bug regarding reading of passing instructions from course's metadata
2014-01-20 15:12:13 +01:00
Nick Klose
a172d69861
Edits after review for merge with master.
2014-01-17 11:36:28 +01:00
Nick Klose
a0517dfa76
Merge branch 'master' into mark-rounding-inference
2014-01-06 22:56:10 +01:00
Simon Pamies
6700f9d0e5
Removed caching of clientparams php files as this can be very dangerous
...
for live races
2013-12-22 14:21:06 +01:00
Simon Pamies
e347de179c
Merge branch 'master' into xcelsius-revamp
2013-12-22 12:46:37 +01:00
Nick Klose
9cca978933
The advanceInMillis in the Simulator can now also be set by a given start time when no markpassdata is available, by calling advanceStartTime(TimePoint raceStartTime).
2013-12-20 15:44:27 +01:00
Nick Klose
9618b28ef8
The advanceInMillis in the Simulator can now also be set by a given start time when no markpassdata is available, by calling advanceStartTime(TimePoint raceStartTime).
2013-12-20 15:31:37 +01:00
Simon Pamies
a23c88901a
Merge branch 'master' into xcelsius-revamp
2013-12-20 02:03:23 +01:00
Simon Pamies
d72505ad6f
Introduced caching of php params file - this comes in handy when on a
...
train. This still does not lead to all data being available offline but
it helps.
2013-12-19 19:22:09 +01:00
Nick Klose
4d0d5f2210
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
2013-12-19 16:50:51 +01:00
Nick Klose
7d1d74feca
Little fixes.
2013-12-19 16:48:24 +01:00
Axel Uhl
521f41d4ba
relaxed simulator requirements regarding mark passings and use start time if available
2013-12-19 16:45:58 +01:00
Nick Klose
f5caf304d9
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
2013-12-19 09:40:03 +01:00
Axel Uhl
75d5d98bbd
when stopping a TracTracRaceTracker, don't force-stop the receivers but process their queues;
...
this will help avoid incomplete loads as the TRACKING state is displayed already once
all events are *queued* (but not necessarily processed)
2013-12-19 02:10:31 +01:00
Nick Klose
c6f8cab483
Added check in bundle properties for tractrac.usemarkpassings
2013-12-18 15:08:01 +01:00
Nick Klose
45bbc603f7
Added valueOfWithoutCase() method to PassingInstruction to allow the parsing of Metadata from TracTrac.
2013-12-12 11:58:08 +01:00
Nick Klose
3018bd8bfe
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
2013-12-09 18:35:16 +01:00
Nick Klose
96075f5cc1
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.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/CourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/DraggableCourseElementListAdapter.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ESSCourseDesignDialog.java
2013-12-09 13:22:09 +01:00
fmittag
62b3a9c6ae
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
...
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorStore.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2013-12-06 19:19:09 +01:00
fmittag
d037441787
added load/store/editing of the new attribute displayColor for a competitor
2013-12-06 18:40:15 +01:00
Nick Klose
547e304f73
Merge branch 'master' into mark-rounding-inference
2013-12-06 15:26:56 +01:00
Axel Uhl
1efebeef57
Merge branch 'master' into racecommittee_app
2013-12-06 14:49:01 +01:00
Axel Uhl
1d07f553bf
turned GwtTestCaseColumnToggling green
2013-12-06 13:17:09 +01:00
Nick Klose
7dcd85bf05
Fixed another Nautical-Side Test.
2013-12-05 16:38:37 +01:00
Lukas Niemeier
453ac2b142
Merge branch 'master' into racecommittee_app
...
Conflicts:
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.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.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-11-29 16:42:07 +01:00
Nick Klose
64ad880d2e
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
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
2013-11-28 10:15:29 +01:00
Frederik Petersen
7ea7461aed
Merge branch 'master' into masterdataimport-wind
2013-11-25 12:13:00 +01:00
Nick Klose
2a37662ca5
Merge branch 'master' into mark-rounding-inference
2013-11-22 19:51:57 +01:00
Axel Uhl
0ca8e1abbc
Merge remote-tracking branch 'server/master'
2013-11-22 16:37:22 +01:00
Simon Pamies
0dcc114740
Optimized handling of hop detection by avoiding filling the log with stored data messages
2013-11-22 16:18:12 +01:00
Axel Uhl
dd7873bf5c
don't use Thread.stop() for TracTrac DataController as it may leave TTCM in an inconsistent internal state
2013-11-22 16:05:33 +01:00
Axel Uhl
c3b2a13484
fix NPE that can occur if the recurring "progress hops" lead to the termination of a tracked before the clientParamsPHP poller variable is initialized;
...
the stop method access the poller and tries to cancel it; note that this is an interesting case of a final variable
"changing" its value after having "escaped" from the constructor to another thread
2013-11-22 15:11:49 +01:00
Frederik Petersen
81760e6dec
Replaced trackedRegatta with regatta name in getWindTrack calls
...
also added wind import
2013-11-20 12:05:10 +01:00
Lukas Niemeier
ad41f2e80c
Merge branch 'master' into racecommittee_app
...
Conflicts:
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.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.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-11-20 11:37:40 +01:00
Frederik Petersen
a988003d15
Moved central windstore into racingeventservice
...
also removed addRace and addEvent services from legacy adminapp
2013-11-20 09:02:55 +01:00
Nick Klose
b0fc14872e
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2013-11-18 10:30:34 +01:00
Axel Uhl
d4bbeb5db7
stop TracTrac controller in a separate thread to avoid getting affected by a deadlock in TracTrac's TTCM
2013-11-15 19:17:02 +01:00
Nick Klose
1fc03bbc9f
Merge branch 'master' into mark-rounding-inference
2013-11-15 14:32:36 +01:00
Axel Uhl
6618e9e7f9
minor performance tweak for storedDataProgress; removed redundant throwing of InterruptedException
2013-11-14 23:29:15 +01:00
Simon Pamies
5a3b0830f3
Make sure that update uri always ends with a slash
2013-11-14 19:09:45 -02:00
Simon Pamies
ca527bc0e6
Trying to recover gracefully from endless recursion that sometimes can happen with TracTrac DataController
2013-11-14 19:03:53 -02:00
Axel Uhl
2a0aa86c17
made logging of TracTrac TTCM progress events more verbose, adding the URLs/URIs to the log output, for cases where races are not yet known
2013-11-14 13:44:02 +01:00
Simon Pamies
f4a5aab6cc
Reverted a5b5c2e40f - didn't read the
...
introduction properly - bug 1345 still holds as we're not talking about
FINISHED state but a TRACKING state that does not properly indicates
that there could be still data missing.
2013-11-13 16:30:29 -02:00
Simon Pamies
6d1254aedc
No longer stopping all trackers because we can not reliably check if
...
we're in an infiinite loop of stored data - just logging for debugging
purpose
2013-11-13 16:24:09 -02:00
Simon Pamies
2d73f8186f
Making sure that we only check for repeating pattern if the progress is
...
bigger than 0.0 as lastStatus also contains the status of the last
finished race
2013-11-13 16:15:33 -02:00
Simon Pamies
513bf91673
Also throwing an exception to make sure flow is interrupted and problem can be handled
2013-11-13 16:06:13 -02:00