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

enable hover for helper lines; decreased threshold for upwind/downwind detection to 45deg

Browse Source
This commit is contained in:
Axel Uhl committed 2012-05-11 17:16:49 +02:00
1 parent 4025453a83
commit d5c7228b4c
2 files changed
+16 -16
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/TrackedLegImpl.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class TrackedLegImpl implements TrackedLeg, RaceChangeListener {
private final static Logger logger = Logger.getLogger(TrackedLegImpl.class.getName());
private final static double UPWIND_DOWNWIND_TOLERANCE_IN_DEG = 60; // TracTrac does 22.5, Marcus Baur suggest 40; Nils Schröder suggests 60
private final static double UPWIND_DOWNWIND_TOLERANCE_IN_DEG = 45; // TracTrac does 22.5, Marcus Baur suggest 40; Nils Schröder suggests 60
private final Leg leg;
private final Map<Competitor, TrackedLegOfCompetitor> trackedLegsOfCompetitors;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/racemap/RaceMap.java
+15 -15
View File
@@ -663,11 +663,11 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
LegInfoDTO legInfoDTO = lastRaceTimesInfo.getLegInfos().get(visibleLeaderInfo.getA()-1);
GPSFixDTO lastBoatFix = getBoatFix(visibleLeaderInfo.getB());
double advantageLineLengthInKm = 1.0; // TODO this should probably rather scale with the visible area of the map; bug 616
double distanceFromBoatPosition = visibleLeaderInfo.getB().boatClass.getHullLengthInMeters(); // one hull length
double distanceFromBoatPositionInKm = visibleLeaderInfo.getB().boatClass.getHullLengthInMeters()/1000.; // one hull length
// implement and use Position.translateRhumb()
double bearingOfBoatInDeg = lastBoatFix.speedWithBearing.bearingInDegrees;
LatLng boatPosition = LatLng.newInstance(lastBoatFix.position.latDeg, lastBoatFix.position.lngDeg);
LatLng posAheadOfFirstBoat = calculatePositionAlongRhumbline(boatPosition, bearingOfBoatInDeg, distanceFromBoatPosition);
LatLng posAheadOfFirstBoat = calculatePositionAlongRhumbline(boatPosition, bearingOfBoatInDeg, distanceFromBoatPositionInKm);
double bearingOfCombinedWindInDeg = lastCombinedWindTrackInfoDTO.windFixes.get(0).trueWindBearingDeg;
double rotatedBearingDeg1 = 0.0;
double rotatedBearingDeg2 = 0.0;
@@ -704,7 +704,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
advantageLinePoints[0] = LatLng.newInstance(advantageLinePos1.getLatitude(), advantageLinePos1.getLongitude());
advantageLinePoints[1] = LatLng.newInstance(advantageLinePos2.getLatitude(), advantageLinePos2.getLongitude());;
if (advantageLine == null) {
PolylineOptions options = PolylineOptions.newInstance(/* clickable */false, /* geodesic */true);
PolylineOptions options = PolylineOptions.newInstance(/* clickable must be true for hover sensitivity*/ true, /* geodesic */true);
advantageLine = new Polyline(advantageLinePoints, /* color */ "#000000", /* width */ 1, /* opacity */0.5, options);
advantageLine.addPolylineMouseOverHandler(new PolylineMouseOverHandler() {
@Override
@@ -728,8 +728,8 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
}
else {
if (advantageLine != null) {
advantageLine.deleteVertex(1);
advantageLine.deleteVertex(0);
map.removeOverlay(advantageLine);
advantageLine = null;
}
}
}
@@ -747,7 +747,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
startGatePoints[0] = LatLng.newInstance(courseDTO.startBuoyPositions.get(0).latDeg, courseDTO.startBuoyPositions.get(0).lngDeg);
startGatePoints[1] = LatLng.newInstance(courseDTO.startBuoyPositions.get(1).latDeg, courseDTO.startBuoyPositions.get(1).lngDeg);
if (startLine == null) {
PolylineOptions options = PolylineOptions.newInstance(/* clickable */false, /* geodesic */true);
PolylineOptions options = PolylineOptions.newInstance(/* clickable must be true for hover sensititivy*/ true, /* geodesic */true);
startLine = new Polyline(startGatePoints, /* color */ "#FFFFFF", /* width */ 1, /* opacity */1.0, options);
startLine.addPolylineMouseOverHandler(new PolylineMouseOverHandler() {
@Override
@@ -771,8 +771,8 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
}
else {
if (startLine != null) {
startLine.deleteVertex(1);
startLine.deleteVertex(0);
map.removeOverlay(startLine);
startLine = null;
}
}
// draw the finish line
@@ -782,7 +782,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
finishGatePoints[0] = LatLng.newInstance(courseDTO.finishBuoyPositions.get(0).latDeg, courseDTO.finishBuoyPositions.get(0).lngDeg);
finishGatePoints[1] = LatLng.newInstance(courseDTO.finishBuoyPositions.get(1).latDeg, courseDTO.finishBuoyPositions.get(1).lngDeg);
if(finishLine == null) {
PolylineOptions options = PolylineOptions.newInstance(/* clickable */false, /* geodesic */true);
PolylineOptions options = PolylineOptions.newInstance(/* clickable must be true for hover sensitivity */ true, /* geodesic */true);
finishLine = new Polyline(finishGatePoints, /* color */ "#000000", /* width */ 1, /* opacity */1.0, options);
finishLine.addPolylineMouseOverHandler(new PolylineMouseOverHandler() {
@Override
@@ -806,8 +806,8 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
}
else {
if (finishLine != null) {
finishLine.deleteVertex(1);
finishLine.deleteVertex(0);
map.removeOverlay(finishLine);
finishLine = null;
}
}
// draw the course middle line
@@ -820,7 +820,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
courseMiddleLinePoints[1] = LatLng.newInstance(courseDTO.waypointPositions.get(legOfLeadingCompetitor).latDeg,
courseDTO.waypointPositions.get(legOfLeadingCompetitor).lngDeg);
if (courseMiddleLine == null) {
PolylineOptions options = PolylineOptions.newInstance(/* clickable */false, /* geodesic */true);
PolylineOptions options = PolylineOptions.newInstance(/* clickable must be true for hover sensitivity */ true, /* geodesic */true);
courseMiddleLine = new Polyline(courseMiddleLinePoints, /* color */ "#666666", /* width */ 1, /* opacity */1.0, options);
courseMiddleLine.addPolylineMouseOverHandler(new PolylineMouseOverHandler() {
@Override
@@ -843,9 +843,9 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
}
}
else {
if(courseMiddleLine != null) {
courseMiddleLine.deleteVertex(1);
courseMiddleLine.deleteVertex(0);
if (courseMiddleLine != null) {
map.removeOverlay(courseMiddleLine);
courseMiddleLine = null;
}
}
}