Merge branch 'master' into bug4332

This commit is contained in:
Peter Siegmund committed 2018-06-08 14:33:16 +02:00
commit a67df91c6d
701 files changed
+4926 -4003

No files matched your search

@@ -45,12 +45,12 @@ import com.sap.sailing.android.tracking.app.ui.activities.TrackingActivity;
import com.sap.sailing.android.tracking.app.utils.AppPreferences;
import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
import com.sap.sailing.android.tracking.app.valueobjects.EventInfo;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Speed;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
import com.sap.sailing.domain.common.impl.MeterPerSecondSpeedImpl;
import com.sap.sailing.domain.common.tracking.impl.FlatSmartphoneUuidAndGPSFixMovingJsonSerializer;
import com.sap.sse.common.Bearing;
import com.sap.sse.common.Duration;
import com.sap.sse.common.Speed;
import com.sap.sse.common.impl.DegreeBearingImpl;
public class TrackingService extends Service implements LocationListener {
@@ -38,8 +38,8 @@ import com.sap.sailing.android.tracking.app.utils.AppPreferences;
import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
import com.sap.sailing.android.tracking.app.utils.ServiceHelper;
import com.sap.sailing.android.tracking.app.valueobjects.EventInfo;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Speed;
import com.sap.sse.common.Bearing;
import com.sap.sse.common.Speed;
import com.viewpagerindicator.CirclePageIndicator;
public class TrackingActivity extends BaseActivity implements GPSQualityListener, APIConnectivityListener {
@@ -8,7 +8,7 @@ import android.widget.TextView;
import com.sap.sailing.android.tracking.app.R;
import com.sap.sailing.android.tracking.app.ui.activities.TrackingActivity;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sse.common.Bearing;
public class CompassFragment extends BaseFragment {
@@ -12,7 +12,7 @@ import android.widget.TextView;
import com.sap.sailing.android.tracking.app.R;
import com.sap.sailing.android.tracking.app.ui.activities.TrackingActivity;
import com.sap.sailing.domain.common.Speed;
import com.sap.sse.common.Speed;
public class SpeedFragment extends BaseFragment {
@@ -3,8 +3,8 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign;
import java.util.HashSet;
import java.util.Set;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Position;
import com.sap.sse.common.Bearing;
public abstract class AbstractCourseDesign implements CourseDesign{
private Position startBoatPosition;
@@ -3,12 +3,12 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign;
import java.text.DecimalFormat;
import java.util.Set;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
import com.sap.sailing.domain.common.impl.NauticalMileDistance;
import com.sap.sailing.racecommittee.app.utils.GeoUtils;
import com.sap.sse.common.Bearing;
import com.sap.sse.common.Distance;
import com.sap.sse.common.impl.DegreeBearingImpl;
public abstract class AbstractCourseDesignFactory implements CourseDesignFactory {
protected CourseDesign product;
@@ -5,8 +5,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.impl.MeterDistance;
import com.sap.sse.common.Distance;
@SuppressWarnings("serial")
public enum BoatClassType {
boatClass470erMen("470er Men", new HashMap<CourseLayouts, TargetTime>() {
@@ -2,8 +2,8 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign;
import java.util.Set;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Position;
import com.sap.sse.common.Bearing;
public interface CourseDesign {
Position getStartBoatPosition();
@@ -2,8 +2,8 @@ package com.sap.sailing.racecommittee.app.domain.coursedesign;
import android.util.Log;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Position;
import com.sap.sse.common.Bearing;
public class CourseDesignComputer {
private static final String TAG = CourseDesignComputer.class.getName();
@@ -1,7 +1,7 @@
package com.sap.sailing.racecommittee.app.domain.coursedesign;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Position;
import com.sap.sse.common.Bearing;
public interface CourseDesignFactory {
@@ -1,9 +1,9 @@
package com.sap.sailing.racecommittee.app.domain.coursedesign;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.Positioned;
import com.sap.sse.common.Bearing;
import com.sap.sse.common.Distance;
public interface Located extends Positioned {
Bearing getBearingFrom(Position other);
@@ -1,12 +1,12 @@
package com.sap.sailing.racecommittee.app.domain.coursedesign;
import com.sap.sailing.domain.base.impl.MarkImpl;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.MarkType;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
import com.sap.sailing.domain.common.impl.MeterDistance;
import com.sap.sse.common.Bearing;
import com.sap.sse.common.Distance;
import com.sap.sse.common.impl.DegreeBearingImpl;
public class PositionedMarkImpl extends MarkImpl implements PositionedMark {
private static final long serialVersionUID = -7903960088124343841L;
@@ -5,13 +5,13 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.MarkType;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
import com.sap.sailing.domain.common.impl.NauticalMileDistance;
import com.sap.sailing.racecommittee.app.utils.GeoUtils;
import com.sap.sse.common.Bearing;
import com.sap.sse.common.Distance;
import com.sap.sse.common.impl.DegreeBearingImpl;
public class TrapezoidCourseDesignFactoryImpl extends AbstractCourseDesignFactory {
@@ -5,12 +5,12 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
import com.sap.sailing.domain.common.impl.NauticalMileDistance;
import com.sap.sailing.racecommittee.app.utils.GeoUtils;
import com.sap.sse.common.Bearing;
import com.sap.sse.common.Distance;
import com.sap.sse.common.impl.DegreeBearingImpl;
public class WindWardLeeWardCourseDesignFactoryImpl extends AbstractCourseDesignFactory {
private final int LUV_BUOY1_ANGLE_TO_WIND = 0;
@@ -22,11 +22,9 @@ import com.sap.sailing.domain.base.racegroup.CurrentRaceComparator;
import com.sap.sailing.domain.base.racegroup.CurrentRaceFilter;
import com.sap.sailing.domain.base.racegroup.RaceGroupSeriesFleet;
import com.sap.sailing.domain.base.racegroup.impl.CurrentRaceFilterImpl;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.SpeedWithBearing;
import com.sap.sailing.domain.common.Wind;
import com.sap.sailing.domain.common.impl.DegreeBearingImpl;
import com.sap.sailing.domain.common.impl.DegreePosition;
import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl;
import com.sap.sailing.domain.common.impl.WindImpl;
@@ -45,8 +43,10 @@ import com.sap.sailing.racecommittee.app.utils.RangeInputFilter;
import com.sap.sailing.racecommittee.app.utils.ThemeHelper;
import com.sap.sailing.racecommittee.app.utils.TimeUtils;
import com.sap.sailing.racecommittee.app.utils.WindHelper;
import com.sap.sse.common.Bearing;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.DegreeBearingImpl;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import android.annotation.SuppressLint;
@@ -2,11 +2,11 @@ package com.sap.sailing.racecommittee.app.utils;
import android.content.Context;
import com.sap.sailing.domain.common.Bearing;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.impl.DegreePosition;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sse.common.Bearing;
import com.sap.sse.common.Distance;
public class GeoUtils {
public static Position getPositionForGivenPointDistanceAndBearing(Position givenPoint, Distance distance,