Axel Uhl
9c5bf2c3b1
switched from "windward distance to leader" to "windward distance to competitor farthest ahead"
2015-05-28 17:10:04 +02:00
Axel Uhl
f522527d65
accelerated chart calculations by pre-calculating RankingInfo beforehand, then sharing
2015-05-28 16:12:09 +02:00
Axel Uhl
82757a685c
pass RankingInfo through to getLegGapToLegLeaderInOwnTime as a preparation for a performance fix
2015-05-28 10:54:39 +02:00
Axel Uhl
38d757e9ff
Merge branch 'master' into bug1018
2015-05-28 10:18:12 +02:00
Axel Uhl
6a20efa1d9
fixing bug 2906: wind listeners didn't get de-registered proprely when removing a race and when re-starting the wind status servlet;
...
this should solve the problem with duplicate key exceptions hammering the DB
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/WaypointPositionAndDistanceCache.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java
2015-05-27 17:57:20 +02:00
Axel Uhl
a6fa795f1f
enhanced Javadoc and REST API doc for target time estimation
2015-05-27 17:29:07 +02:00
Axel Uhl
ba1fceecaa
added fields to capture time-on-time / time-on-distance on competitor and pass values through all constructors and operations and JSON serialization
2015-05-14 20:10:20 +02:00
Axel Uhl
869967f5b6
Merge branch 'master' into bug1018
...
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/tracking/TrackedLeg.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/TrackedLegImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
The merge conflict was largely caused by the introduction of target time estimation which conflicted with a few
new methods introduced on branch bug1018
2015-05-13 00:21:21 +02:00
Frederik Petersen
b0bf4950d8
Merge branch 'master' into bug2716
2015-05-12 22:35:09 +02:00
Frederik Petersen
f9d72d8227
Added RESTlet for target time estimation
2015-05-12 14:45:09 +02:00
Axel Uhl
cfdac2743f
Merge branch 'master' into bug1018
2015-05-10 20:43:44 +02:00
fmittag
fdf5a1d293
fix for Bug 2827 - special chars in competitor names in 'confirm positions' dialog not supported
...
set the right response header with utf-8 content type
2015-05-09 10:49:23 +02:00
Axel Uhl
1dfc055e34
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
2015-05-08 18:27:39 +02:00
Frederik Petersen
8fece8f5ca
Merge branch 'master' into bug2659
2015-05-07 09:51:37 +02:00
Axel Uhl
ece7378c4f
Merge branch 'master' into bug1018
2015-05-07 09:26:04 +02:00
Peter Siegmund
125ff95d12
Merge branch 'master' into ubilabs--tracking_app--develop
2015-05-06 08:57:26 +02:00
Axel Uhl
85e7b143e4
Merge branch 'master' into bug1018
2015-05-05 22:58:13 +02:00
Axel Uhl
2420a11519
addressing bug 2770, adding displayName field to RaceGroup and its serialized JSON form
2015-05-05 21:53:51 +02:00
Axel Uhl
181e5ee5b9
Merge branch 'master' into ubilabs--tracking_app--develop
2015-05-04 23:14:52 +02:00
Axel Uhl
eaf7bed53f
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2015-04-30 14:08:03 +02:00
Frederik Petersen
1cb580c589
Merge branch 'master' into bug2659
2015-04-30 13:37:40 +02:00
Frederik Petersen
a3dba5041b
GPSFixes of GPSFixStore are now imported during master data import
...
should fix bug 2659
2015-04-30 13:34:38 +02:00
Bennet Brunsen
639d109e39
Revert "adding white space mess "
...
This reverts commit ec12301feee614dc356732850564b754e0bfc33a.
2015-04-30 11:54:47 +02:00
Steffen Schaefer
89fd4e4471
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
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.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
2015-04-29 17:00:53 +02:00
Bennet Brunsen
ff1b0c6f87
Merge branch 'master' into ubilabs--tracking_app--develop
2015-04-28 13:47:56 +02:00
Axel Uhl
0f7a9a23af
removed a few more unnecessary "throw NoWindException" cases; eliminated corresponding try/catch where possible
2015-04-28 08:39:23 +02:00
Axel Uhl
aced04e1af
added an implementation of getDurationToReachAtEqualPerformance for time-on-time/time-on-distance;
...
this is the basis needed to estimate the total windward distance and duration that one competitor needs
to reach the windward position of another competitor that position-wise (but not necessarily corrected-time-wise)
is ahead.
2015-04-28 00:34:11 +02:00
Axel Uhl
6cb84f3782
refactored TrackedLegOfCompetitor.getEstimatedTimeToNextMarkInSeconds to return Duration; prepared methods in AbstractRankingMetric for new calculations
2015-04-27 22:01:11 +02:00
Axel Uhl
5fcb99964e
Merge branch 'master' into bug1018
...
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/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.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2015-04-27 10:26:45 +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
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
fmittag
9d23fda2d0
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/footer/Footer.ui.xml
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-21 22:23:29 +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
fmittag
1a4fde5069
added flagImage attribute of competitor to rest api
2015-04-17 15:47:51 +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
fmittag
64d968cc04
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
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/client/StringMessages_ru.properties
2015-04-13 17:04:01 +02:00
Axel Uhl
e3c0c02d0c
Merge branch 'master' into bug489
2015-04-09 22:18:49 +02:00
Frederik Petersen
d752149588
Also print the perAngle polar speed regression functions
2015-04-09 15:09:01 +02:00
fmittag
75ad623f2b
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaanalytics/RegattaAnalytics.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalytics.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/RegattaActivity.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/RegattaAnalyticsView.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/TabletAndDesktopRegattaView.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/SeriesActivity.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/SeriesAnalyticsView.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/TabletAndDesktopSeriesView.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
2015-04-07 14:10:25 +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
Axel Uhl
6c97c93172
obtain read lock on course before iterating over the tracked legs in RegattasResource
2015-04-02 15:05:25 +02:00
Axel Uhl
75b04d8048
Merge branch 'master' into ubilabs--tracking_app--develop
2015-03-30 22:09:02 +02:00
fmittag
b29144b1a8
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
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/server/SailingServiceImpl.java
2015-03-27 14:39:21 +02:00
Axel Uhl
9e0fc72b42
made member private
2015-03-25 13:36:52 +01:00
Axel Uhl
05e500e95c
making mockable method public again; Mockito under Maven just can't do it otherwise
2015-03-24 14:32:24 +01:00
Axel Uhl
5f8ceb6028
worked again on scoping the getRaceLogTrackingAdapter() method on LeaderboardResource more restrictively
2015-03-24 11:34:20 +01:00
Axel Uhl
Frederik Petersen
fmittag
Peter Siegmund
Bennet Brunsen
Steffen Schaefer