Merge remote-tracking branch 'origin/master' into dataMining

home.md

@@ -28,6 +28,7 @@ Like businesses, sailors need the latest information to make strategic decisions
 * Information for Webdesigners
   * [[Layout repository|wiki/webdesign]]
   * [[Create boat graphics for the 2D race viewer|wiki/boatGraphicsSVG]]
+  * [[Create clickable UI prototypes with Axure|wiki/ui-clickable-prototypes]]
 * General Information
   * [[Architecture and Infrastructure|wiki/architecture-and-infrastructure]]
   * [[Sailing Domain Algorithms|wiki/sailing-domain-algorithms]]

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java

@@ -2475,15 +2475,22 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
                     Mark mark2 = markIter.next();
                     final Position estimatedPositionMark1 = getOrCreateTrack(mark1).getEstimatedPosition(at, /* extrapolate */false);
                     final Position estimatedPositionMark2 = getOrCreateTrack(mark2).getEstimatedPosition(at, /* extrapolate */false);
-                    Bearing bearingFromMark1ToMark2 = estimatedPositionMark1.getBearingGreatCircle(estimatedPositionMark2);
-                    Waypoint nextWaypoint = waypointsIter.next();
-                    Bearing bearingFromStartToNextWaypoint = approximatePositionOfStart
-                            .getBearingGreatCircle(getApproximatePosition(nextWaypoint, at));
-                    Bearing diffBetweenFromMark1ToMark2AndNextWaypoint = bearingFromMark1ToMark2.getDifferenceTo(bearingFromStartToNextWaypoint);
-                    if (diffBetweenFromMark1ToMark2AndNextWaypoint.getDegrees() > 0) {
-                        starboardMarkPosition = estimatedPositionMark1;
+                    if (approximatePositionOfStart != null && estimatedPositionMark1 != null && estimatedPositionMark2 != null) {
+                        Bearing bearingFromMark1ToMark2 = estimatedPositionMark1.getBearingGreatCircle(estimatedPositionMark2);
+                        Waypoint nextWaypoint = waypointsIter.next();
+                        Bearing bearingFromStartToNextWaypoint = approximatePositionOfStart
+                                .getBearingGreatCircle(getApproximatePosition(nextWaypoint, at));
+                        Bearing diffBetweenFromMark1ToMark2AndNextWaypoint = bearingFromMark1ToMark2
+                                .getDifferenceTo(bearingFromStartToNextWaypoint);
+                        if (diffBetweenFromMark1ToMark2AndNextWaypoint.getDegrees() > 0) {
+                            starboardMarkPosition = estimatedPositionMark1;
+                        } else {
+                            starboardMarkPosition = estimatedPositionMark2;
+                        }
                     } else {
-                        starboardMarkPosition = estimatedPositionMark2;
+                        // at least one of the line's two marks' positions couldn't be determined; can't say which
+                        // one is on starboard and therefore don't know anything
+                        starboardMarkPosition = null;
                     }
                 } else {
                     // only one waypoint in course; cannot determine bearing to next mark

java/com.sap.sailing.selenium.test/pom.xml

@@ -131,7 +131,7 @@
                                     <autoStart>true</autoStart>
                                 </bundle>
                                 <bundle>
-                                    <id>com.sap.sailing.xcelsiusadapter</id>
+                                    <id>com.sap.sailing.xmlexport</id>
                                     <level>4</level>
                                     <autoStart>true</autoStart>
                                 </bundle>

wiki/planning/finding-a-design-agency.md

@@ -25,4 +25,11 @@
      <td>Aktivitätswächter, Gutschein des Tages, FDP App, Wunderlist</td>
      <td>Seem to have some experience with mobile apps including Android Platform. References look quite good.</td>
   </tr>
+  <tr>
+     <td>Future Earth, http://www.future-earth.eu</td>
+     <td>Zeewolde, NL</td>
+     <td>Example apps: http://apps.microsoft.com/windows/nl-nl/app/kiekeboe-world/5acf1e9c-9041-4b43-89d2-902b06bdef06, http://www.future-earth.eu/framework/, http://www.qualitycounts.eu/about.html.<br>
+         Their designer's web site: http://www.siemenvandijk.nl/</td>
+     <td>Their greatest benefit is an in-depth knowledge of GWT, paired with what seem to be reasonable design skills.</td>
+  </tr>
 </table>

wiki/ui-clickable-prototypes.md

@@ -0,0 +1,6 @@
+# Clickable UI prototypes with Axure
+
+In the process of designing new user interfaces we can use the 'Axure' software to create clickable prototypes for our ideas. These ideas are often represented through so called 'wireframes' described e.g. with tools like Adobe Illustrator. 
+
+## First steps
+- Download and install the software 'Axure' from http://www.axure.com