Axel Uhl
c2db032c7b
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-23 23:42:07 +02:00
Axel Uhl
c7d6f62a75
fixing bug 2767 by also registering the old GPSFix(Moving)Impl type names with their old package locations for the Mongo persistence handler;
...
the commit in which the types were moved was 58bd451481
2015-04-23 15:41:08 +02:00
Christopher Ronnewinkel (D036654)
47f5a4ae51
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SimulatorServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/ReplayPathCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow.java
2015-04-23 14:33:48 +02:00
Frederik Petersen
9cff25eab8
Merge branch 'master' into bug2700
...
Conflicts:
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.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/polars/PolarDataService.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2015-04-23 13:36:00 +02:00
Frederik Petersen
6089c83613
Introduces polardataservice to tracked race
...
transient
can be null, needs to be handled accordingly
is null, if polar osgi bundle is stopped
2015-04-23 11:38:41 +02:00
Frederik Petersen
f8f2ada89c
PolarDataService now uses OSGi service registry
...
preparation for being able to use polar data service in domain classes
2015-04-23 10:58:54 +02:00
Axel Uhl
18997d1159
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-22 14:55:23 +02:00
Axel Uhl
b62f6d9ac1
Merge branch 'master' into bug1018
2015-04-21 22:40:05 +02:00
Christopher Ronnewinkel (D036654)
4c395695db
support reaching steps in opportunist-360;
2015-04-21 22:35:56 +02:00
Axel Uhl
d334099dd0
made compileable again and removed warnings by consolidating imports
2015-04-21 10:44:44 +02:00
Axel Uhl
21ac8177c2
some more pass-through of WindLegTypeLegBearingCache for performance improvements; re-designed RankingMetric interface;
...
the new version of the interface returns a comparator for overall competitor ranking and a calculation for the time to improve
between a trailing and a leading competitor, determined in the trailing competitor's "time system." See bug 1018, comments
starting from #19 .
2015-04-20 18:17:53 +02:00
Axel Uhl
c1bf0240cf
introduced caching method with default implementation in RankingMetric
2015-04-17 18:08:39 +02:00
Axel Uhl
fb2e545bec
added a trivial OneDesignRankingMetric; removed more NoWindException declarations that were no longer required
2015-04-17 17:54:21 +02:00
Axel Uhl
73b3bcef85
introduced new "*Corrected*" methods on TrackedRace and TrackedLegOfCompetitor; use Duration instead of Double / seconds for gap calculation results
2015-04-17 17:18:55 +02:00
Christopher Ronnewinkel (D036654)
b11c4e151a
fix continuing-step for reaching; add sparse-polar-data-exception to path-generator;
2015-04-17 16:12:11 +02:00
fmittag
59248fcf49
added flagImageUrl as new attribute on competitor to enable custom flags (e.g. club flags) instead of the nation flags
2015-04-16 17:38:08 +02:00
Bennet Brunsen
e28dec03fc
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-16 11:02:40 +02:00
Axel Uhl
68f70a8375
Merge branch 'master' into bug489
...
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
2015-04-07 13:20:54 +02:00
Axel Uhl
094234b654
moved all Position-related classes including Compact... representations to common bundle; provided CustomFieldSerializer for all Position subclasses that require it
2015-04-03 16:12:21 +02:00
Axel Uhl
58bd451481
moved other Position implementations to common packages to share them with GWT and make then GWT-serializable
2015-04-02 16:42:10 +02:00
Christopher Ronnewinkel (D036654)
47bbee5a63
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
2015-04-02 16:41:10 +02:00
fmittag
2f08fb7a4e
added a new method getLastLegStarted(timepoint) on trackedRace to improve leg progress calculation
2015-04-02 16:32:50 +02:00
sailing
ada387d273
Merge remote-tracking branch 'origin/master' into raceboard-simulation
2015-04-01 10:33:12 +02:00
Alexander Ries
50a32e3558
fixed conflicts in Dummy and Moqued TrackedRaces
2015-04-01 10:31:21 +02:00
Alexander Ries
a46f2a6b80
Merge remote-tracking branch 'origin/ribdashboard' into ribdashboard
2015-04-01 10:25:52 +02:00
Alexander Ries
8d3cb289d5
added getGateStartGolfDownTime() method to TrackedRace
2015-04-01 10:23:41 +02:00
Axel Uhl
d89f461191
don't create mark passing calculator on replica; mark passings are replicated using UpdateMarkPassings operation
2015-03-31 19:56:35 +02:00
Axel Uhl
81fc752c06
Merge branch 'master' into mark-rounding-inference
2015-03-30 22:32:03 +02:00
Axel Uhl
75b04d8048
Merge branch 'master' into ubilabs--tracking_app--develop
2015-03-30 22:09:02 +02:00
Axel Uhl
34169f8e77
Merge branch 'master' into raceboard-simulation
2015-03-30 22:05:27 +02:00
Axel Uhl
e75b2e1985
it's important to always return the same classloader; otherwise, the classes and hence the objects won't be compatible / equal
2015-03-30 20:56:11 +02:00
fmittag
a1361ca495
fixed compile error in SimulationService
2015-03-30 18:25:09 +02:00
fmittag
fdbde8b8fc
Merge remote-tracking branch 'origin/master' into raceboard-simulation
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2015-03-30 18:13:30 +02:00
Axel Uhl
9001649b99
fixed waiting on Replicator's queue to become empty; this avoids the AlreadyClosedExceptions, it seems, but the testWindSourcesToExcludeReplication test still fails locally
2015-03-30 11:50:48 +02:00
Axel Uhl
aa0ed9e815
partly reverting commit 21d5d33f78 to see what is causing the issue in Hudson
2015-03-30 10:10:07 +02:00
Axel Uhl
06872cc3ec
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-03-29 20:11:01 +02:00
Axel Uhl
21d5d33f78
fixing re-opened bug 2707, now also for replication-related de-serialization in RacingEventServiceImpl, using the same class loader
2015-03-29 18:00:07 +02:00
Axel Uhl
ba47883a59
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-03-27 15:39:19 +01:00
Axel Uhl
e1e047bd75
Merge branch 'master' into mark-rounding-inference
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.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/DynamicTrackedRaceImpl.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/home/client/place/event/regattaanalytics/RegattaAnalyticsDataManager.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalyticsDataManager.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.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
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
2015-03-26 14:51:48 +01:00
Christopher Ronnewinkel (D036654)
3acbf62b62
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
2015-03-26 12:41:16 +01:00
Frederik Petersen
c283d9276a
Introduces oldStatus parameter for state change listener
...
polar service can now listen for state changes (loading -> x)
2015-03-25 10:51:47 +01:00
Axel Uhl
c9d9a59ea1
implementing solution for bug 2728: adding last known position to marks list
2015-03-24 17:10:44 +01:00
Axel Uhl
9a81fe3e70
Merge branch 'jbross-buoy-tender'
...
Conflicts:
java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
2015-03-24 11:16:47 +01:00
Christopher Ronnewinkel (D036654)
9a3df037cc
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
...
Conflicts:
java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
2015-03-24 09:44:09 +01:00
Alexander Ries
c51ba95293
Merge remote-tracking branch 'origin/master' into ribdashboard
2015-03-24 00:05:59 +01:00
Axel Uhl
8267c32263
improved Javadoc for new TrackedRace.getTrack(Mark) and old TrackedRace.getOrCreateTrack(Mark); use new getTrack(Mark) in RacingEventServiceImpl
2015-03-23 22:30:30 +01:00
Axel Uhl
29284adfa4
consolidated acquisition of mark position from tracked races, regatta log and race logs
2015-03-23 22:25:40 +01:00
Axel Uhl
911cdeb86b
Merge branch 'master' into jbross-buoy-tender
...
Conflicts:
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2015-03-23 20:52:00 +01:00
Axel Uhl
f8c16d1049
Merge branch 'jbross-buoy-tender' into bug2724
...
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.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/client/StringMessages_ru.properties
2015-03-23 16:18:37 +01:00
Christopher Ronnewinkel (D036654)
fb6d2cbe19
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
2015-03-20 22:03:17 +01:00
Axel Uhl
Christopher Ronnewinkel (D036654)
Frederik Petersen
fmittag
Bennet Brunsen
sailing
Alexander Ries