Commit Graph
689 Commits
Author SHA1 Message Date
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 61945077a0 making method public to allow mocking (?) 2015-03-24 07:38:39 +01:00
Axel Uhl 6fd30c5725 improved web service documentation 2015-03-23 23:17:01 +01:00
Axel Uhl ab0db8057a slightly restructured tests that needed to see a method from the host bundle; made package protected 2015-03-23 23:01:13 +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 7500d8ed96 fixing the broken test for mark pinging; improved how mark tracks are located when pinging and how outlier avoidance is implemented 2015-03-23 21:33:56 +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
EC2 Server 9455b13f84 adjusted raceColumn to race_column 2015-03-23 17:14:47 +00:00
EC2 Server afaea9a66d adjusted URL after renaming raceColumn to race_column 2015-03-23 17:11:45 +00:00
Axel Uhl 60e1499b50 changed format and raceColumn parameter name for marks listing service 2015-03-23 17:25:45 +01:00
fmittag a931dc818d 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/partials/RegattaPhaseRace.ui.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.java
2015-03-22 17:04:59 +02:00
Axel Uhl 5fd384af5c added metric for distance including gate start consideration to leaderboard and REST API 2015-03-20 13:34:44 +01:00
Jan Broß 3812a00754 Reping mark to avoid interpolation 2015-03-20 11:53:22 +01:00
Jan Broß 966b17b178 PingMark Endpoint now takes a single GPSFix and should solemnly be used for pinging a mark 2015-03-20 10:14:14 +01:00
Jan Broß ec20a6042f Return latest known position if existent when pinging mark 2015-03-18 16:05:23 +01:00
Papick Garcia Taboada ce9026f19e Merge branch 'master' into design2015
* master: (82 commits)
  fix source/target compiler version to 1.7 for
com.sap.sse.shared.android to avoid compiler issues during app build
  added 'com.sap.sse.shared.android' project to maven build dependencies
for apk build
  A new root task can only be added to executors queue when 90% free
  Updated api v1 (markdown)
  Updated api v1 (markdown)
  Added test for leading competitor filter in polar mining
  Updated api v1 (markdown)
  Use pct instead of fixed value for leading competitor filter in polars
  Use isInLeadingCompetitors filter as a prefilter increasing
performance
  PolarDataMiner now waits for replay races to finish tracking
  fixed Java version for com.sap.sse.datamining.shared which has to be
1.7 because com.sap.sse.common is referencing it
  Added test for suspend scenario. Make sure that continuous triggering
will
  Added missing path to get method
  Added missing barrier call
  addressing bug2704 comment #6
  Use barriers in bug2704 test case
  fixed synchronization issue on SmartFutureCache
  untested attempt to fix bug 2704, re-thinking SmartFutureCache
  Improved synchronizing after bug2704 changes.
  Started implementing a queue for new fixes in the polar service
  ...

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/server/SailingServiceImpl.java
2015-03-18 15:22:49 +01:00
Jan Broß 1485da1f9a Allow to query for last known fix using lastknown parameter 2015-03-18 14:27:22 +01:00
Jan Broß 70237566c7 Getting marks now allows to query for all marks belonging to a leaderboard 2015-03-18 10:30:56 +01:00
Jan Broß d3fa7e6860 First working version of Buoy Tender E-Mail invitation 2015-03-17 17:49:05 +01:00
Jan Broß 971ca9f8c3 Merge bug2651 and bug2652 into jbross-buoy-tender 2015-03-17 12:55:03 +01:00
Jan Broß 55d730b8d1 Fixes bug: The fleet has to be selected from the previously selected race column 2015-03-17 11:08:04 +01:00