eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-30 15:57:11 +00:00
Code Activity

Merge branch 'master' into tracapi

Browse Source
This commit is contained in:
Axel Uhl committed 2014-04-25 15:25:56 +02:00
2 parents 47611acb1b 62badd8819
commit b11402f7d0
6 files changed
+20 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
+8 -2
View File
@@ -501,7 +501,7 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
for (MarkPassing markPassing : markPassings) {
// try to find corresponding old start mark passing
if (oldStartMarkPassing != null
&& markPassing.getWaypoint().getName().equals(oldStartMarkPassing.getWaypoint().getName())) {
&& markPassing.getWaypoint().equals(oldStartMarkPassing.getWaypoint())) {
if (markPassing.getTimePoint() != null && oldStartMarkPassing.getTimePoint() != null
&& markPassing.getTimePoint().equals(oldStartMarkPassing.getTimePoint())) {
requiresStartTimeUpdate = false;
@@ -532,7 +532,9 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
final NamedReentrantReadWriteLock markPassingsLock2 = getMarkPassingsLock(markPassingsInOrderForWaypoint);
LockUtil.lockForWrite(markPassingsLock2);
try {
// TODO wouldn't we need to remove a previous mark passing of competitor for the same waypoint before re-adding it?
// The mark passings of competitor have been removed by the call to clearMarkPassings(competitor) above
// from both, the collection that holds the mark passings by waypoint and the one that holds the
// mark passings per competitor; so we can simply add here:
markPassingsInOrderForWaypoint.add(markPassing);
} finally {
LockUtil.unlockAfterWrite(markPassingsLock2);
@@ -574,6 +576,10 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
getRace().getCourse().unlockAfterRead();
}
/**
* Removes all mark passings of <code>competitor</code> from both, the {@link #markPassingsForCompetitor}
* and the {@link #markPassingsForWaypoint} collections.
*/
private void clearMarkPassings(Competitor competitor) {
NavigableSet<MarkPassing> markPassings = getMarkPassings(competitor);
final NamedReentrantReadWriteLock markPassingsLock = getMarkPassingsLock(markPassings);
java/com.sap.sailing.server.gateway/webservices/api/v1/raceCompetitorPositionsGetDoc.html
+4 -4
View File
@@ -30,10 +30,10 @@
<tr>
<td>Optional parameters:</td>
<td>
<div>from</div>
<div>fromasmillis</div>
<div>to</div>
<div>toasmillis</div>
<div>fromtime (ISO format, such as 2014-02-14T10:12:03Z)</div>
<div>fromtimeasmillis</div>
<div>totime (ISO format, such as 2014-02-14T10:12:03Z)</div>
<div>totimeasmillis</div>
</td>
</tr>
<tr>
java/com.sap.sailing.server.gateway/webservices/api/v1/raceMarkPositionsGetDoc.html
+4 -4
View File
@@ -30,10 +30,10 @@
<tr>
<td>Optional parameters:</td>
<td>
<div>from</div>
<div>fromasmillis</div>
<div>to</div>
<div>toasmillis</div>
<div>fromtime (ISO format, such as 2014-02-14T10:12:03Z)</div>
<div>fromtimeasmillis</div>
<div>totime (ISO format, such as 2014-02-14T10:12:03Z)</div>
<div>totimeasmillis</div>
</td>
</tr>
<tr>
java/com.sap.sailing.server.gateway/webservices/api/v1/raceWindGetDoc.html
+2 -2
View File
@@ -34,9 +34,9 @@
<td>Optional parameters:</td>
<td>
<div>windsource [COMBINED = Default, WEB, EXPEDITION, TRACK_BASED_ESTIMATION, COURSE_BASED, RACECOMMITTEE]</div>
<div>fromtime</div>
<div>fromtime (ISO format, such as 2014-02-14T10:12:03Z)</div>
<div>fromtimeasmillis</div>
<div>totime</div>
<div>totime (ISO format, such as 2014-02-14T10:12:03Z)</div>
<div>totimeasmillis</div>
</td>
</tr>
mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
-5
View File
@@ -36,16 +36,11 @@
android:icon="@drawable/sap_sailing_app_icon"
android:label="@string/app_name"
android:theme="@style/Theme.Welter" >
<uses-library android:name="com.google.android.maps" />
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<meta-data
android:name="com.google.android.maps.v2.API_KEY"
android:value="@string/GoogleMapsKey" />
<activity
android:name=".ui.activities.LoginActivity"
android:screenOrientation="sensorLandscape"
mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
+2 -2
View File
@@ -7,11 +7,11 @@
<string name="preference_language_key">languagePref</string>
<string name="preference_server_url_key">webserviceUrlPref</string>
<string name="preference_server_url_default">http://ess40-2014.sapsailing.com/</string>
<string name="preference_server_url_default">http://dev.sapsailing.com/</string>
<string name="preference_course_areas_key">courseAreasPref</string>
<string-array name="preference_course_areas_default">
<item>Alpha</item>
<item>Stadium</item>
<item>Marina Bay</item>
</string-array>
<string-array name="preference_course_areas_example">
<item>Alpha</item>