Commit Graph
707 Commits
Author SHA1 Message Date
Axel Uhl b4ffe1ea5e Merge branch 'bug3185' into bug3186 2015-07-27 23:07:48 +02:00
Axel Uhl 78ff26a17e introduced MillisecondsTimePoint.approximateNow() and used where now() is too expensive; re-typed now() to TimePoint 2015-07-27 22:48:09 +02:00
Axel Uhl 82a03565b6 made RegattaImpl.races a ConcurrentHashMap mapping from race name to RaceDefinition, avoiding extra synchronization and speeding up lookup by name 2015-07-27 22:17:42 +02:00
Axel Uhl f146c4c01b returning older mark positions than requested if that's the only position known;
good for static marks as we see them coming from TracTrac every now and then
2015-07-27 18:46:18 +02:00
Axel Uhl 67bc73616c Merge remote-tracking branch 'server/ubilabs--tracking_app--master' 2015-07-27 16:26:57 +02:00
fmittag fff96ae306 Merge remote-tracking branch 'origin/bug1163' 2015-07-25 17:36:01 +02:00
fmittag f9139f7bed optimized windstatusservlet to hold only the last x messages per device and not all of them. 2015-07-25 15:01:08 +02:00
fmittag 4a9b107e07 some more info and formatting improvements 2015-07-25 11:41:15 +02:00
fmittag ee77260b0f removed "DefaultLeaderboard" usage everywhere... 2015-07-24 16:54:40 +02:00
Axel Uhl e6d8848777 fixing bug 3179 by using a wind fix iterator constrained by from and to time and ignoring the returned fixes' time point 2015-07-24 15:44:14 +02:00
fmittag 0cf76913a9 little formatting fix 2015-07-23 15:06:50 +02:00
fmittag ad04b1708e improved windStatusServlet to display igtimi messages per device 2015-07-23 14:57:55 +02:00
Frederik Petersen 874e490dc0 Master data import now supports device config import
fixes bug3151
2015-07-20 18:25:08 +02:00
Frederik Petersen 071a23bc8f Removed MovingAverage processor from polar data miner
Was only meant for comparison purposes with Regression. Now regression is
used every anyway, so we only need to have the regression processors
2015-07-20 17:41:54 +02:00
Samuel Oey 91a5986281 Merge branch 'master' into ubilabs--tracking_app--develop 2015-07-16 15:24:50 +02:00
Samuel Oey 9e10e4831d merged conflicts for bug 2678 2015-07-13 14:54:07 +02:00
Bennet Brunsen 4476a8aa1b Renamed constants 2015-07-13 14:38:39 +02:00
Axel Uhl e8d195fa8e Merge branch 'master' into ubilabs--tracking_app--bug_2678_create_leaderboard_servlet_constants 2015-07-13 14:19:28 +02:00
Bennet Brunsen 75601180c0 Fixes typo 2015-07-13 12:54:15 +02:00
Axel Uhl b36583225b fixing bug 3101 by cropping wind queries to startOfTracking and endOfTracking / timePointOfNewestEveng 2015-07-10 22:27:04 +02:00
Bennet Brunsen f8487b5ff1 Created competitor constants in LeaderboardJsonGetServlet 2015-07-09 15:05:15 +02:00
Bennet Brunsen 55db705fb0 Extracted additional competitor constants 2015-07-09 12:43:22 +02:00
Axel Uhl a628234c70 fixing bug 3078 by adding null check for empty nationality 2015-07-07 11:06:56 +02:00
Bennet Brunsen 7173982c9b Introduces CompetitorJsonSerializor. Removes shared hard coded strings for competitor json 2015-07-06 15:34:47 +02:00
Axel Uhl 51f7facf47 removed a fefw more unnecessary NoWindException declarations 2015-07-02 10:17:19 +02:00
Axel Uhl 42dedcecfd bug 2467 #19: passing through RacingEventService as RaceLogResolver; added as transient field to TrackedRace, restored after initial load in RacingEventServiceImpl 2015-06-20 23:57:50 +02:00
Simon Pamies a7e3ba15a6 Fixing bug preventing JSON to be parsed 2015-06-19 13:21:24 +01:00
Axel Uhl c76eb1f74e Merge branch 'master' into ribdashboard 2015-06-19 02:06:30 +02:00
Axel Uhl 535654593c Merge branch 'master' into jbross-dependent-race-start
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	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/CalculateImageSizeFromUrlTest.java
	java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
	mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/DataStore.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/RaceFinishingTimeDialog.java
2015-06-18 13:45:50 +02:00
Axel Uhl 17a13599f3 fixed unescaping of SimpleRaceLogIdentifier 2015-06-03 18:44:00 +02:00
Jan Broß 02f29d1eea Change return type of StartTimeFinder 2015-06-03 12:13:57 +02:00
Alexander Ries c2a11cfd3b Solved master merge conlicts in TrackedRace and Regatta plus some of their mocks 2015-06-02 09:29:08 +02:00
Axel Uhl f4370ecd0d made new field RaceStateSerializer.regattaLike final 2015-05-31 23:45:44 +02:00
Axel Uhl bc897e982d Merge branch 'master' into jbross-dependent-race-start 2015-05-31 16:34:33 +02:00
Axel Uhl 4365699ea6 Merge branch 'master' into bug1018
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	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_cn.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-05-30 06:41:22 +02:00
fmittag b642a882fa Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-29 18:30:33 +03:00
fmittag c78b41d8bd Merge remote-tracking branch 'origin/master' 2015-05-29 18:28:20 +03:00
fmittag 56ac918faf fixed missing utf-8 encoding of 4 race committee app servlets 2015-05-29 18:27:38 +03:00
Axel Uhl 8c411bf6e2 Merge branch 'master' into bug1018
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-29 16:51:59 +02:00
Jan Broß acef2a0613 Rename DependentStartTimeFinder to StartTimeFinder 2015-05-29 13:11:47 +02:00
Jan Broß 636272b053 Merge remote-tracking branch 'origin/master' into jbross-dependent-race-start 2015-05-29 08:46:47 +02:00
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
Frederik Petersen 18ec962a05 Merge both tacks in polar service 2015-05-28 14:24:32 +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
Steffen Schaefer e07c585934 Merge remote-tracking branch 'origin/master' into design2015
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-28 09:55:11 +02:00
Alexander Ries e1fb488635 Merge remote-tracking branch 'origin/master' into ribdashboard 2015-05-28 09:20:27 +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