diff --git a/java/com.sap.sailing.domain.common/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sailing.domain.common/.settings/org.eclipse.core.resources.prefs index c111da40d73..ec633bb1915 100755 --- a/java/com.sap.sailing.domain.common/.settings/org.eclipse.core.resources.prefs +++ b/java/com.sap.sailing.domain.common/.settings/org.eclipse.core.resources.prefs @@ -2,4 +2,4 @@ eclipse.preferences.version=1 encoding//src/com/sap/sailing/domain/common/AbstractBearing.java=UTF-8 encoding//src/com/sap/sailing/domain/common/confidence/impl/ConfidenceBasedAveragerImpl.java=utf-8 encoding//src/com/sap/sailing/domain/common/impl/AbstractSpeedWithAbstractBearingImpl.java=UTF-8 -encoding//src/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixMovingImpl.java=UTF-8 +encoding//src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java=UTF-8 diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindImpl.java index 1ae650de809..516686bd0d7 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindImpl.java @@ -33,7 +33,7 @@ public class WindImpl extends KnotSpeedWithBearingImpl implements Wind { } public static int hashCode(double latDeg, double lngDeg, long timePointAsMillis) { - return (31 * (int) (timePointAsMillis & Integer.MAX_VALUE)) ^ (int) (latDeg*lngDeg); + return (31 * (int) (timePointAsMillis & Integer.MAX_VALUE)) ^ (int) (Math.round(latDeg)*Math.round(lngDeg)); } /** * Wind hash is determined based on time point and position only to speed this up a little. diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/sensordata/BravoSensorDataMetadata.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/sensordata/BravoSensorDataMetadata.java index ff02c3d87eb..5f8d177bf6e 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/sensordata/BravoSensorDataMetadata.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/sensordata/BravoSensorDataMetadata.java @@ -14,7 +14,7 @@ public enum BravoSensorDataMetadata { INSTANCE; - public static final String RIDE_HEIGHT = "RideHeight"; + public static final String RIDE_HEIGHT = "RideHeight"; public static final String RIDE_HEIGHT_PORT_HULL = "RideHeightPortHull"; public static final String RIDE_HEIGHT_STBD_HULL = "RideHeightStbdHull"; public static final String HEEL = "Heel"; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixImpl.java similarity index 54% rename from java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixImpl.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixImpl.java index 16a009c6e86..bfd89ce129e 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixImpl.java @@ -1,11 +1,6 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.AbstractBearing; -import com.sap.sailing.domain.common.AbstractPosition; -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.impl.AbstractSpeedWithAbstractBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.AbstractTimePoint; @@ -21,9 +16,9 @@ import com.sap.sse.common.impl.AbstractTimePoint; * @author Axel Uhl (d043530) * */ -public class CompactGPSFixImpl extends AbstractGPSFixImpl { - private static final long serialVersionUID = 8167588584536992501L; - +public abstract class AbstractCompactGPSFixImpl extends AbstractGPSFixImpl { + private static final long serialVersionUID = 3943572107870245437L; + /** * Bit mask for {@link #whatIsCached}, telling whether validity is currently cached */ @@ -39,9 +34,7 @@ public class CompactGPSFixImpl extends AbstractGPSFixImpl { * {@link #whatIsCached}&{@link #IS_VALIDITY_CACHED} != 0 */ private static final byte VALIDITY = 1<<2; - - private final double latDeg; - private final double lngDeg; + private final long timePointAsMillis; /** @@ -52,32 +45,6 @@ public class CompactGPSFixImpl extends AbstractGPSFixImpl { */ private byte whatIsCached = 0; - /** - * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed's - * true "bearing" (true course over ground) in degrees. - */ - private double cachedEstimatedSpeedBearingInDegrees; - - /** - * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed - * in knots. - */ - private double cachedEstimatedSpeedInKnots; - - public class CompactPosition extends AbstractPosition { - private static final long serialVersionUID = 5621506820766614178L; - - @Override - public double getLatDeg() { - return latDeg; - } - - @Override - public double getLngDeg() { - return lngDeg; - } - } - private class CompactTimePoint extends AbstractTimePoint implements TimePoint { private static final long serialVersionUID = -2470922642359937437L; @@ -87,37 +54,12 @@ public class CompactGPSFixImpl extends AbstractGPSFixImpl { } } - private class CompactEstimatedSpeedBearing extends AbstractBearing { - private static final long serialVersionUID = 8549231429037883121L; - - @Override - public double getDegrees() { - return cachedEstimatedSpeedBearingInDegrees; - } - } - - private class CompactEstimatedSpeed extends AbstractSpeedWithAbstractBearingImpl { - private static final long serialVersionUID = -5871855443391817248L; - - @Override - public Bearing getBearing() { - return new CompactEstimatedSpeedBearing(); - } - - @Override - public double getKnots() { - return cachedEstimatedSpeedInKnots; - } - } - - public CompactGPSFixImpl(Position position, TimePoint timePoint) { - latDeg = position.getLatDeg(); - lngDeg = position.getLngDeg(); + public AbstractCompactGPSFixImpl(TimePoint timePoint) { timePointAsMillis = timePoint==null?-1:timePoint.asMillis(); } - - public CompactGPSFixImpl(GPSFix gpsFix) { - this(gpsFix.getPosition(), gpsFix.getTimePoint()); + + public AbstractCompactGPSFixImpl(GPSFix gpsFix) { + this(gpsFix.getTimePoint()); } @Override @@ -125,11 +67,6 @@ public class CompactGPSFixImpl extends AbstractGPSFixImpl { return getTimePoint() + ": " + getPosition(); } - @Override - public Position getPosition() { - return new CompactPosition(); - } - @Override public TimePoint getTimePoint() { return new CompactTimePoint(); @@ -166,12 +103,6 @@ public class CompactGPSFixImpl extends AbstractGPSFixImpl { return (whatIsCached & IS_ESTIMATED_SPEED_CACHED) != 0; } - @Override - public SpeedWithBearing getCachedEstimatedSpeed() { - assert isEstimatedSpeedCached(); - return new CompactEstimatedSpeed(); - } - @Override public void invalidateEstimatedSpeedCache() { whatIsCached &= ~IS_ESTIMATED_SPEED_CACHED; @@ -179,10 +110,6 @@ public class CompactGPSFixImpl extends AbstractGPSFixImpl { @Override public void cacheEstimatedSpeed(SpeedWithBearing estimatedSpeed) { - cachedEstimatedSpeedBearingInDegrees = estimatedSpeed.getBearing().getDegrees(); - cachedEstimatedSpeedInKnots = estimatedSpeed.getKnots(); whatIsCached |= IS_ESTIMATED_SPEED_CACHED; } - - } diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixMovingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixMovingImpl.java similarity index 66% rename from java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixMovingImpl.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixMovingImpl.java index b48f26dcd05..a23e80dd0a3 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixMovingImpl.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactGPSFixMovingImpl.java @@ -1,6 +1,5 @@ package com.sap.sailing.domain.common.tracking.impl; -import com.sap.sailing.domain.common.AbstractBearing; import com.sap.sailing.domain.common.AbstractSpeedImpl; import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.CourseChange; @@ -21,23 +20,14 @@ import com.sap.sse.common.TimePoint; * @author Axel Uhl (d043530) * */ -public class CompactGPSFixMovingImpl extends CompactGPSFixImpl implements GPSFixMoving { - private static final long serialVersionUID = 761582024504236533L; - private final double knotSpeed; - private final double degBearing; - - private class CompactSpeedWithBearing extends AbstractSpeedImpl implements SpeedWithBearing { +public abstract class AbstractCompactGPSFixMovingImpl extends AbstractCompactGPSFixImpl implements GPSFixMoving { + private static final long serialVersionUID = 3977983319207618335L; + + protected abstract class AbstractCompactSpeedWithBearing extends AbstractSpeedImpl implements SpeedWithBearing { private static final long serialVersionUID = 1802065090733146728L; @Override - public double getKnots() { - return knotSpeed; - } - - @Override - public Bearing getBearing() { - return new CompactBearing(); - } + public abstract double getKnots(); @Override public Position travelTo(Position pos, TimePoint from, TimePoint to) { @@ -81,33 +71,12 @@ public class CompactGPSFixMovingImpl extends CompactGPSFixImpl implements GPSFix } } - private class CompactBearing extends AbstractBearing { - private static final long serialVersionUID = -6474909210513108635L; - - @Override - public double getDegrees() { - return degBearing; - } - - @Override - public double getRadians() { - return degBearing / 180. * Math.PI; - } + public AbstractCompactGPSFixMovingImpl(TimePoint timePoint) { + super(timePoint); } - public CompactGPSFixMovingImpl(Position position, TimePoint timePoint, SpeedWithBearing speed) { - super(position, timePoint); - knotSpeed = speed.getKnots(); - degBearing = speed.getBearing().getDegrees(); - } - - public CompactGPSFixMovingImpl(GPSFixMoving gpsFixMoving) { - this(gpsFixMoving.getPosition(), gpsFixMoving.getTimePoint(), gpsFixMoving.getSpeed()); - } - - @Override - public SpeedWithBearing getSpeed() { - return new CompactSpeedWithBearing(); + public AbstractCompactGPSFixMovingImpl(GPSFixMoving gpsFixMoving) throws CompactionNotPossibleException { + this(gpsFixMoving.getTimePoint()); } @Override diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactWindImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactWindImpl.java new file mode 100755 index 00000000000..81c83d7008e --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/AbstractCompactWindImpl.java @@ -0,0 +1,129 @@ +package com.sap.sailing.domain.common.tracking.impl; + +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Wind; +import com.sap.sailing.domain.common.impl.AbstractSpeedWithAbstractBearingImpl; +import com.sap.sailing.domain.common.impl.WindImpl; +import com.sap.sse.common.TimePoint; +import com.sap.sse.common.Util; +import com.sap.sse.common.impl.AbstractTimePoint; + +public abstract class AbstractCompactWindImpl extends AbstractSpeedWithAbstractBearingImpl implements Wind { + private static final long serialVersionUID = -5059956032663387929L; + + /** + * bit mask for {@link #flags}, telling the bit encoding whether the position is {@code null}. + */ + private static final byte POSITION_IS_NULL = 1<<0; + + /** + * bit mask for {@link #flags}, telling the bit encoding whether the bearing is {@code null}. + */ + private static final byte BEARING_IS_NULL = 1<<1; + + /** + * bit mask for {@link #flags}, telling the bit encoding whether the time point is {@code null}. + */ + private static final byte TIME_POINT_IS_NULL = 1<<2; + + /** + * See the bit mask values such as {@link #POSITION_IS_NULL}, {@link #BEARING_IS_NULL} and {@link #TIME_POINT_IS_NULL}. + */ + private final byte flags; + + private final long timePointAsMillis; + + private class CompactTimePoint extends AbstractTimePoint implements TimePoint { + private static final long serialVersionUID = -2470922642359937437L; + + @Override + public long asMillis() { + return timePointAsMillis; + } + } + + public AbstractCompactWindImpl(Wind wind) { + final boolean bearingIsNull; + final boolean positionIsNull; + final boolean timePointIsNull; + bearingIsNull = wind.getBearing() == null; + positionIsNull = wind.getPosition() == null; + if (wind.getTimePoint() == null) { + timePointIsNull = true; + this.timePointAsMillis = 0; + } else { + timePointIsNull = false; + this.timePointAsMillis = wind.getTimePoint().asMillis(); + } + flags = (byte) ((byte) (bearingIsNull ? BEARING_IS_NULL : (byte) 0) | (positionIsNull ? POSITION_IS_NULL : (byte) 0) | (timePointIsNull ? TIME_POINT_IS_NULL : (byte) 0)); + } + + @Override + public Position getPosition() { + if ((flags & POSITION_IS_NULL) != 0) { + return null; + } else { + return getCompactPosition(); + } + } + + protected abstract Position getCompactPosition(); + + @Override + public TimePoint getTimePoint() { + if ((flags & TIME_POINT_IS_NULL) != 0) { + return null; + } else { + return new CompactTimePoint(); + } + } + + @Override + public Bearing getBearing() { + if ((flags & BEARING_IS_NULL) != 0) { + return null; + } else { + return getCompactBearing(); + } + } + + protected abstract Bearing getCompactBearing(); + + /** + * Make abstract to force implementing subclasses to implement this method. + */ + @Override + public abstract double getKnots(); + + @Override + public Bearing getFrom() { + if (getBearing() == null) { + return null; + } else { + return getBearing().reverse(); + } + } + + @Override + public int hashCode() { + return WindImpl.hashCode(getPosition().getLatDeg(), getPosition().getLngDeg(), (flags&TIME_POINT_IS_NULL) != 0?0:timePointAsMillis); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) + return false; + if (!(obj instanceof Wind)) + return false; + Wind other = (Wind) obj; + return Util.equalsWithNull(getPosition(), other.getPosition()) && Util.equalsWithNull(getTimePoint(), other.getTimePoint()); + } + + @Override + public String toString() { + return ""+getTimePoint()+"@"+getPosition()+": "+getKnots()+"kn from "+getFrom(); + } +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactPositionHelper.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactPositionHelper.java new file mode 100755 index 00000000000..b391ca92522 --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactPositionHelper.java @@ -0,0 +1,75 @@ +package com.sap.sailing.domain.common.tracking.impl; + +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; + +/** + * A utility class that "compact" fix implementations such as {@link VeryCompactGPSFixImpl} etc. can use + * to obtain representations of latitudes, longitudes, knot speeds and degree bearings marshalled in + * types that sacrifice very little accuracy from a real-world perspective, yet use a data type for + * encoding that requires fewer bytes than a {@code double} value.

+ * + * Latitude and longitude values are represented using a signed {@code int} value, scaling their range (-90°..+90° and + * -180°..+180°, respectively over the full {@code int} range. This gives a resolution of 4.6mm for latitudes, + * and at the equator of 9.3mm for longitudes.

+ * + * Bearings / courses over ground are represented as a signed {@code short} value, mapping the range of -360°..+360° to the + * value range of the {@code short} datatype. This results in a resolution of 0.01°.

+ * + * Speed values are represented in knots in their compact form; lossy compaction uses a signed {@code short} value for + * the knot speeds, assuming a range of -500kts..+500kts, spreading this range over the value range of the {@code short} + * datatype. This results in a resolution of 0.015kts.

+ * + * If an attempt is made to obtain a compact form of a knot speed or bearing where the value if out of the range described above, + * a {@link CompactionNotPossibleException} will be thrown. Callers should then transparently resort to the precise + * compaction counterparts for the respective type. + * + * @author Axel Uhl (d043530) + * + */ +public class CompactPositionHelper { + private static final double LAT_SCALE = 90. / (double) (1 << 31); // int + private static final double LNG_SCALE = 180. / (double) (1 << 31); // int + + private static final double KNOT_SPEED_SCALE = 500. /* knots; what that we track would ever be faster? */ / (double) (1<<15); // short + private static final double DEGREE_BEARING_SCALE = 360. / (double) (1<<15); // short + + // Positions + public static double getLatDeg(int latDegScaled) { + return LAT_SCALE * latDegScaled; + } + + public static double getLngDeg(int lngDegScaled) { + return LNG_SCALE * lngDegScaled; + } + + public static int getLngDegScaled(Position position) { + return (int) (position.getLngDeg() / LNG_SCALE); + } + + public static int getLatDegScaled(Position position) { + return (int) (position.getLatDeg() / LAT_SCALE); + } + + // Speeds / Bearings + public static double getKnotSpeed(short knotSpeedScaled) { + return KNOT_SPEED_SCALE * knotSpeedScaled; + } + + public static double getDegreeBearing(short degreeBearingScaled) { + return DEGREE_BEARING_SCALE * degreeBearingScaled; + } + + public static short getKnotSpeedScaled(Speed speed) throws CompactionNotPossibleException { + final double knotSpeedScaled = speed.getKnots() / KNOT_SPEED_SCALE; + if (knotSpeedScaled > Short.MAX_VALUE || knotSpeedScaled < Short.MIN_VALUE) { + throw new CompactionNotPossibleException("Speed "+speed+" cannot be compacted; "+speed.getKnots()+" does not fit into a signed short value"); + } + return (short) knotSpeedScaled; + } + + public static short getDegreeBearingScaled(Bearing bearing) { + return (short) (bearing.getDegrees() / DEGREE_BEARING_SCALE); + } +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java deleted file mode 100755 index 0c0035c54e7..00000000000 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.sap.sailing.domain.common.tracking.impl; - -import com.sap.sailing.domain.common.AbstractBearing; -import com.sap.sailing.domain.common.AbstractPosition; -import com.sap.sailing.domain.common.Bearing; -import com.sap.sailing.domain.common.Position; -import com.sap.sailing.domain.common.Wind; -import com.sap.sailing.domain.common.impl.AbstractSpeedWithAbstractBearingImpl; -import com.sap.sailing.domain.common.impl.WindImpl; -import com.sap.sse.common.TimePoint; -import com.sap.sse.common.Util; -import com.sap.sse.common.impl.AbstractTimePoint; - -public class CompactWindImpl extends AbstractSpeedWithAbstractBearingImpl implements Wind { - private static final long serialVersionUID = -5059956032663387929L; - private final double latDeg; - private final double lngDeg; - private final boolean positionIsNull; - private final boolean bearingIsNull; - private final boolean timePointIsNull; - private final double speedInKnots; - private final double degBearing; - private final long timePointAsMillis; - - public class CompactPosition extends AbstractPosition { - private static final long serialVersionUID = 5621506820766614178L; - - @Override - public double getLatDeg() { - return latDeg; - } - - @Override - public double getLngDeg() { - return lngDeg; - } - - @Override - public boolean equals(Object o) { - return this==o || o instanceof Position && getLatDeg() == ((Position) o).getLatDeg() && getLngDeg() == ((Position) o).getLngDeg(); - } - } - - private class CompactBearing extends AbstractBearing { - private static final long serialVersionUID = -6474909210513108635L; - - @Override - public double getDegrees() { - return degBearing; - } - - @Override - public double getRadians() { - return degBearing / 180. * Math.PI; - } - - @Override - public boolean equals(Object object) { - return this==object || object instanceof Bearing && getDegrees() == ((Bearing) object).getDegrees(); - } - } - - private class CompactTimePoint extends AbstractTimePoint implements TimePoint { - private static final long serialVersionUID = -2470922642359937437L; - - @Override - public long asMillis() { - return timePointAsMillis; - } - } - - public CompactWindImpl(Wind wind) { - if (wind.getBearing() == null) { - bearingIsNull = true; - degBearing = 0; - } else { - this.degBearing = wind.getBearing().getDegrees(); - bearingIsNull = false; - } - if (wind.getPosition() == null) { - positionIsNull = true; - this.latDeg = 0; - this.lngDeg = 0; - } else { - this.latDeg = wind.getPosition().getLatDeg(); - this.lngDeg = wind.getPosition().getLngDeg(); - positionIsNull = false; - } - this.speedInKnots = wind.getKnots(); - if (wind.getTimePoint() == null) { - timePointIsNull = true; - this.timePointAsMillis = 0; - } else { - timePointIsNull = false; - this.timePointAsMillis = wind.getTimePoint().asMillis(); - } - } - - @Override - public Position getPosition() { - if (positionIsNull) { - return null; - } else { - return new CompactPosition(); - } - } - - @Override - public TimePoint getTimePoint() { - if (timePointIsNull) { - return null; - } else { - return new CompactTimePoint(); - } - } - - @Override - public Bearing getBearing() { - if (bearingIsNull) { - return null; - } else { - return new CompactBearing(); - } - } - - @Override - public double getKnots() { - return speedInKnots; - } - - @Override - public Bearing getFrom() { - if (getBearing() == null) { - return null; - } else { - return getBearing().reverse(); - } - } - - @Override - public int hashCode() { - return WindImpl.hashCode(latDeg, lngDeg, timePointIsNull?0:timePointAsMillis); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (!(obj instanceof Wind)) - return false; - Wind other = (Wind) obj; - return Util.equalsWithNull(getPosition(), other.getPosition()) && Util.equalsWithNull(getTimePoint(), other.getTimePoint()); - } - - @Override - public String toString() { - return ""+getTimePoint()+"@"+getPosition()+": "+getKnots()+"kn from "+getFrom(); - } -} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactionNotPossibleException.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactionNotPossibleException.java new file mode 100755 index 00000000000..43be75fd2d0 --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/CompactionNotPossibleException.java @@ -0,0 +1,37 @@ +package com.sap.sailing.domain.common.tracking.impl; + +/** + * Throws when an attempt is made to turn a fix of some sort into a more compact form, probably + * slightly reducing accuracy and/or reducing value ranges, such as for the speeds possible, where + * the fix presented cannot be turned into its compact form without exceeding a range. This would + * lead to an overflow or wrap-around and cannot be tolerated. Clients need to handle this exception + * by skipping compaction and using the original fix instead. + * + * @author Axel Uhl (d043530) + * + */ +public class CompactionNotPossibleException extends Exception { + private static final long serialVersionUID = -723044264487667717L; + + public CompactionNotPossibleException() { + super(); + } + + public CompactionNotPossibleException(String message, Throwable cause, boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + + public CompactionNotPossibleException(String message, Throwable cause) { + super(message, cause); + } + + public CompactionNotPossibleException(String message) { + super(message); + } + + public CompactionNotPossibleException(Throwable cause) { + super(cause); + } + +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java new file mode 100755 index 00000000000..1cf8940a462 --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java @@ -0,0 +1,105 @@ +package com.sap.sailing.domain.common.tracking.impl; + +import com.sap.sailing.domain.common.AbstractBearing; +import com.sap.sailing.domain.common.AbstractPosition; +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.impl.AbstractSpeedWithAbstractBearingImpl; +import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sse.common.TimePoint; + +/** + * A compact representation of a GPS fix which collects all primitive-typed attributes in one object to avoid + * memory overhead otherwise created by using too many individual fine-grained objects.

+ * + * Objects of this type are assumed to be contained in at most one {@link DynamicGPSFixTrackImpl}. It is + * therefore permissible to cache information about validity to speed up the otherwise expensive + * {@link DynamicGPSFixTrackImpl#isValid(PartialNavigableSetView, GPSFix)} computation. + * + * @author Axel Uhl (d043530) + * + */ +public class PreciseCompactGPSFixImpl extends AbstractCompactGPSFixImpl { + private static final long serialVersionUID = 8167588584536992501L; + + private final double latDeg; + private final double lngDeg; + + /** + * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed's + * true "bearing" (true course over ground) in degrees. + */ + private double cachedEstimatedSpeedBearingInDegrees; + + /** + * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed + * in knots. + */ + private double cachedEstimatedSpeedInKnots; + + public class PreciseCompactPosition extends AbstractPosition { + private static final long serialVersionUID = 5621506820766614178L; + + @Override + public double getLatDeg() { + return latDeg; + } + + @Override + public double getLngDeg() { + return lngDeg; + } + } + + private class PreciseCompactEstimatedSpeedBearing extends AbstractBearing { + private static final long serialVersionUID = 8549231429037883121L; + + @Override + public double getDegrees() { + return cachedEstimatedSpeedBearingInDegrees; + } + } + + private class PreciseCompactEstimatedSpeed extends AbstractSpeedWithAbstractBearingImpl { + private static final long serialVersionUID = -5871855443391817248L; + + @Override + public Bearing getBearing() { + return new PreciseCompactEstimatedSpeedBearing(); + } + + @Override + public double getKnots() { + return cachedEstimatedSpeedInKnots; + } + } + + public PreciseCompactGPSFixImpl(Position position, TimePoint timePoint) { + super(timePoint); + latDeg = position.getLatDeg(); + lngDeg = position.getLngDeg(); + } + + public PreciseCompactGPSFixImpl(GPSFix gpsFix) { + this(gpsFix.getPosition(), gpsFix.getTimePoint()); + } + + @Override + public Position getPosition() { + return new PreciseCompactPosition(); + } + + @Override + public SpeedWithBearing getCachedEstimatedSpeed() { + assert isEstimatedSpeedCached(); + return new PreciseCompactEstimatedSpeed(); + } + + @Override + public void cacheEstimatedSpeed(SpeedWithBearing estimatedSpeed) { + cachedEstimatedSpeedBearingInDegrees = estimatedSpeed.getBearing().getDegrees(); + cachedEstimatedSpeedInKnots = estimatedSpeed.getKnots(); + super.cacheEstimatedSpeed(estimatedSpeed); + } +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixMovingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixMovingImpl.java new file mode 100755 index 00000000000..d6fd25e7f0c --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixMovingImpl.java @@ -0,0 +1,135 @@ +package com.sap.sailing.domain.common.tracking.impl; + +import com.sap.sailing.domain.common.AbstractBearing; +import com.sap.sailing.domain.common.AbstractPosition; +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.impl.AbstractSpeedWithAbstractBearingImpl; +import com.sap.sailing.domain.common.tracking.GPSFixMoving; +import com.sap.sse.common.TimePoint; + +/** + * A memory-conserving representation of a {@link GPSFixMoving} object that produces the fine-grained + * objects for {@link Position}, {@link SpeedWithBearing}, {@link Bearing} and {@link TimePoint} dynamically + * as thin wrappers around this object which holds all elementary attributes required. This saves several + * object references and object headers. + * + * @author Axel Uhl (d043530) + * + */ +public class PreciseCompactGPSFixMovingImpl extends AbstractCompactGPSFixMovingImpl { + private static final long serialVersionUID = 761582024504236533L; + private final double latDeg; + private final double lngDeg; + private final double knotSpeed; + private final double degBearing; + + /** + * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed's + * true "bearing" (true course over ground) in degrees. + */ + private double cachedEstimatedSpeedBearingInDegrees; + + /** + * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed + * in knots. + */ + private double cachedEstimatedSpeedInKnots; + + + private class PreciseCompactSpeedWithBearing extends AbstractCompactSpeedWithBearing implements SpeedWithBearing { + private static final long serialVersionUID = 1802065090733146728L; + + @Override + public double getKnots() { + return knotSpeed; + } + + @Override + public Bearing getBearing() { + return new PreciseCompactBearing(); + } + } + + private class PreciseCompactBearing extends AbstractBearing { + private static final long serialVersionUID = -6474909210513108635L; + + @Override + public double getDegrees() { + return degBearing; + } + } + + public class PreciseCompactPosition extends AbstractPosition { + private static final long serialVersionUID = 5621506820766614178L; + + @Override + public double getLatDeg() { + return latDeg; + } + + @Override + public double getLngDeg() { + return lngDeg; + } + } + + private class PreciseCompactEstimatedSpeedBearing extends AbstractBearing { + private static final long serialVersionUID = 8549231429037883121L; + + @Override + public double getDegrees() { + return cachedEstimatedSpeedBearingInDegrees; + } + } + + private class PreciseCompactEstimatedSpeed extends AbstractSpeedWithAbstractBearingImpl { + private static final long serialVersionUID = -5871855443391817248L; + + @Override + public Bearing getBearing() { + return new PreciseCompactEstimatedSpeedBearing(); + } + + @Override + public double getKnots() { + return cachedEstimatedSpeedInKnots; + } + } + + public PreciseCompactGPSFixMovingImpl(Position position, TimePoint timePoint, SpeedWithBearing speed) { + super(timePoint); + latDeg = position.getLatDeg(); + lngDeg = position.getLngDeg(); + knotSpeed = speed.getKnots(); + degBearing = speed.getBearing().getDegrees(); + } + + public PreciseCompactGPSFixMovingImpl(GPSFixMoving gpsFixMoving) { + this(gpsFixMoving.getPosition(), gpsFixMoving.getTimePoint(), gpsFixMoving.getSpeed()); + } + + @Override + public SpeedWithBearing getSpeed() { + return new PreciseCompactSpeedWithBearing(); + } + + @Override + public Position getPosition() { + return new PreciseCompactPosition(); + } + + @Override + public SpeedWithBearing getCachedEstimatedSpeed() { + assert isEstimatedSpeedCached(); + return new PreciseCompactEstimatedSpeed(); + } + + @Override + public void cacheEstimatedSpeed(SpeedWithBearing estimatedSpeed) { + cachedEstimatedSpeedBearingInDegrees = estimatedSpeed.getBearing().getDegrees(); + cachedEstimatedSpeedInKnots = estimatedSpeed.getKnots(); + super.cacheEstimatedSpeed(estimatedSpeed); + } +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactWindImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactWindImpl.java new file mode 100755 index 00000000000..12a444c2cb2 --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/PreciseCompactWindImpl.java @@ -0,0 +1,81 @@ +package com.sap.sailing.domain.common.tracking.impl; + +import com.sap.sailing.domain.common.AbstractBearing; +import com.sap.sailing.domain.common.AbstractPosition; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Wind; + +/** + * Keeps the precise values of lat/lng and speed/course. + * + * @author Axel Uhl (d043530) + * + */ +public class PreciseCompactWindImpl extends AbstractCompactWindImpl { + private static final long serialVersionUID = -5059956032663387929L; + private final double latDeg; + private final double lngDeg; + private final double speedInKnots; + private final double degBearing; + + public class CompactPosition extends AbstractPosition { + private static final long serialVersionUID = 5621506820766614178L; + + @Override + public double getLatDeg() { + return latDeg; + } + + @Override + public double getLngDeg() { + return lngDeg; + } + + @Override + public boolean equals(Object o) { + return this==o || o instanceof Position && getLatDeg() == ((Position) o).getLatDeg() && getLngDeg() == ((Position) o).getLngDeg(); + } + } + + private class CompactBearing extends AbstractBearing { + private static final long serialVersionUID = -6474909210513108635L; + + @Override + public double getDegrees() { + return degBearing; + } + } + + public PreciseCompactWindImpl(Wind wind) { + super(wind); + if (wind.getBearing() == null) { + degBearing = 0; + } else { + this.degBearing = wind.getBearing().getDegrees(); + } + if (wind.getPosition() == null) { + this.latDeg = 0; + this.lngDeg = 0; + } else { + this.latDeg = wind.getPosition().getLatDeg(); + this.lngDeg = wind.getPosition().getLngDeg(); + } + this.speedInKnots = wind.getKnots(); + } + + @Override + public double getKnots() { + return speedInKnots; + } + + @Override + protected Position getCompactPosition() { + return new CompactPosition(); + } + + @Override + protected Bearing getCompactBearing() { + return new CompactBearing(); + } +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java new file mode 100755 index 00000000000..ff6b0931d43 --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java @@ -0,0 +1,128 @@ +package com.sap.sailing.domain.common.tracking.impl; + +import java.util.logging.Level; +import java.util.logging.Logger; + +import com.sap.sailing.domain.common.AbstractBearing; +import com.sap.sailing.domain.common.AbstractPosition; +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.impl.AbstractSpeedWithAbstractBearingImpl; +import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sse.common.TimePoint; + +/** + * A compact representation of a GPS fix which collects all primitive-typed attributes in one object to avoid + * memory overhead otherwise created by using too many individual fine-grained objects.

+ * + * Objects of this type are assumed to be contained in at most one {@link DynamicGPSFixTrackImpl}. It is + * therefore permissible to cache information about validity to speed up the otherwise expensive + * {@link DynamicGPSFixTrackImpl#isValid(PartialNavigableSetView, GPSFix)} computation. + * + * @author Axel Uhl (d043530) + * + */ +public class VeryCompactGPSFixImpl extends AbstractCompactGPSFixImpl { + private static final long serialVersionUID = 3943572107870245437L; + + private static final Logger logger = Logger.getLogger(VeryCompactGPSFixImpl.class.getName()); + + /** + * See {@link CompactPositionHelper} + */ + private final int latDegScaled; + + /** + * See {@link CompactPositionHelper} + */ + private final int lngDegScaled; + + /** + * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed's + * true "bearing" (true course over ground) in degrees, scaled into a short value using {@link CompactPositionHelper}. + */ + private short cachedEstimatedSpeedBearingInDegreesScaled; + + /** + * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed + * in knots, scaled into a short value using {@link CompactPositionHelper}. + */ + private short cachedEstimatedSpeedInKnotsScaled; + + public class CompactPosition extends AbstractPosition { + private static final long serialVersionUID = 5621506820766614178L; + + @Override + public double getLatDeg() { + return CompactPositionHelper.getLatDeg(latDegScaled); + } + + @Override + public double getLngDeg() { + return CompactPositionHelper.getLngDeg(lngDegScaled); + } + } + + private class VeryCompactEstimatedSpeedBearing extends AbstractBearing { + private static final long serialVersionUID = 8549231429037883121L; + + @Override + public double getDegrees() { + return CompactPositionHelper.getDegreeBearing(cachedEstimatedSpeedBearingInDegreesScaled); + } + } + + private class VeryCompactEstimatedSpeed extends AbstractSpeedWithAbstractBearingImpl { + private static final long serialVersionUID = -5871855443391817248L; + + @Override + public Bearing getBearing() { + return new VeryCompactEstimatedSpeedBearing(); + } + + @Override + public double getKnots() { + return CompactPositionHelper.getKnotSpeed(cachedEstimatedSpeedInKnotsScaled); + } + } + + public VeryCompactGPSFixImpl(Position position, TimePoint timePoint) { + super(timePoint); + latDegScaled = CompactPositionHelper.getLatDegScaled(position); + lngDegScaled = CompactPositionHelper.getLngDegScaled(position); + } + + public VeryCompactGPSFixImpl(GPSFix gpsFix) { + this(gpsFix.getPosition(), gpsFix.getTimePoint()); + } + + @Override + public Position getPosition() { + return new CompactPosition(); + } + + @Override + public SpeedWithBearing getCachedEstimatedSpeed() { + assert isEstimatedSpeedCached(); + return new VeryCompactEstimatedSpeed(); + } + + /** + * Under rare circumstances, caching the speed may fail for the compact representation of a GPS fix. + * This can happen if the speed estimated exceeds the range that can be represented in this compact + * form which is less than in the original form where the speed amount is represented as a {@code double} + * value. In this case, a warning message is logged with level {@link Level#FINER}, and the speed remains + * uncached. + */ + @Override + public void cacheEstimatedSpeed(SpeedWithBearing estimatedSpeed) { + try { + cachedEstimatedSpeedInKnotsScaled = CompactPositionHelper.getKnotSpeedScaled(estimatedSpeed); + cachedEstimatedSpeedBearingInDegreesScaled = CompactPositionHelper.getDegreeBearingScaled(estimatedSpeed.getBearing()); + super.cacheEstimatedSpeed(estimatedSpeed); + } catch (CompactionNotPossibleException e) { + logger.log(Level.FINER, "Cannot cache estimated speed "+estimatedSpeed+" in compact fix:", e); + } + } +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java new file mode 100755 index 00000000000..625379af503 --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java @@ -0,0 +1,171 @@ +package com.sap.sailing.domain.common.tracking.impl; + +import java.util.logging.Level; +import java.util.logging.Logger; + +import com.sap.sailing.domain.common.AbstractBearing; +import com.sap.sailing.domain.common.AbstractPosition; +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.impl.AbstractSpeedWithAbstractBearingImpl; +import com.sap.sailing.domain.common.tracking.GPSFixMoving; +import com.sap.sse.common.TimePoint; + +/** + * A memory-conserving representation of a {@link GPSFixMoving} object that produces the fine-grained + * objects for {@link Position}, {@link SpeedWithBearing}, {@link Bearing} and {@link TimePoint} dynamically + * as thin wrappers around this object which holds all elementary attributes required. This saves several + * object references and object headers. + * + * @author Axel Uhl (d043530) + * + */ +public class VeryCompactGPSFixMovingImpl extends AbstractCompactGPSFixMovingImpl { + private static final long serialVersionUID = 3977983319207618335L; + + private static final Logger logger = Logger.getLogger(VeryCompactGPSFixMovingImpl.class.getName()); + + /** + * See {@link CompactPositionHelper} + */ + private final int latDegScaled; + + /** + * See {@link CompactPositionHelper} + */ + private final int lngDegScaled; + + /** + * See {@link CompactPositionHelper} + */ + private final short speedInKnotsScaled; + + /** + * See {@link CompactPositionHelper} + */ + private final short degreeBearingScaled; + + /** + * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed's + * true "bearing" (true course over ground) in degrees, scaled into a short value using {@link CompactPositionHelper}. + */ + private short cachedEstimatedSpeedBearingInDegreesScaled; + + /** + * When {@link #whatIsCached}&{@link #IS_ESTIMATED_SPEED_CACHED} != 0, this field tells the estimated speed + * in knots, scaled into a short value using {@link CompactPositionHelper}. + */ + private short cachedEstimatedSpeedInKnotsScaled; + + public class VeryCompactPosition extends AbstractPosition { + private static final long serialVersionUID = 5621506820766614178L; + + @Override + public double getLatDeg() { + return CompactPositionHelper.getLatDeg(latDegScaled); + } + + @Override + public double getLngDeg() { + return CompactPositionHelper.getLngDeg(lngDegScaled); + } + } + + private class VeryCompactSpeedWithBearing extends AbstractCompactSpeedWithBearing { + private static final long serialVersionUID = 1802065090733146728L; + + @Override + public double getKnots() { + return CompactPositionHelper.getKnotSpeed(speedInKnotsScaled); + } + + @Override + public Bearing getBearing() { + return new VeryCompactBearing(); + } + } + + private class VeryCompactBearing extends AbstractBearing { + private static final long serialVersionUID = 8167886382067060570L; + + @Override + public double getDegrees() { + return CompactPositionHelper.getDegreeBearing(degreeBearingScaled); + } + } + + private class VeryCompactEstimatedSpeedBearing extends AbstractBearing { + private static final long serialVersionUID = 8549231429037883121L; + + @Override + public double getDegrees() { + return CompactPositionHelper.getDegreeBearing(cachedEstimatedSpeedBearingInDegreesScaled); + } + } + + private class VeryCompactEstimatedSpeed extends AbstractSpeedWithAbstractBearingImpl { + private static final long serialVersionUID = -5871855443391817248L; + + @Override + public Bearing getBearing() { + return new VeryCompactEstimatedSpeedBearing(); + } + + @Override + public double getKnots() { + return CompactPositionHelper.getKnotSpeed(cachedEstimatedSpeedInKnotsScaled); + } + } + + public VeryCompactGPSFixMovingImpl(Position position, TimePoint timePoint, SpeedWithBearing speed) throws CompactionNotPossibleException { + super(timePoint); + latDegScaled = CompactPositionHelper.getLatDegScaled(position); + lngDegScaled = CompactPositionHelper.getLngDegScaled(position); + if (speed == null) { + speedInKnotsScaled = 0; + degreeBearingScaled = 0; + } else { + speedInKnotsScaled = CompactPositionHelper.getKnotSpeedScaled(speed); + degreeBearingScaled = CompactPositionHelper.getDegreeBearingScaled(speed.getBearing()); + } + } + + public VeryCompactGPSFixMovingImpl(GPSFixMoving gpsFixMoving) throws CompactionNotPossibleException { + this(gpsFixMoving.getPosition(), gpsFixMoving.getTimePoint(), gpsFixMoving.getSpeed()); + } + + @Override + public SpeedWithBearing getSpeed() { + return new VeryCompactSpeedWithBearing(); + } + + @Override + public Position getPosition() { + return new VeryCompactPosition(); + } + + @Override + public SpeedWithBearing getCachedEstimatedSpeed() { + assert isEstimatedSpeedCached(); + return new VeryCompactEstimatedSpeed(); + } + + /** + * Under rare circumstances, caching the speed may fail for the compact representation of a GPS fix. + * This can happen if the speed estimated exceeds the range that can be represented in this compact + * form which is less than in the original form where the speed amount is represented as a {@code double} + * value. In this case, a warning message is logged with level {@link Level#FINER}, and the speed remains + * uncached. + */ + @Override + public void cacheEstimatedSpeed(SpeedWithBearing estimatedSpeed) { + try { + cachedEstimatedSpeedInKnotsScaled = CompactPositionHelper.getKnotSpeedScaled(estimatedSpeed); + cachedEstimatedSpeedBearingInDegreesScaled = CompactPositionHelper.getDegreeBearingScaled(estimatedSpeed.getBearing()); + super.cacheEstimatedSpeed(estimatedSpeed); + } catch (CompactionNotPossibleException e) { + logger.log(Level.FINER, "Cannot cache estimated speed "+estimatedSpeed+" in compact fix:", e); + } + } +} diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java new file mode 100755 index 00000000000..1d3b60b3988 --- /dev/null +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java @@ -0,0 +1,92 @@ +package com.sap.sailing.domain.common.tracking.impl; + +import com.sap.sailing.domain.common.AbstractBearing; +import com.sap.sailing.domain.common.AbstractPosition; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Wind; + +/** + * Uses scaled, rounded internal representations of the values for lat/lng and speed/course. See + * {@link CompactPositionHelper} for the details of how value ranges and accuracies are affected. + * + * @author Axel Uhl (d043530) + * + */ +public class VeryCompactWindImpl extends AbstractCompactWindImpl { + private static final long serialVersionUID = -5059956032663387929L; + /** + * See {@link CompactPositionHelper} + */ + private final int latDegScaled; + + /** + * See {@link CompactPositionHelper} + */ + private final int lngDegScaled; + + /** + * See {@link CompactPositionHelper} + */ + private final short speedInKnotsScaled; + + /** + * See {@link CompactPositionHelper} + */ + private final short degreeBearingScaled; + + public class VeryCompactPosition extends AbstractPosition { + private static final long serialVersionUID = 5621506820766614178L; + + @Override + public double getLatDeg() { + return CompactPositionHelper.getLatDeg(latDegScaled); + } + + @Override + public double getLngDeg() { + return CompactPositionHelper.getLngDeg(lngDegScaled); + } + } + + private class VeryCompactBearing extends AbstractBearing { + private static final long serialVersionUID = -6474909210513108635L; + + @Override + public double getDegrees() { + return CompactPositionHelper.getDegreeBearing(degreeBearingScaled); + } + } + + public VeryCompactWindImpl(Wind wind) throws CompactionNotPossibleException { + super(wind); + if (wind.getBearing() == null) { + degreeBearingScaled = 0; + } else { + this.degreeBearingScaled = CompactPositionHelper.getDegreeBearingScaled(wind.getBearing()); + } + if (wind.getPosition() == null) { + this.latDegScaled = 0; + this.lngDegScaled = 0; + } else { + this.latDegScaled = CompactPositionHelper.getLatDegScaled(wind.getPosition()); + this.lngDegScaled = CompactPositionHelper.getLngDegScaled(wind.getPosition()); + } + this.speedInKnotsScaled = CompactPositionHelper.getKnotSpeedScaled(wind); + } + + @Override + public double getKnots() { + return CompactPositionHelper.getKnotSpeed(speedInKnotsScaled); + } + + @Override + protected Position getCompactPosition() { + return new VeryCompactPosition(); + } + + @Override + protected Bearing getCompactBearing() { + return new VeryCompactBearing(); + } +} diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java index 2e7f4e17d99..aaafe78372d 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java @@ -566,8 +566,7 @@ public class SensorFixStoreAndLoadTest { public static final String TRACK_NAME = "TestFixTrack"; public TestFixTrackImpl(ItemType trackedItem, String trackName) { - super(trackedItem, trackName, TestFixImpl.COLUMNS, - TRACK_NAME + " for " + trackedItem); + super(trackedItem, trackName, TRACK_NAME + " for " + trackedItem); } public Double getTextValue(TimePoint timePoint) { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/MockGPSFixMongoServiceFinder.java b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/MockGPSFixMongoServiceFinder.java index 241b5fff5f3..b29d32db4b8 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/MockGPSFixMongoServiceFinder.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/src/com/sap/sailing/domain/racelog/tracking/test/mock/MockGPSFixMongoServiceFinder.java @@ -4,8 +4,8 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixImpl; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixMovingImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl; import com.sap.sailing.domain.common.tracking.impl.DoubleVectorFixImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; @@ -26,9 +26,9 @@ public class MockGPSFixMongoServiceFinder extends AbstractTypeBasedServiceFinder @Override public FixMongoHandler findService(String fixType) { if (fixType.equals(GPSFixMovingImpl.class.getName()) || - fixType.equals(CompactGPSFixMovingImpl.class.getName())) return movingHandler; + fixType.equals(VeryCompactGPSFixMovingImpl.class.getName())) return movingHandler; if (fixType.equals(GPSFixImpl.class.getName()) || - fixType.equals(CompactGPSFixImpl.class.getName())) return handler; + fixType.equals(VeryCompactGPSFixImpl.class.getName())) return handler; if (fixType.equals(DoubleVectorFixImpl.class.getName())) return doubleVectorFixHandler; return null; } diff --git a/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/SwissTimingReplayService.java b/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/SwissTimingReplayService.java index 2553cc2d0d0..40347ac6d11 100755 --- a/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/SwissTimingReplayService.java +++ b/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/SwissTimingReplayService.java @@ -35,14 +35,10 @@ public interface SwissTimingReplayService { * @param link * the URL without the implicit "http://" prefix, as obtained, e.g., from * {@link SwissTimingReplayRace#getLink()}. - * @param raceName TODO * @param raceID * the SwissTiming ID for the race - * @param trackerManager TODO * @param useInternalMarkPassingAlgorithm * use our own instead of the SwissTiming-provided mark rounding / split times - * @param raceLogStore TODO - * @param regattaLogStore TODO * @param boatClassNameName * only required if {@code regattaToAddTo} is {@code null}; used for the retrieval/creation of a default * regatta diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java index e5acc80daf5..4a6fced0e2b 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java @@ -25,6 +25,7 @@ import com.sap.sailing.domain.tractracadapter.Receiver; import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants; import com.sap.sailing.domain.tractracadapter.TracTracControlPoint; import com.sap.sailing.domain.tractracadapter.impl.ControlPointAdapter; +import com.sap.sse.common.Duration; import com.sap.sse.common.Util.Pair; import com.tractrac.model.lib.api.ModelLocator; import com.tractrac.model.lib.api.event.CreateModelException; @@ -36,6 +37,7 @@ import com.tractrac.subscription.lib.api.IRaceSubscriber; import com.tractrac.subscription.lib.api.ISubscriberFactory; import com.tractrac.subscription.lib.api.SubscriberInitializationException; import com.tractrac.subscription.lib.api.SubscriptionLocator; +import com.tractrac.util.lib.api.exceptions.TimeOutException; /** * Subclassing tests have to call {@link #addListenersForStoredDataAndStartController(Iterable)} to kick off @@ -65,6 +67,7 @@ public abstract class AbstractTracTracLiveTest extends StoredTrackBasedTest { * Default set-up for an STG training session in Weymouth, 2011 * @throws SubscriberInitializationException * @throws CreateModelException + * @throws TimeOutException */ @Before public void setUp() throws MalformedURLException, IOException, InterruptedException, URISyntaxException, SubscriberInitializationException, ParseException, CreateModelException { @@ -95,26 +98,30 @@ public abstract class AbstractTracTracLiveTest extends StoredTrackBasedTest { protected void setUp(URL paramUrl, URI liveUri, URI storedUri) throws FileNotFoundException, MalformedURLException, URISyntaxException, SubscriberInitializationException, CreateModelException { // Read event data from configuration file - final IRace race = ModelLocator.getEventFactory().createRace(new URI(paramUrl.toString())); - this.race = race; - ISubscriberFactory subscriberFactory = SubscriptionLocator.getSusbcriberFactory(); - if (storedUri == null) { - eventSubscriber = subscriberFactory.createEventSubscriber(race.getEvent()); - raceSubscriber = subscriberFactory.createRaceSubscriber(race); - } else { - eventSubscriber = subscriberFactory.createEventSubscriber(race.getEvent(), liveUri, storedUri); - raceSubscriber = subscriberFactory.createRaceSubscriber(race, liveUri, storedUri); - } - assertNotNull(race); - // Initialize data controller using live and stored data sources - if (storedUri != null && storedUri.toString().startsWith("file:")) { - try { - URI oldStoredUri = storedUri; - storedUri = new URI(storedUri.toString().replaceFirst("file:/([^/])", "file:////$1")); - logger.info("Replaced storedUri "+oldStoredUri+" by "+storedUri); - } catch (URISyntaxException e) { - e.printStackTrace(); + try { + final IRace race = ModelLocator.getEventFactory().createRace(new URI(paramUrl.toString()), (int) /* timeout in milliseconds */ Duration.ONE_MINUTE.asMillis()); + this.race = race; + ISubscriberFactory subscriberFactory = SubscriptionLocator.getSusbcriberFactory(); + if (storedUri == null) { + eventSubscriber = subscriberFactory.createEventSubscriber(race.getEvent()); + raceSubscriber = subscriberFactory.createRaceSubscriber(race); + } else { + eventSubscriber = subscriberFactory.createEventSubscriber(race.getEvent(), liveUri, storedUri); + raceSubscriber = subscriberFactory.createRaceSubscriber(race, liveUri, storedUri); } + assertNotNull(race); + // Initialize data controller using live and stored data sources + if (storedUri != null && storedUri.toString().startsWith("file:")) { + try { + URI oldStoredUri = storedUri; + storedUri = new URI(storedUri.toString().replaceFirst("file:/([^/])", "file:////$1")); + logger.info("Replaced storedUri "+oldStoredUri+" by "+storedUri); + } catch (URISyntaxException e) { + e.printStackTrace(); + } + } + } catch (TimeOutException te) { + throw new RuntimeException(te); } // test cases need to start the thread calling addListenersForStoredDataAndStartController // after adding their listeners diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java index 290a02d13cc..a9f0cdd75a0 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java @@ -57,6 +57,6 @@ public class DistanceCacheInvalidationAfterLoadingFinishedTest extends TrackBase final Distance distance = speed.travel(Duration.ONE_SECOND); trackedRace.recordFix(competitor, new GPSFixMovingImpl(startPos.translateGreatCircle(bearing, distance), now.plus(Duration.ONE_SECOND), speed)); trackedRace.onStatusChanged(tdl, new TrackedRaceStatusImpl(TrackedRaceStatusEnum.TRACKING, /* progress */ 1.0)); - assertEquals(distance.getMeters(), trackedRace.getDistanceTraveled(competitor, now.plus(Duration.ONE_SECOND.times(2))).getMeters(), 0.000001); // ask 1s after the second fix + assertEquals(distance.getMeters(), trackedRace.getDistanceTraveled(competitor, now.plus(Duration.ONE_SECOND.times(2))).getMeters(), 0.01); // ask 1s after the second fix } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java index ce9baf13dfb..5dc92520644 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java @@ -74,7 +74,7 @@ public class LineAnalysisTest extends TrackBasedTest { final Distance distanceBehindLine = new MeterDistance(10); final Position behindMiddleOfLine = lineMiddle.translateGreatCircle(awayFromCourseSideOrthogonalToLine, distanceBehindLine); trackedRace.getTrack(competitor).add(new GPSFixMovingImpl(behindMiddleOfLine, now, new KnotSpeedWithBearingImpl(5, new DegreeBearingImpl(45)))); - assertEquals(distanceBehindLine.getMeters(), trackedRace.getDistanceToStartLine(competitor, now).getMeters(), 0.000001); + assertEquals(distanceBehindLine.getMeters(), trackedRace.getDistanceToStartLine(competitor, now).getMeters(), 0.01); } @Test @@ -90,7 +90,7 @@ public class LineAnalysisTest extends TrackBasedTest { final Position behindOutsideOfLine = outsideOfLine.translateGreatCircle(awayFromCourseSideOrthogonalToLine, distanceBehindLine); trackedRace.getTrack(competitor).add(new GPSFixMovingImpl(behindOutsideOfLine, now, new KnotSpeedWithBearingImpl(5, new DegreeBearingImpl(45)))); // the distance is that of the hypotenuse formed by the two cathesuses of 10m and 30m length, respectively: - assertEquals(Math.sqrt(10.*10.+30.*30.), trackedRace.getDistanceToStartLine(competitor, now).getMeters(), 0.001); + assertEquals(Math.sqrt(10.*10.+30.*30.), trackedRace.getDistanceToStartLine(competitor, now).getMeters(), 0.01); } private Mark getMark(String name) { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java index 6d0ced1c310..2386c1ebf30 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java @@ -96,7 +96,7 @@ public class MultipleClassesInRegattaTest { /* offsetToStartTimeOfSimulatedRace */ null, /* ignoreTracTracMarkPassings*/ false, EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, domainFactory, tracTracUsername, tracTracPassword, TracTracConnectionConstants.ONLINE_STATUS, TracTracConnectionConstants.ONLINE_VISIBILITY, - /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ true, /* preferReplayIfAvailable */ false); + /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ true, /* preferReplayIfAvailable */ false, /* timeoutInMillis */ -1); } @After diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java new file mode 100755 index 00000000000..b88c1a4742a --- /dev/null +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionAssert.java @@ -0,0 +1,77 @@ +package com.sap.sailing.domain.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import java.util.Set; + +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.SpeedWithBearing; +import com.sap.sailing.domain.common.Wind; +import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sailing.domain.common.tracking.GPSFixMoving; + +/** + * Contains equality assertions for "compact" fixes, allowing for deltas to be specified, assuming + * that the "compact" version of a fix may vary slightly from its original. + * + * @author Axel Uhl (d043530) + * + */ +public class PositionAssert { + public static void assertPositionEquals(Position p1, Position p2, double degreeDelta) { + assertEquals(p1.getLatDeg(), p2.getLatDeg(), degreeDelta); + assertEquals(p1.getLngDeg(), p2.getLngDeg(), degreeDelta); + } + + public static void assertGPSFixEquals(GPSFixMoving f1, GPSFixMoving f2, double positionDegreeDelta, double bearingDegreeDelta, double knotDelta) { + assertGPSFixEquals((GPSFix) f1, (GPSFix) f2, positionDegreeDelta); + assertSpeedEquals(f1.getSpeed(), f2.getSpeed(), bearingDegreeDelta, knotDelta); + } + + public static void assertBearingEquals(Bearing b1, Bearing b2, double bearingDegreeDelta) { + assertEquals(b1.getDegrees(), b2.getDegrees(), bearingDegreeDelta); + } + + public static void assertGPSFixEquals(GPSFix f1, GPSFix f2, double positionDegreeDelta) { + assertPositionEquals(f1.getPosition(), f2.getPosition(), positionDegreeDelta); + assertEquals(f1.getTimePoint(), f2.getTimePoint()); + } + + public static void assertWindEquals(Wind w1, Wind w2, double posDegDelta, double bearingDegreeDelta, double knotSpeedDelta) { + assertEquals(w1.getTimePoint(), w2.getTimePoint()); + assertPositionEquals(w1.getPosition(), w2.getPosition(), posDegDelta); + assertBearingEquals(w1.getBearing(), w2.getBearing(), bearingDegreeDelta); + assertSpeedEquals(w1, w2, bearingDegreeDelta, knotSpeedDelta); + } + + public static void assertSpeedEquals(Speed s1, Speed s2, double knotSpeedDelta) { + assertEquals(s1.getKnots(), s2.getKnots(), knotSpeedDelta); + } + + public static void assertSpeedEquals(SpeedWithBearing s1, SpeedWithBearing s2, double bearingDegreeDelta, double knotSpeedDelta) { + assertBearingEquals(s1.getBearing(), s2.getBearing(), bearingDegreeDelta); + assertSpeedEquals((Speed) s1, (Speed) s2, knotSpeedDelta); + } + + public static void assertWindEquals(Set expectedWinds, Set actualWinds, double posDegDelta, + double bearingDegreeDelta, double knotSpeedDelta) { + for (final Wind expectedWind : expectedWinds) { + boolean found = false; + for (final Wind actualWind : actualWinds) { + try { + assertWindEquals(expectedWind, actualWind, posDegDelta, bearingDegreeDelta, knotSpeedDelta); + found = true; + break; + } catch (AssertionError e) { + // not equals + } + } + if (!found) { + fail("Expected to find "+expectedWind+" in "+actualWinds+" but didn't"); + } + } + } +} diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java index 1d76669219e..5c7b653a13e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java @@ -16,8 +16,11 @@ import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.NauticalMileDistance; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixImpl; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixMovingImpl; +import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl; +import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; +import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; public class PositionTest { @@ -32,20 +35,40 @@ public class PositionTest { @Test public void testEqualityBetweenCompactAndVerbosePosition() { Position p1 = new DegreePosition(49.2, 008.3); - CompactGPSFixImpl compactFix = new CompactGPSFixImpl(p1, MillisecondsTimePoint.now()); + VeryCompactGPSFixImpl compactFix = new VeryCompactGPSFixImpl(p1, MillisecondsTimePoint.now()); assertNotSame(p1, compactFix.getPosition()); - assertEquals(p1, compactFix.getPosition()); + PositionAssert.assertPositionEquals(p1, compactFix.getPosition(), 0.000001); } @Test - public void testEqualityBetweenCompactAndVerboseSpeedWithBearing() { + public void testCompactFixRange() { + final TimePoint now = MillisecondsTimePoint.now(); + assertCompactFixHasEqualLatLng(now, 0., 0.); + assertCompactFixHasEqualLatLng(now, 90., 0.); + assertCompactFixHasEqualLatLng(now, -90., 0.); + assertCompactFixHasEqualLatLng(now, 0., 180.); + assertCompactFixHasEqualLatLng(now, 0., -180.); + assertCompactFixHasEqualLatLng(now, 45., 45.); + assertCompactFixHasEqualLatLng(now, 0., -45.); + assertCompactFixHasEqualLatLng(now, -45., 45.); + assertCompactFixHasEqualLatLng(now, 0., 45.); + } + + private void assertCompactFixHasEqualLatLng(final TimePoint now, final double latDeg, final double lngDeg) { + GPSFix fix = new VeryCompactGPSFixImpl(new DegreePosition(latDeg, lngDeg), now); + assertEquals(latDeg, fix.getPosition().getLatDeg(), 0.0000001); + assertEquals(lngDeg, fix.getPosition().getLngDeg(), 0.0000001); + } + + @Test + public void testEqualityBetweenCompactAndVerboseSpeedWithBearing() throws CompactionNotPossibleException { Position p1 = new DegreePosition(49.2, 008.3); SpeedWithBearing swb = new KnotSpeedWithBearingImpl(12, new DegreeBearingImpl(123)); - CompactGPSFixMovingImpl compactFix = new CompactGPSFixMovingImpl(p1, MillisecondsTimePoint.now(), swb); + VeryCompactGPSFixMovingImpl compactFix = new VeryCompactGPSFixMovingImpl(p1, MillisecondsTimePoint.now(), swb); assertNotSame(p1, compactFix.getPosition()); - assertEquals(p1, compactFix.getPosition()); + PositionAssert.assertPositionEquals(p1, compactFix.getPosition(), 0.000001); assertNotSame(swb, compactFix.getSpeed()); - assertEquals(swb, compactFix.getSpeed()); + PositionAssert.assertSpeedEquals(swb, compactFix.getSpeed(), /* bearing deg delta */ 0.1, /* knot speed delta */ 0.1); } @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java index d77f4c76acb..1014e9c2ea8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java @@ -338,7 +338,7 @@ public class ReachingLegTest extends TrackBasedTest { Distance plattnersDistanceToLeader = getTrackedRace().getWindwardDistanceToCompetitorFarthestAhead(plattner, timePointToConsider, WindPositionMode.LEG_MIDDLE); assertEquals(0., schomaekersDistanceToLeader.getMeters(), 0.00001); // distance to leading Schomaeker expected to be the entire upwind distance plus the offset distance plus half the downwind - assertEquals(distanceOfReachingLeg.getMeters()+windwardDistanceOfUpwindLeg.getMeters()*1.5, plattnersDistanceToLeader.getMeters(), 0.001); + assertEquals(distanceOfReachingLeg.getMeters()+windwardDistanceOfUpwindLeg.getMeters()*1.5, plattnersDistanceToLeader.getMeters(), 0.01); } @Test @@ -373,9 +373,9 @@ public class ReachingLegTest extends TrackBasedTest { .getEstimatedPosition(timePointToConsider, /* extrapolate */false) .getDistance( getTrackedRace().getTrack(plattner).getEstimatedPosition(timePointToConsider, /* extrapolate */ - false)).getMeters(), 0.00001); + false)).getMeters(), 0.01); // however, projected onto the leg their distance should be 0 Distance plattnersDistanceToLeader = getTrackedRace().getWindwardDistanceToCompetitorFarthestAhead(plattner, timePointToConsider, WindPositionMode.LEG_MIDDLE); - assertEquals(0., plattnersDistanceToLeader.getMeters(), 0.00001); + assertEquals(0., plattnersDistanceToLeader.getMeters(), 0.01); } } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StarbordSideOfStartLineRecognitionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StarbordSideOfStartLineRecognitionTest.java index c8a621c5707..911ed8fe8a8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StarbordSideOfStartLineRecognitionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StarbordSideOfStartLineRecognitionTest.java @@ -141,7 +141,7 @@ public class StarbordSideOfStartLineRecognitionTest { MockedTrackedRaceImpl trackedRace = createTrackedRaceWithMarkPositions(startPortPosition, startStarboardPosition, windwardPosition); Position p = trackedRace.getOrCreateTrack(trackedRace.getStartLine(now).getStarboardMarkWhileApproachingLine()). getEstimatedPosition(now, /* extrapolate */ false); - assertEquals(startStarboardPosition, p); + PositionAssert.assertPositionEquals(startStarboardPosition, p, 0.0000001); } @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java index 2f5c7bf7de5..ce1092fcf4e 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java @@ -43,7 +43,8 @@ import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.MeterPerSecondSpeedWithDegreeBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sailing.domain.common.tracking.GPSFixMoving; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixMovingImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl; +import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; @@ -63,6 +64,7 @@ import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; public class TrackTest { + private static final int MILLIS_BETWEEN_FIXES = 3000000; private DynamicGPSFixTrack track; private GPSFixMovingImpl gpsFix1; private GPSFixMovingImpl gpsFix2; @@ -75,7 +77,7 @@ public class TrackTest { track = new DynamicGPSFixMovingTrackImpl(new BoatImpl("MyFirstBoat", new BoatClassImpl("505", /* typicallyStartsUpwind */ true), null), /* millisecondsOverWhichToAverage */5000, /* no smoothening */null); TimePoint now1 = MillisecondsTimePoint.now(); - TimePoint now2 = addMillisToTimepoint(now1, 3); + TimePoint now2 = addMillisToTimepoint(now1, MILLIS_BETWEEN_FIXES); DegreePosition position1 = new DegreePosition(1, 2); DegreePosition position2 = new DegreePosition(1, 3); gpsFix1 = new GPSFixMovingImpl( @@ -84,19 +86,19 @@ public class TrackTest { new DegreeBearingImpl(90))); gpsFix2 = new GPSFixMovingImpl(position2, now2, new KnotSpeedWithBearingImpl(position1.getDistance(position2) .inTime(now2.asMillis() - gpsFix1.getTimePoint().asMillis()).getKnots(), new DegreeBearingImpl(90))); - TimePoint now3 = addMillisToTimepoint(now2, 3); + TimePoint now3 = addMillisToTimepoint(now2, MILLIS_BETWEEN_FIXES); Position position3 = new DegreePosition(1, 4); gpsFix3 = new GPSFixMovingImpl( position3, now3, new KnotSpeedWithBearingImpl(position2.getDistance(position3) .inTime(now3.asMillis() - gpsFix2.getTimePoint().asMillis()).getKnots(), new DegreeBearingImpl(0))); - TimePoint now4 = addMillisToTimepoint(now3, 3); + TimePoint now4 = addMillisToTimepoint(now3, MILLIS_BETWEEN_FIXES); Position position4 = new DegreePosition(3, 4); gpsFix4 = new GPSFixMovingImpl( position4, now4, new KnotSpeedWithBearingImpl(position3.getDistance(position4) .inTime(now4.asMillis() - gpsFix3.getTimePoint().asMillis()).getKnots(), new DegreeBearingImpl(0))); - TimePoint now5 = addMillisToTimepoint(now4, 3); + TimePoint now5 = addMillisToTimepoint(now4, MILLIS_BETWEEN_FIXES); Position position5 = new DegreePosition(5, 4); gpsFix5 = new GPSFixMovingImpl(position5, now5, new KnotSpeedWithBearingImpl(position4.getDistance(position5) .inTime(now5.asMillis() - gpsFix4.getTimePoint().asMillis()).getKnots(), new DegreeBearingImpl(0))); @@ -106,6 +108,7 @@ public class TrackTest { track.addGPSFix(gpsFix4); track.addGPSFix(gpsFix5); } + /** * Tests for a incorrect method of estimating Positions */ @@ -128,7 +131,6 @@ public class TrackTest { assertEquals(45, track.getEstimatedPosition(t1.plus(15), true).getLatDeg(), 0.00000001); assertEquals(60, track.getEstimatedPosition(t1.plus(20), true).getLatDeg(), 0.00000001); assertEquals(90, track.getEstimatedPosition(t1.plus(30), true).getLatDeg(), 0.00000001); - } finally { track.unlockAfterRead(); } @@ -221,7 +223,7 @@ public class TrackTest { now = nextNow; } assertEquals(speed.travel(start, now.minus(NUMBER_OF_FIXES_AT_SAME_POSITION * 1000)).getMeters(), - track.getDistanceTraveled(start, now).getMeters(), 0.00000001); + track.getDistanceTraveled(start, now).getMeters(), 0.01); } private void addFixesWithSamePositionButProgressingTime(DynamicGPSFixTrack track, @@ -320,7 +322,7 @@ public class TrackTest { cacheBarrier.await(20, TimeUnit.SECONDS); cacheDone.await(20, TimeUnit.SECONDS); testDone.await(); - assertEquals(2., maxSpeed[0], 0.001); + assertEquals(2., maxSpeed[0], 0.1); } @Test @@ -366,12 +368,12 @@ public class TrackTest { 1, new DegreeBearingImpl(123))); track.addGPSFix(fix3); assertEquals(2., track.getMaximumSpeedOverGround(new MillisecondsTimePoint(0), new MillisecondsTimePoint(7200000)). - getB().getKnots(), 0.001); // produces a cache entry that ends + getB().getKnots(), 0.01); // produces a cache entry that ends GPSFixMoving fix4 = new GPSFixMovingImpl(new DegreePosition(0, 0), new MillisecondsTimePoint(10800000), new KnotSpeedWithBearingImpl( 1, new DegreeBearingImpl(123))); track.addGPSFix(fix4); assertEquals(2., track.getMaximumSpeedOverGround(new MillisecondsTimePoint(0), new MillisecondsTimePoint(10800000)). - getB().getKnots(), 0.001); + getB().getKnots(), 0.01); } @Test @@ -383,7 +385,7 @@ public class TrackTest { 2, new DegreeBearingImpl(123))); track.addGPSFix(fast); assertEquals(2., track.getMaximumSpeedOverGround(new MillisecondsTimePoint(0), new MillisecondsTimePoint(10800000)). - getB().getKnots(), 0.001); + getB().getKnots(), 0.01); track.addGPSFix(slow); track.lockForRead(); try { @@ -392,7 +394,7 @@ public class TrackTest { track.unlockAfterRead(); } assertEquals(1., track.getMaximumSpeedOverGround(new MillisecondsTimePoint(0), new MillisecondsTimePoint(10800000)). - getB().getKnots(), 0.001); + getB().getKnots(), 0.01); } @Test @@ -405,7 +407,7 @@ public class TrackTest { 2, new DegreeBearingImpl(123))); track.addGPSFix(fix2); assertEquals(2., track.getMaximumSpeedOverGround(new MillisecondsTimePoint(0), new MillisecondsTimePoint(7200000)). - getB().getKnots(), 0.001); // produces a cache entry that ends + getB().getKnots(), 0.01); // produces a cache entry that ends GPSFixMoving fix3 = new GPSFixMovingImpl(new DegreePosition(0, 0), new MillisecondsTimePoint(7200000), new KnotSpeedWithBearingImpl( 1, new DegreeBearingImpl(123))); track.addGPSFix(fix3); @@ -413,7 +415,7 @@ public class TrackTest { 1, new DegreeBearingImpl(123))); track.addGPSFix(fix4); assertEquals(2., track.getMaximumSpeedOverGround(new MillisecondsTimePoint(0), new MillisecondsTimePoint(10800000)). - getB().getKnots(), 0.001); + getB().getKnots(), 0.01); } /** @@ -462,7 +464,7 @@ public class TrackTest { track.addGPSFix(f2); track.addGPSFix(f3); SpeedWithBearing average = track.getEstimatedSpeed(t2); - assertEquals(0, average.getBearing().getDegrees(), 0.00001); + PositionAssert.assertBearingEquals(new DegreeBearingImpl(0), average.getBearing(), 0.1); } @Test @@ -477,7 +479,7 @@ public class TrackTest { track.addGPSFix(f1); track.addGPSFix(f2); track.addGPSFix(f3); - assertEquals(f2, track.getFirstFixAtOrAfter(f2.getTimePoint())); // expect the fix to still be valid, but only its provided speed shall be ignored + PositionAssert.assertGPSFixEquals(f2, track.getFirstFixAtOrAfter(f2.getTimePoint()), /* pos deg delta */ 0.00001, /* bearing deg delta */ 0.01, /* knot delta */ 0.01); // expect the fix to still be valid, but only its provided speed shall be ignored } @Test @@ -492,7 +494,7 @@ public class TrackTest { track.addGPSFix(f1); track.addGPSFix(f2); track.addGPSFix(f3); - assertEquals(f3, track.getFirstFixAtOrAfter(f2.getTimePoint())); // expect the f2 fix to be invalid + PositionAssert.assertGPSFixEquals(f3, track.getFirstFixAtOrAfter(f2.getTimePoint()), /* pos deg delta */ 0.00001, /* bearing deg delta */ 0.01, /* knot delta */ 0.01); // expect the fix to still be valid, but only its provided speed shall be ignored } @Test @@ -508,7 +510,7 @@ public class TrackTest { track.addGPSFix(f2); track.addGPSFix(f3); // expect the f2 fix to be invalid because provided speed is too different - assertEquals(0, f3.getPosition().getDistance(track.getFirstFixAtOrAfter(f2.getTimePoint()).getPosition()).getMeters(), 0.001); + assertEquals(0, f3.getPosition().getDistance(track.getFirstFixAtOrAfter(f2.getTimePoint()).getPosition()).getMeters(), 0.01); } @Test @@ -523,9 +525,9 @@ public class TrackTest { track.addGPSFix(f1); track.addGPSFix(f2); track.addGPSFix(f3); - assertEquals(f2, track.getFirstFixAtOrAfter(f2.getTimePoint())); // expect the fix to still be valid, but only its provided speed shall be ignored + PositionAssert.assertGPSFixEquals(f2, track.getFirstFixAtOrAfter(f2.getTimePoint()), /* pos deg delta */ 0.00001, /* bearing deg delta */ 0.01, /* knot delta */ 0.01); // expect the fix to still be valid, but only its provided speed shall be ignored SpeedWithBearing average = track.getEstimatedSpeed(t2); - assertEquals(1, average.getKnots(), 0.001); + assertEquals(1, average.getKnots(), 0.01); } @Test @@ -541,7 +543,7 @@ public class TrackTest { track.addGPSFix(f2); track.addGPSFix(f3); SpeedWithBearing average = track.getRawEstimatedSpeed(t2); - assertEquals(0, average.getBearing().getDegrees(), 0.00001); + PositionAssert.assertBearingEquals(new DegreeBearingImpl(0), average.getBearing(), /* deg delta */ 0.1); } /** @@ -560,14 +562,14 @@ public class TrackTest { Iterator subsetIter = subset.iterator(); // start iteration GPSFixMoving firstOfSubset = subsetIter.next(); - assertEquals(gpsFix2, firstOfSubset); + PositionAssert.assertGPSFixEquals(gpsFix2, firstOfSubset, /* pos deg delta */ 0.00001, /* bearing deg delta */ 0.01, /* knot delta */ 0.01); // now add a fix: TimePoint now6 = addMillisToTimepoint(gpsFix5.getTimePoint(), 3); track.addGPSFix(new GPSFixMovingImpl( new DegreePosition(6, 5), now6, new KnotSpeedWithBearingImpl(2, new DegreeBearingImpl(0)))); try { GPSFixMoving secondOfSubset = subsetIter.next(); - assertEquals(gpsFix3, secondOfSubset); + PositionAssert.assertGPSFixEquals(gpsFix3, secondOfSubset, /* pos deg delta */ 0.000001, /* bearing deg delta */ 0.01, /* knot delta */ 0.01); fail("adding a fix interferes with iteration over subSet of track's fixes"); } catch (ConcurrentModificationException e) { // this is what we expected @@ -675,7 +677,7 @@ public class TrackTest { TimePoint afterTimePoint = new MillisecondsTimePoint(millis + (millis-lastMillis)); Position extrapolatedPosition = track.getEstimatedPosition(afterTimePoint, true); assertEquals(0.5, fix.getPosition().getDistance(extrapolatedPosition).getMeters() - / lastFix.getPosition().getDistance(extrapolatedPosition).getMeters(), 0.00001); + / lastFix.getPosition().getDistance(extrapolatedPosition).getMeters(), 0.01); } @Test @@ -792,7 +794,7 @@ public class TrackTest { bearing = new DegreeBearingImpl(bearing.getDegrees() + 1); } invalidationCalls.clear(); - assertEquals(speed.getMetersPerSecond()*(steps-1), track.getDistanceTraveled(now, start).getMeters(), 0.01); + assertEquals(speed.getMetersPerSecond()*(steps-1), track.getDistanceTraveled(now, start).getMeters(), 0.02); final com.sap.sse.common.Util.Pair> fullIntervalCacheEntry = distanceCache.getEarliestFromAndDistanceAtOrAfterFrom(now, start); assertNotNull(fullIntervalCacheEntry); // no more entry for "to"-value start in cache assertEquals(start, fullIntervalCacheEntry.getA()); @@ -808,7 +810,7 @@ public class TrackTest { invalidationCalls.clear(); final TimePoint timePointOfLastOriginalFix = track.getLastRawFix().getTimePoint(); assertEquals(speed.getMetersPerSecond() * (steps - 1), - track.getDistanceTraveled(now, timePointOfLastOriginalFix).getMeters(), 0.01); + track.getDistanceTraveled(now, timePointOfLastOriginalFix).getMeters(), 0.02); final com.sap.sse.common.Util.Pair> newFullIntervalCacheEntry = distanceCache .getEarliestFromAndDistanceAtOrAfterFrom(now, timePointOfLastOriginalFix); assertNotNull(newFullIntervalCacheEntry); // no more entry for "to"-value start in cache @@ -861,7 +863,7 @@ public class TrackTest { track.unlockAfterRead(); } GPSFix polishedLastFix2 = track.getLastFixBefore(new MillisecondsTimePoint(Long.MAX_VALUE)); // get the last smoothened fix... - assertEquals(fix, polishedLastFix2); + PositionAssert.assertGPSFixEquals(fix, polishedLastFix2, /* pos deg delta */ 0.000001); assertEquals(speed.getMetersPerSecond()*steps, track.getDistanceTraveled(now, start).getMeters(), 0.01); } @@ -1003,7 +1005,7 @@ public class TrackTest { final TimePoint stripTo = start.minus(2*timeBetweenFixesInMillis); assertEquals(speed.getMetersPerSecond()*(steps-3), track.getDistanceTraveled(stripFrom, stripTo).getMeters(), 0.01); - assertEquals(speed.getMetersPerSecond()*(steps-1), track.getDistanceTraveled(now, start).getMeters(), 0.01); + assertEquals(speed.getMetersPerSecond()*(steps-1), track.getDistanceTraveled(now, start).getMeters(), 0.02); assertTrue(invalidationCalls.isEmpty()); // expect a cache entry exactly for the strip's boundaries com.sap.sse.common.Util.Pair> stripCacheEntry = distanceCache.getEarliestFromAndDistanceAtOrAfterFrom(stripFrom, stripTo); @@ -1054,8 +1056,7 @@ public class TrackTest { assertEquals(gpsFix2.getPosition().getLatDeg(), estimatedPosNew.getLatDeg(), 0.5); assertEquals(gpsFix2.getPosition().getLngDeg(), estimatedPosNew.getLngDeg(), 0.5); SpeedWithBearing estimatedSpeedNew = track.getEstimatedSpeed(normalFixesTime); - assertEquals(estimatedSpeed.getKnots(), estimatedSpeedNew.getKnots(), 0.001); - assertEquals(estimatedSpeed.getBearing().getDegrees(), estimatedSpeedNew.getBearing().getDegrees(), 0.001); + PositionAssert.assertSpeedEquals(estimatedSpeed, estimatedSpeedNew, /* bearing deg delta */ 0.1, /* knot speed delta */ 0.1); } @Test @@ -1262,21 +1263,21 @@ public class TrackTest { @Test public void testFrequency() { - assertEquals(3, track.getAverageIntervalBetweenFixes().asMillis()); - assertEquals(3, track.getAverageIntervalBetweenRawFixes().asMillis()); + assertEquals(MILLIS_BETWEEN_FIXES, track.getAverageIntervalBetweenFixes().asMillis()); + assertEquals(MILLIS_BETWEEN_FIXES, track.getAverageIntervalBetweenRawFixes().asMillis()); } @Test - public void testEstimatedSpeedCaching() { + public void testEstimatedSpeedCaching() throws CompactionNotPossibleException { GPSFixMoving originalFix = new GPSFixMovingImpl(new DegreePosition(12, 34), MillisecondsTimePoint.now(), new KnotSpeedWithBearingImpl(9, new DegreeBearingImpl(123))); - GPSFixMoving fix = new CompactGPSFixMovingImpl(originalFix); + GPSFixMoving fix = new VeryCompactGPSFixMovingImpl(originalFix); assertFalse(fix.isEstimatedSpeedCached()); final KnotSpeedWithBearingImpl estimatedSpeed = new KnotSpeedWithBearingImpl(9.1, new DegreeBearingImpl(124)); fix.cacheEstimatedSpeed(estimatedSpeed); assertTrue(fix.isEstimatedSpeedCached()); SpeedWithBearing cachedEstimatedSpeed = fix.getCachedEstimatedSpeed(); - assertEquals(estimatedSpeed, cachedEstimatedSpeed); + PositionAssert.assertSpeedEquals(estimatedSpeed, cachedEstimatedSpeed, /* bearing deg delta */ 0.1, /* knot speed delta */ 0.1); fix.invalidateEstimatedSpeedCache(); assertFalse(fix.isEstimatedSpeedCached()); } @@ -1287,8 +1288,9 @@ public class TrackTest { assertFalse(compactFix3.isEstimatedSpeedCached()); SpeedWithBearing fix3EstimatedSpeed = track.getEstimatedSpeed(gpsFix3.getTimePoint()); assertTrue(compactFix3.isEstimatedSpeedCached()); - assertEquals(fix3EstimatedSpeed, compactFix3.getCachedEstimatedSpeed()); - assertEquals(fix3EstimatedSpeed, track.getEstimatedSpeed(gpsFix3.getTimePoint())); // fetch again from the cache + PositionAssert.assertSpeedEquals(fix3EstimatedSpeed, compactFix3.getCachedEstimatedSpeed(), /* bearing deg delta */ 0.1, /* knot speed delta */ 0.1); + PositionAssert.assertSpeedEquals(fix3EstimatedSpeed, track.getEstimatedSpeed(gpsFix3.getTimePoint()), + /* bearing deg delta */ 0.1, /* knot speed delta */ 0.1); // fetch again from the cache // assuming that all test fixes are within a few milliseconds and the averaging interval is much larger than that, // adding a single fix in the middle should invalidate the cache track.add(new GPSFixMovingImpl(gpsFix3.getPosition(), gpsFix3.getTimePoint().plus(1), gpsFix3.getSpeed())); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java index dbc225179ca..70ee5c4ea27 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java @@ -68,7 +68,9 @@ public class UnicodeCharactersInCompetitorNamesTest { /* startOfTracking */null, /* endOfTracking */null, /* delayToLiveInMillis */0l, /* offsetToStartTimeOfSimulatedRace */ null, /* ignoreTracTracMarkPassings*/ false, EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, domainFactory, - "tracTest", "tracTest", "", "", /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ true, /* preferReplayIfAvailable */ false), RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); + "tracTest", "tracTest", "", "", /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ true, + /* preferReplayIfAvailable */ false, /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS), + RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); Iterable competitors = fourtyninerYellow_2.getRaceHandle().getRace().getCompetitors(); for (Competitor competitor : competitors) { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java index 38799401bfc..f0f7d2a0ad1 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java @@ -186,9 +186,9 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest }; Wind estimatedWindDirection = track.getAveragedWind(/* position */ null, checkTime); assertNotNull(estimatedWindDirection); - assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.00000001); + assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.1); assertFalse(cachedFixes.isEmpty()); - assertEquals(185., cachedFixes.values().iterator().next().getObject().getBearing().getDegrees(), 0.00000001); + assertEquals(185., cachedFixes.values().iterator().next().getObject().getBearing().getDegrees(), 0.1); // now invert leg's type by moving the top mark along the wind from the leeward gate: Iterator waypointsIter = getTrackedRace().getRace().getCourse().getWaypoints().iterator(); Waypoint leewardMark = waypointsIter.next(); @@ -202,7 +202,7 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest assertEquals(LegType.DOWNWIND, firstLeg.getLegType(fixTime)); Wind estimatedWindDirectionDownwind = track.getAveragedWind(/* position */ null, checkTime); assertNotNull(estimatedWindDirectionDownwind); - assertEquals(185., estimatedWindDirectionDownwind.getBearing().getDegrees(), 0.00000001); + assertEquals(185., estimatedWindDirectionDownwind.getBearing().getDegrees(), 0.1); } @Test @@ -229,15 +229,15 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest }; Wind estimatedWindDirection = track.getAveragedWind(/* position */ null, checkTime); assertNotNull(estimatedWindDirection); - assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.00000001); + assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.1); assertFalse(cachedFixes.isEmpty()); - assertEquals(185., cachedFixes.values().iterator().next().getObject().getBearing().getDegrees(), 0.00000001); + assertEquals(185., cachedFixes.values().iterator().next().getObject().getBearing().getDegrees(), 0.1); // now clear set of cached fixes, ask again and ensure nothing is cached again: cachedFixes.clear(); Wind estimatedWindDirectionCached = track.getAveragedWind(/* position */ null, checkTime); assertTrue(cachedFixes.isEmpty()); assertNotNull(estimatedWindDirectionCached); - assertEquals(185., estimatedWindDirectionCached.getBearing().getDegrees(), 0.00000001); + assertEquals(185., estimatedWindDirectionCached.getBearing().getDegrees(), 0.1); // now add a GPS fix and make sure the cache is invalidated by adding it inside the averaging interval now = new MillisecondsTimePoint(checkTime.asMillis() + track.getMillisecondsOverWhichToAverageWind()/2); setBearingForCompetitor(competitors.get(0), now, 330); @@ -257,7 +257,7 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest setBearingForCompetitor(competitors.get(0), now, 320); setBearingForCompetitor(competitors.get(1), now, 50); Wind estimatedWindDirection = getTrackedRace().getEstimatedWindDirection(now); - assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.00000001); + assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.1); } @Test @@ -268,7 +268,7 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest setBearingForCompetitor(competitors.get(1), now, 50); setBearingForCompetitor(competitors.get(2), new MillisecondsTimePoint(0), 100); // this shouldn't disturb the estimation because it's too old Wind estimatedWindDirection = getTrackedRace().getEstimatedWindDirection(now); - assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.00000001); + assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.1); } @Test @@ -280,7 +280,7 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest setBearingForCompetitor(competitors.get(1), now, 50); setBearingForCompetitor(competitors.get(2), markPassingTimePoint, 100); // this shouldn't disturb the estimation because it's too old Wind estimatedWindDirection = getTrackedRace().getEstimatedWindDirection(now); - assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.00000001); + assertEquals(185., estimatedWindDirection.getBearing().getDegrees(), 0.1); } @Test @@ -318,7 +318,7 @@ public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest setBearingForCompetitor(competitors.get(2), now, 135); setBearingForCompetitor(competitors.get(3), now, 220); // on the same tack, should give no read-out Wind estimatedWindDirection = getTrackedRace().getEstimatedWindDirection(now); - assertEquals(177.5, estimatedWindDirection.getBearing().getDegrees(), 0.00000001); + assertEquals(177.5, estimatedWindDirection.getBearing().getDegrees(), 0.1); } @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java index 149dbcf88b1..353c8f65431 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java @@ -43,10 +43,12 @@ import com.sap.sailing.domain.common.confidence.Weigher; import com.sap.sailing.domain.common.confidence.impl.PositionAndTimePointWeigher; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; +import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.WindImpl; -import com.sap.sailing.domain.common.tracking.impl.CompactWindImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactWindImpl; +import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; import com.sap.sailing.domain.confidence.ConfidenceBasedWindAverager; import com.sap.sailing.domain.confidence.ConfidenceFactory; import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; @@ -86,7 +88,7 @@ public class WindTest { track.add(wind1); track.add(wind2); Wind average = track.getAveragedWind(pos, middle); - assertEquals(0., average.getBearing().getDifferenceTo(new DegreeBearingImpl(0)).getDegrees(), 0.0001); + PositionAssert.assertBearingEquals(new DegreeBearingImpl(0), average.getBearing().getDifferenceTo(new DegreeBearingImpl(0)), 0.01); } @Test @@ -109,14 +111,14 @@ public class WindTest { for (Wind wind : track.getFixes()) { actualWind.add(wind); } - assertEquals(expectedWind, actualWind); + PositionAssert.assertWindEquals(expectedWind, actualWind, /* pos deg delta */ 0.000001, /* bearing deg delta */ 0.1, /* knot speed delta */ 0.1); } finally { track.unlockAfterRead(); } } @Test - public void testWindEquality() { + public void testWindEquality() throws CompactionNotPossibleException { Position p1 = new DegreePosition(1, 2); Position p2 = new DegreePosition(4, 5); TimePoint t1 = MillisecondsTimePoint.now(); @@ -124,8 +126,8 @@ public class WindTest { SpeedWithBearing s1 = new KnotSpeedWithBearingImpl(12, new DegreeBearingImpl(3)); SpeedWithBearing s2 = new KnotSpeedWithBearingImpl(22, new DegreeBearingImpl(123)); Wind w1 = new WindImpl(p1, t1, s1); - Wind w2 = new CompactWindImpl(w1); - assertEquals(w1, w2); + Wind w2 = new VeryCompactWindImpl(w1); + PositionAssert.assertWindEquals(w1, w2, /* pos deg delta */ 0.000001, /* bearing deg delta */ 0.1, /* knot speed delta */ 0.1); assertEquals(w1.hashCode(), w2.hashCode()); Wind w3 = new WindImpl(p2, t2, s2); assertFalse(w1.equals(w3)); @@ -163,9 +165,9 @@ public class WindTest { track.add(wind7); // interval does bearely reach 20's burst because 0 has 0 length and 1000..30000 has 29000 length - assertEquals(20, track.getAveragedWind(pos, new MillisecondsTimePoint(1)).getKnots(), 0.00000001); + PositionAssert.assertSpeedEquals(new KnotSpeedImpl(20), track.getAveragedWind(pos, new MillisecondsTimePoint(1)), 0.02); // interval uses the two fixes to the left (0, 1000)=1000 and three to the right (2000, 10000, 30000)=28000 - assertEquals(20, track.getAveragedWind(pos, new MillisecondsTimePoint(1001)).getKnots(), 0.00000001); + PositionAssert.assertSpeedEquals(new KnotSpeedImpl(20), track.getAveragedWind(pos, new MillisecondsTimePoint(1001)), 0.02); // in the middle of the "hole", fetches (0, 1000, 2000, 10000)=10000 and (30000, 40000)=10000, so 20000ms worth of wind final double averageFor20000 = track.getAveragedWind(pos, new MillisecondsTimePoint(20000)).getKnots(); // value is hard to predict exactly because time difference-based confidences rate fixes closer to 20000ms higher than those further away @@ -183,8 +185,7 @@ public class WindTest { Wind wind = new WindImpl(pos, new MillisecondsTimePoint(0), new KnotSpeedWithBearingImpl(10, new DegreeBearingImpl(123))); track.add(wind); Wind estimate = track.getAveragedWind(pos, new MillisecondsTimePoint(0)); - assertEquals(10, estimate.getKnots(), 0.000000001); - assertEquals(123, estimate.getBearing().getDegrees(), 0.000000001); + PositionAssert.assertSpeedEquals(new KnotSpeedWithBearingImpl(10, new DegreeBearingImpl(123)), estimate, /* deg bearing delta */ 0.1, /* knot speed delta */ 0.01); } @Test @@ -195,8 +196,8 @@ public class WindTest { track.add(wind); // we only have one measurement; this should be extrapolated because it's our best guess Wind estimate = track.getAveragedWind(pos, new MillisecondsTimePoint(1000)); - assertEquals(10, estimate.getKnots(), 0.000000001); - assertEquals(123, estimate.getBearing().getDegrees(), 0.000000001); + PositionAssert.assertSpeedEquals(new KnotSpeedImpl(10), estimate, 0.01); + PositionAssert.assertBearingEquals(new DegreeBearingImpl(123), estimate.getBearing(), 0.01); } @Test @@ -208,8 +209,7 @@ public class WindTest { // we only have one measurement; this should be extrapolated because it's our best guess even if // the last measurement was longer ago than our smoothening interval Wind estimate = track.getAveragedWind(pos, new MillisecondsTimePoint(AVERAGING_INTERVAL_MILLIS+1000)); - assertEquals(10, estimate.getKnots(), 0.000000001); - assertEquals(123, estimate.getBearing().getDegrees(), 0.000000001); + PositionAssert.assertSpeedEquals(new KnotSpeedWithBearingImpl(10, new DegreeBearingImpl(123)), estimate, /* deg bearing delta */ 0.1, /* knot speed delta */ 0.01); } @Test @@ -221,8 +221,7 @@ public class WindTest { Wind wind2 = new WindImpl(pos, new MillisecondsTimePoint(1000), new KnotSpeedWithBearingImpl(20, new DegreeBearingImpl(100))); track.add(wind2); Wind estimate = track.getAveragedWind(pos, new MillisecondsTimePoint(500)); - assertEquals(15, estimate.getKnots(), 0.000000001); - assertEquals(100, estimate.getBearing().getDegrees(), 0.00000001); + PositionAssert.assertSpeedEquals(new KnotSpeedWithBearingImpl(15, new DegreeBearingImpl(100)), estimate, /* deg bearing delta */ 0.1, /* knot speed delta */ 0.01); } @Test @@ -234,8 +233,7 @@ public class WindTest { Wind wind2 = new WindImpl(pos, new MillisecondsTimePoint(1000), new KnotSpeedWithBearingImpl(10, new DegreeBearingImpl(100))); track.add(wind2); Wind estimate = track.getAveragedWind(pos, new MillisecondsTimePoint(2000)); - assertEquals(10, estimate.getKnots(), 0.000000001); - assertEquals(105, estimate.getBearing().getDegrees(), 0.6); // some tolerance needed because of time-based confidence + PositionAssert.assertSpeedEquals(new KnotSpeedWithBearingImpl(10, new DegreeBearingImpl(105)), estimate, /* deg bearing delta, some tolerance needed because of time-based confidence */ 0.6, /* knot speed delta */ 0.01); } @Test @@ -266,7 +264,7 @@ public class WindTest { TimePoint timePoint = new MillisecondsTimePoint(df.parse("2009-07-11T17:31:38").getTime()); Wind result = track.getAveragedWind(null, timePoint); // expectation: take two from left (because they are closer than AVERAGING_INTERVAL_MILLIS apart), one from right side: - assertEquals((wind1.getKnots() + wind2.getKnots() + wind3.getKnots()) / 3, result.getKnots(), 0.000000001); + assertEquals((wind1.getKnots() + wind2.getKnots() + wind3.getKnots()) / 3, result.getKnots(), 0.01); assertEquals(80., result.getBearing().getDegrees(), 5); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/JorgesTracTracParallelLoadingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/JorgesTracTracParallelLoadingTest.java index e90db1538bb..e2bb443f9f6 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/JorgesTracTracParallelLoadingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/tractrac/JorgesTracTracParallelLoadingTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; +import com.sap.sse.common.Duration; import com.tractrac.model.lib.api.ModelLocator; import com.tractrac.model.lib.api.data.IControlPassing; import com.tractrac.model.lib.api.data.IControlPassings; @@ -66,7 +67,7 @@ public class JorgesTracTracParallelLoadingTest { threads.add(new Thread(()->{ try { // Download the parameters file and load the race - IRace race = ModelLocator.getEventFactory().createRace(new URI(paramsURIs.get(index))); + IRace race = ModelLocator.getEventFactory().createRace(new URI(paramsURIs.get(index)), (int) /* timeout in milliseconds */ Duration.ONE_MINUTE.asMillis()); // Create the subscriptions SubscriptionLogger subscriptionLogger = new SubscriptionLogger(race); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationTest.java index 5e911820806..556210599a2 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/PositionInterpolationAndExtrapolationTest.java @@ -1,10 +1,9 @@ package com.sap.sailing.domain.tracking.impl; -import static org.junit.Assert.assertEquals; - import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.tracking.GPSFix; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; @@ -22,7 +21,7 @@ public abstract class PositionInterpolationAndExtrapolationTest getTrack() { diff --git a/java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/TracTracConnectivityParamsHandler.java b/java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/TracTracConnectivityParamsHandler.java index 32d2823ef97..0c397e2e42c 100644 --- a/java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/TracTracConnectivityParamsHandler.java +++ b/java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/TracTracConnectivityParamsHandler.java @@ -7,6 +7,7 @@ import java.util.Map; import com.sap.sailing.domain.racelog.RaceLogStore; import com.sap.sailing.domain.regattalog.RegattaLogStore; +import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.RaceTrackingConnectivityParameters; import com.sap.sailing.domain.tracking.impl.AbstractRaceTrackingConnectivityParametersHandler; import com.sap.sailing.domain.tractracadapter.DomainFactory; @@ -88,7 +89,8 @@ public class TracTracConnectivityParamsHandler extends AbstractRaceTrackingConne map.get(TRAC_TRAC_PASSWORD)==null?null:map.get(TRAC_TRAC_PASSWORD).toString(), map.get(RACE_STATUS)==null?null:map.get(RACE_STATUS).toString(), map.get(RACE_VISIBILITY)==null?null:map.get(RACE_VISIBILITY).toString(), isTrackWind(map), - isCorrectWindDirectionByMagneticDeclination(map), /* preferReplayIfAvailable */ true); + isCorrectWindDirectionByMagneticDeclination(map), /* preferReplayIfAvailable */ true, + /* default timeout for obtaining IRace object from params URL */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); } @Override diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java index 070882e1277..f507435af09 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java @@ -256,12 +256,13 @@ public interface DomainFactory { * {@code File}) then if this parameter is {@code true} the race will be loaded from the replay file * instead of the {@code storedURI}/{@code liveURI} specified. This is particularly useful for restoring * races if since the last connection the race was migrated to a replay file format. + * @param timeoutInMillis TODO */ RaceTrackingConnectivityParameters createTrackingConnectivityParameters(URL paramURL, URI liveURI, URI storedURI, URI courseDesignUpdateURI, TimePoint startOfTracking, TimePoint endOfTracking, long delayToLiveInMillis, Duration offsetToStartTimeOfSimulatedRace, boolean useInternalMarkPassingAlgorithm, RaceLogStore raceLogStore, RegattaLogStore regattaLogStore, String tracTracUsername, String tracTracPassword, String raceStatus, String raceVisibility, boolean trackWind, boolean correctWindDirectionByMagneticDeclination, - boolean preferReplayIfAvailable) throws Exception; + boolean preferReplayIfAvailable, int timeoutInMillis) throws Exception; /** * Removes all knowledge about tractracRace which includes removing it from the race cache, from the * {@link com.sap.sailing.domain.base.Regatta} and, if a {@link TrackedRace} for the corresponding diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracAdapter.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracAdapter.java index 73c4570a572..3c093fc40ae 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracAdapter.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracAdapter.java @@ -48,13 +48,12 @@ public interface TracTracAdapter { * @param timeoutInMilliseconds * if the race definition is not received for the race within this time, the race tracker for that race * is stopped; use -1 to wait forever - * @param trackWind TODO - * @param correctWindDirectionByMagneticDeclination TODO */ RaceHandle addTracTracRace(TrackerManager trackerManager, URL paramURL, URI liveURI, URI storedURI, URI courseDesignUpdateURI, RaceLogStore raceLogStore, RegattaLogStore regattaLogStore, long timeoutInMilliseconds, String tracTracUsername, String tracTracPassword, String raceStatus, - String raceVisibility, boolean trackWind, boolean correctWindDirectionByMagneticDeclination) throws MalformedURLException, FileNotFoundException, URISyntaxException, Exception; + String raceVisibility, boolean trackWind, boolean correctWindDirectionByMagneticDeclination, int timeoutInMillis) + throws MalformedURLException, FileNotFoundException, URISyntaxException, Exception; /** * Same as {@link #addTracTracRace(URL, URI, URI, WindStore, long)}, only that start and end of tracking are diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java index 5f94f0cf790..c6d7e297bb9 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java @@ -12,12 +12,12 @@ import java.util.logging.Logger; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRegatta; -import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.TrackedRegatta; import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.LoadingQueueDoneCallBack; import com.sap.sailing.domain.tractracadapter.Receiver; +import com.sap.sse.common.Duration; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Triple; import com.tractrac.model.lib.api.event.IEvent; @@ -35,7 +35,15 @@ import com.tractrac.subscription.lib.api.IRaceSubscriber; */ public abstract class AbstractReceiverWithQueue implements Runnable, Receiver { private static Logger logger = Logger.getLogger(AbstractReceiverWithQueue.class.getName()); - + + /** + * The timeout after which to re-try looking for the race definition to have appeared in + * {@link #getTrackedRace(IRace)} in case an infinite timeout (-1) was specified. During this + * short break, {@link #getTrackedRace(IRace)} will check for {@link #hasBeenStoppedPreemptively()} + * and will stop trying to look for the race if this received was stopped preemptively. + */ + private static final long RETRY_TIMEOUT_IN_MILLIS = Duration.ONE_MINUTE.asMillis(); + private final LinkedBlockingDeque> queue; private final DomainFactory domainFactory; private final IEvent tractracEvent; @@ -53,6 +61,14 @@ public abstract class AbstractReceiverWithQueue implements Runnable, Re */ private boolean receivedEventDuringTimeout; + /** + * Set by {@link #stopPreemptively()}. Invocations of {@link #handleEvent(Triple)} waiting for something + * should wait repeatedly with some timeout, such as, say, one minute, and keep re-trying until what they + * are waiting for has appeared, or this flag has been set in which case they can abort and assume they + * received a stop event. + */ + private boolean stoppedPreemptively; + public AbstractReceiverWithQueue(DomainFactory domainFactory, IEvent tractracEvent, DynamicTrackedRegatta trackedRegatta, Simulator simulator, IEventSubscriber eventSubscriber, IRaceSubscriber raceSubscriber, long timeoutInMilliseconds) { @@ -97,6 +113,11 @@ public abstract class AbstractReceiverWithQueue implements Runnable, Re // mark the end and hence terminate the thread by adding a null/null/null event to the queue queue.clear(); stopAfterProcessingQueuedEvents(); + stoppedPreemptively = true; + } + + protected boolean hasBeenStoppedPreemptively() { + return stoppedPreemptively; } @Override @@ -195,15 +216,19 @@ public abstract class AbstractReceiverWithQueue implements Runnable, Re /** * Tries to find a {@link TrackedRace} for race in the {@link com.sap.sailing.domain.base.Regatta} * corresponding to {@link #tractracEvent}, as keyed by the {@link #domainFactory}. Waits for - * {@link RaceTracker#TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS} milliseconds for the - * {@link RaceDefinition} to show up. If it doesn't, null is returned. If the {@link RaceDefinition} - * for race is not found in the {@link com.sap.sailing.domain.base.Regatta}, null is - * returned. If the {@link TrackedRace} for race isn't found in the {@link TrackedRegatta}, - * null is returned, too. + * {@link #timeoutInMilliseconds} milliseconds for the {@link RaceDefinition} to show up, or infinitely if + * {@link #timeoutInMilliseconds} is -1, except this receiver is {@link #hasBeenStoppedPreemptively() stopped + * preemptively}. If the race doesn't show up under these boundary conditions, null is returned. If the + * {@link RaceDefinition} for race is not found in the {@link com.sap.sailing.domain.base.Regatta}, + * null is returned. If the {@link TrackedRace} for race isn't found in the + * {@link TrackedRegatta}, null is returned, too. */ protected DynamicTrackedRace getTrackedRace(IRace race) { DynamicTrackedRace result = null; - RaceDefinition raceDefinition = getDomainFactory().getAndWaitForRaceDefinition(race.getId(), timeoutInMilliseconds); + final long effectiveTimeoutInMilliseconds = timeoutInMilliseconds == -1 ? RETRY_TIMEOUT_IN_MILLIS : timeoutInMilliseconds; + RaceDefinition raceDefinition; + while ((raceDefinition = getDomainFactory().getAndWaitForRaceDefinition(race.getId(), effectiveTimeoutInMilliseconds)) == null && + timeoutInMilliseconds == -1 && !hasBeenStoppedPreemptively()); if (raceDefinition != null) { com.sap.sailing.domain.base.Regatta domainRegatta = trackedRegatta.getRegatta(); if (domainRegatta.getRaceByName(raceDefinition.getName()) != null) { diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java index 6178ce40ff6..a8b2ef13964 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java @@ -537,9 +537,16 @@ public class DomainFactoryImpl implements DomainFactory { raceCache.put(raceId, raceDefinition); raceCache.notifyAll(); } else { - logger.warning("Not adding race " + raceDefinition + " to regatta " + trackedRegatta.getRegatta() + final String reasonForNotAddingRaceToRegatta = "Not adding race " + raceDefinition + " to regatta " + trackedRegatta.getRegatta() + " because boat class " + raceDefinition.getBoatClass() - + " doesn't match regatta's boat class " + trackedRegatta.getRegatta().getBoatClass()); + + " doesn't match regatta's boat class " + trackedRegatta.getRegatta().getBoatClass(); + logger.warning(reasonForNotAddingRaceToRegatta); + try { + raceDefinitionSetToUpdate.raceNotLoaded(reasonForNotAddingRaceToRegatta); + } catch (Exception e) { + logger.log(Level.INFO, "Something else went wrong while trying to notify the RaceDefinition set that the race "+ + raceDefinition+" could not be added to the the regatta "+trackedRegatta.getRegatta(), e); + } } } else { logger.info("Found existing tracked race for race "+raceName+" with ID "+raceId); @@ -688,11 +695,11 @@ public class DomainFactoryImpl implements DomainFactory { URI storedURI, URI courseDesignUpdateURI, TimePoint startOfTracking, TimePoint endOfTracking, long delayToLiveInMillis, Duration offsetToStartTimeOfSimulatedRace, boolean useInternalMarkPassingAlgorithm, RaceLogStore raceLogStore, RegattaLogStore regattaLogStore, String tracTracUsername, String tracTracPassword, String raceStatus, - String raceVisibility, boolean trackWind, boolean correctWindDirectionByMagneticDeclination, boolean preferReplayIfAvailable) throws Exception { + String raceVisibility, boolean trackWind, boolean correctWindDirectionByMagneticDeclination, boolean preferReplayIfAvailable, int timeoutInMillis) throws Exception { return new RaceTrackingConnectivityParametersImpl(paramURL, liveURI, storedURI, courseDesignUpdateURI, startOfTracking, endOfTracking, delayToLiveInMillis, offsetToStartTimeOfSimulatedRace, useInternalMarkPassingAlgorithm, raceLogStore, regattaLogStore, this, tracTracUsername, tracTracPassword, raceStatus, raceVisibility, trackWind, correctWindDirectionByMagneticDeclination, - preferReplayIfAvailable); + preferReplayIfAvailable, timeoutInMillis); } @Override diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java index eb1a614ecee..8e40864e068 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java @@ -5,6 +5,7 @@ import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.util.concurrent.TimeoutException; import java.util.logging.Logger; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; @@ -54,17 +55,24 @@ public class RaceTrackingConnectivityParametersImpl extends AbstractRaceTracking * {@code File}) then if this parameter is {@code true} the race will be loaded from the replay file * instead of the {@code storedURI}/{@code liveURI} specified. This is particularly useful for restoring * races if since the last connection the race was migrated to a replay file format. + * @param timeoutInMillis + * -1 means no timeout; otherwise, this is the timeout for waiting for the {@link IRace} to be obtained + * from the {@code paramURL} document. A {@link TimeoutException} will result if the timeout applied. */ public RaceTrackingConnectivityParametersImpl(URL paramURL, URI liveURI, URI storedURI, URI courseDesignUpdateURI, TimePoint startOfTracking, TimePoint endOfTracking, long delayToLiveInMillis, Duration offsetToStartTimeOfSimulatedRace, boolean useInternalMarkPassingAlgorithm, RaceLogStore raceLogStore, RegattaLogStore regattaLogStore, DomainFactory domainFactory, String tracTracUsername, String tracTracPassword, String raceStatus, String raceVisibility, - boolean trackWind, boolean correctWindDirectionByMagneticDeclination, boolean preferReplayIfAvailable) + boolean trackWind, boolean correctWindDirectionByMagneticDeclination, boolean preferReplayIfAvailable, int timeoutInMillis) throws Exception { super(trackWind, correctWindDirectionByMagneticDeclination); this.paramURL = paramURL; - this.tractracRace = ModelLocator.getEventFactory().createRace(new URI(paramURL.toString())); + if (timeoutInMillis == -1) { + this.tractracRace = ModelLocator.getEventFactory().createRace(new URI(paramURL.toString())); + } else { + this.tractracRace = ModelLocator.getEventFactory().createRace(new URI(paramURL.toString()), timeoutInMillis); + } if (preferReplayIfAvailable && isReplayRace(tractracRace) && (!Util.equalsWithNull(liveURI, tractracRace.getLiveURI()) || !Util.equalsWithNull(storedURI, tractracRace.getStoredURI()))) { logger.info("Replay format available and preferred for race " + tractracRace.getName() diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracAdapterImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracAdapterImpl.java index 43a1aac95b6..9737d22380a 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracAdapterImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracAdapterImpl.java @@ -49,7 +49,7 @@ public class TracTracAdapterImpl implements TracTracAdapter { public RaceHandle addTracTracRace(TrackerManager trackerManager, URL paramURL, URI liveURI, URI storedURI, URI courseDesignUpdateURI, RaceLogStore raceLogStore, RegattaLogStore regattaLogStore, long timeoutInMilliseconds, String tracTracUsername, String tracTracPassword, String raceStatus, - String raceVisibility, boolean trackWind, boolean correctWindDirectionByMagneticDeclination) throws Exception { + String raceVisibility, boolean trackWind, boolean correctWindDirectionByMagneticDeclination, int timeoutInMillis) throws Exception { return trackerManager.addRace( /* regattaToAddTo */null, getTracTracDomainFactory().createTrackingConnectivityParameters(paramURL, liveURI, storedURI, @@ -57,7 +57,7 @@ public class TracTracAdapterImpl implements TracTracAdapter { /* startOfTracking */null, /* endOfTracking */null, delayToLiveInMillis, /* offsetToStartTimeOfSimulatedRace */null, /* ignoreTracTracMarkPassings */ false, raceLogStore, regattaLogStore, tracTracUsername, tracTracPassword, raceStatus, raceVisibility, trackWind, correctWindDirectionByMagneticDeclination, - /* preferReplayIfAvailable */ false), + /* preferReplayIfAvailable */ false, timeoutInMillis), timeoutInMilliseconds); } @@ -73,7 +73,8 @@ public class TracTracAdapterImpl implements TracTracAdapter { getTracTracDomainFactory().createTrackingConnectivityParameters(paramURL, liveURI, storedURI, courseDesignUpdateURI, startOfTracking, endOfTracking, delayToLiveInMillis, offsetToStartTimeOfSimulatedRace, useInternalMarkPassingAlgorithm, raceLogStore, regattaLogStore, tracTracUsername, tracTracPassword, - raceStatus, raceVisibility, trackWind, correctWindDirectionByMagneticDeclination, /* preferReplayIfAvailable */ false), timeoutInMilliseconds); + raceStatus, raceVisibility, trackWind, correctWindDirectionByMagneticDeclination, /* preferReplayIfAvailable */ false, + (int) timeoutInMilliseconds), timeoutInMilliseconds); } @Override diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java index 0dd509d1469..a3b7e22bc02 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java @@ -647,6 +647,16 @@ public class TracTracRaceTrackerImpl extends AbstractRaceTrackerImpl notifyRaceCreationListeners(); } + /** + * When this tracker is informed that the race cannot be loaded, e.g., because its boat class does + * not match the regatta's boat class, the tracker will {@link #stop} preemptively. + */ + @Override + public void raceNotLoaded(String reason) throws MalformedURLException, IOException, InterruptedException { + logger.severe("Race for tracker "+this+" with ID "+getID()+" did not load: "+reason+". Stopping tracker."); + trackedRegattaRegistry.stopTracking(regatta, race); + } + @Override public void gotLiveDataEvent(ILiveDataEvent liveDataEvent) { logger.info("Status change in tracker "+getID()+" for race(s) "+getRace()+": "+liveDataEvent); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java index e704b9dbbd5..1bfd15ca2b5 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java @@ -175,7 +175,7 @@ public class LeaderboardCacheManager { } @Override - public void correctedScoreChanced(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, Double newCorrectedScore) { + public void correctedScoreChanged(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, Double newCorrectedScore) { removeFromCache(leaderboard); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrectionListener.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrectionListener.java index eb64022400d..5c19bb38b91 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrectionListener.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrectionListener.java @@ -6,7 +6,7 @@ import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sse.common.TimePoint; public interface ScoreCorrectionListener { - void correctedScoreChanced(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, Double newCorrectedScore); + void correctedScoreChanged(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, Double newCorrectedScore); void maxPointsReasonChanced(Competitor competitor, RaceColumn raceColumn, MaxPointsReason oldMaxPointsReason, MaxPointsReason newMaxPointsReason); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java index dd5ceb59c50..f674cffd02e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java @@ -99,7 +99,7 @@ public class ScoreCorrectionImpl implements SettableScoreCorrection { protected void notifyListeners(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, Double newCorrectedScore) { for (ScoreCorrectionListener listener : getScoreCorrectionListeners()) { - listener.correctedScoreChanced(competitor, raceColumn, oldCorrectedScore, newCorrectedScore); + listener.correctedScoreChanged(competitor, raceColumn, oldCorrectedScore, newCorrectedScore); } } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/AbstractMetaLeaderboard.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/AbstractMetaLeaderboard.java index 460ab3af697..6c0ad316647 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/AbstractMetaLeaderboard.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/AbstractMetaLeaderboard.java @@ -69,7 +69,7 @@ public abstract class AbstractMetaLeaderboard extends AbstractSimpleLeaderboardI private static final long serialVersionUID = 915433462154943441L; @Override - public void correctedScoreChanced(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, Double newCorrectedScore) { + public void correctedScoreChanged(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, Double newCorrectedScore) { getScoreCorrection().notifyListeners(competitor, raceColumn, oldCorrectedScore, newCorrectedScore); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicRaceDefinitionSet.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicRaceDefinitionSet.java index a9497e47c14..097605f75fd 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicRaceDefinitionSet.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicRaceDefinitionSet.java @@ -18,4 +18,11 @@ import com.sap.sailing.domain.base.RaceDefinition; @FunctionalInterface public interface DynamicRaceDefinitionSet { void addRaceDefinition(RaceDefinition race, DynamicTrackedRace trackedRace); + + /** + * Called when the race has not or can not be loaded. A {@code reason} may be provided or may be left {@code null}. + * This default implementation does nothing. Implementing classes may choose, e.g., to stop all further efforts + * trying to track the race. + */ + default void raceNotLoaded(String reason) throws Exception {} } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTracker.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTracker.java index 6e1a4a258de..77ef2459eac 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTracker.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTracker.java @@ -9,8 +9,8 @@ import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; /** - * Centerpiece of a tracking adapter. A tracker is responsible for receiving tracking data for one or more - * {@link RaceDefinition races} that are {@link Regatta#getAllRaces() part of} a common {@link #getRegatta() Event}. Some + * Centerpiece of a tracking adapter. A tracker is responsible for receiving tracking data for one + * {@link RaceDefinition race} that is {@link Regatta#getAllRaces() part of} a common {@link #getRegatta() Event}. Some * tracker architectures may not be able to deliver all data for the {@link RaceDefinition} when created or started. * Therefore, {@link #getRace()} may return null if the race information hasn't been received by the * tracker yet. Through the {@link RaceHandle} returned by {@link #getRaceHandle()} it is also possible to perform a @@ -43,7 +43,7 @@ public interface RaceTracker { static long TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS = 60000; /** - * Stops tracking the races. + * Stops tracking the race. * * @param preemptive * if false, the tracker will continue to process data already received but will stop @@ -55,7 +55,7 @@ public interface RaceTracker { com.sap.sailing.domain.base.Regatta getRegatta(); /** - * Returns the races being tracked by this tracker, in a "volatile" way, meaning that if another thread belonging to + * Returns the race being tracked by this tracker, in a "volatile" way, meaning that if another thread belonging to * this tracker has established the {@link RaceDefinition} for this tracker, other threads will immediately see this * object. Non-blocking call that returns null if the {@link RaceDefinition} hasn't been created yet, * e.g., because the course definition hasn't been received yet or the listener for receiving course information diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTrackingConnectivityParameters.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTrackingConnectivityParameters.java index cb965645a2a..8925987ff89 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTrackingConnectivityParameters.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTrackingConnectivityParameters.java @@ -25,7 +25,13 @@ public interface RaceTrackingConnectivityParameters { * {@link Regatta} is provided, this will first look up a regatta for the race from * {@link TrackedRegattaRegistry#getRememberedRegattaForRace(java.io.Serializable)} and if not found will look up or * create a default regatta based on race data such as an event name and the boat class. - * @param timeoutInMilliseconds TODO + * + * @param timeoutInMilliseconds + * gives the tracker a possibility to abort tracking the race after so many milliseconds of + * unsuccessfully waiting for the connection to be established. Support is optional for + * implementations, and there is no exact specification what must have happened before + * this timeout in order for tracking to continue. So, consider this as a "hint" to the + * tracker. */ RaceTracker createRaceTracker(TrackedRegattaRegistry trackedRegattaRegistry, WindStore windStore, RaceLogResolver raceLogResolver, long timeoutInMilliseconds) throws Exception; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/SensorFixTrack.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/SensorFixTrack.java index 53b7498d35e..1a41790f618 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/SensorFixTrack.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/SensorFixTrack.java @@ -16,13 +16,6 @@ import com.sap.sse.common.WithID; public interface SensorFixTrack extends MappedTrack { - /** - * Value names to be used when reading values from {@link SensorFix}es by calling {@link SensorFix#get(String)}. - * - * @return the value names that fixes contained in this track support - */ - Iterable getValueNames(); - void addListener(SensorFixTrackListener listener); void removeListener(SensorFixTrackListener listener); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java index 379c114418b..c405f0934f2 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackImpl.java @@ -3,7 +3,6 @@ package com.sap.sailing.domain.tracking.impl; import java.io.Serializable; import com.sap.sailing.domain.common.Distance; -import com.sap.sailing.domain.common.sensordata.BravoSensorDataMetadata; import com.sap.sailing.domain.common.tracking.BravoFix; import com.sap.sailing.domain.tracking.BravoFixTrack; import com.sap.sailing.domain.tracking.DynamicBravoFixTrack; @@ -28,8 +27,7 @@ public class BravoFixTrackImpl extends S * the name of the track by which it can be obtained from the {@link TrackedRace}. */ public BravoFixTrackImpl(ItemType trackedItem, String trackName) { - super(trackedItem, trackName, BravoSensorDataMetadata.INSTANCE.getFileColumns(), - BravoFixTrack.TRACK_NAME + " for " + trackedItem); + super(trackedItem, trackName, BravoFixTrack.TRACK_NAME + " for " + trackedItem); } @Override diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java index a3b7963da9c..6524e952899 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java @@ -3,6 +3,8 @@ package com.sap.sailing.domain.tracking.impl; import java.util.ArrayList; import java.util.List; import java.util.NavigableSet; +import java.util.logging.Level; +import java.util.logging.Logger; import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence; import com.sap.sailing.domain.base.SpeedWithConfidence; @@ -13,6 +15,7 @@ import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; +import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.BearingWithConfidence; import com.sap.sailing.domain.common.confidence.BearingWithConfidenceCluster; import com.sap.sailing.domain.common.confidence.ConfidenceBasedAverager; @@ -22,23 +25,62 @@ import com.sap.sailing.domain.common.confidence.Weigher; import com.sap.sailing.domain.common.confidence.impl.BearingWithConfidenceImpl; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.tracking.GPSFixMoving; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixMovingImpl; +import com.sap.sailing.domain.common.tracking.impl.CompactPositionHelper; +import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; +import com.sap.sailing.domain.common.tracking.impl.PreciseCompactGPSFixMovingImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sse.common.TimePoint; public class DynamicGPSFixMovingTrackImpl extends GPSFixTrackImpl implements DynamicGPSFixTrack { + private static final Logger logger = Logger.getLogger(DynamicGPSFixMovingTrackImpl.class.getName()); + private static final long serialVersionUID = 9111448573301259784L; private static final double MAX_SPEED_FACTOR_COMPARED_TO_MEASURED_SPEED_FOR_FILTERING = 2; + /** + * Uses lossy compaction of fixes. See {@link CompactPositionHelper}. Use {@link #DynamicGPSFixMovingTrackImpl(Object, long, boolean)} + * to configure lossless compaction. + */ public DynamicGPSFixMovingTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage) { - super(trackedItem, millisecondsOverWhichToAverage); + this(trackedItem, millisecondsOverWhichToAverage, /* losslessCompaction */ false); } /** - * @param maxSpeedForSmoothening pass null if you don't want speed-based smoothening + * Uses lossy compaction. Use {@link #DynamicGPSFixMovingTrackImpl(Object, long, Speed, boolean)} to configure + * lossless compaction. + * + * @param maxSpeedForSmoothening + * pass null if you don't want speed-based smoothening */ public DynamicGPSFixMovingTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage, Speed maxSpeedForSmoothening) { - super(trackedItem, millisecondsOverWhichToAverage, maxSpeedForSmoothening); + this(trackedItem, millisecondsOverWhichToAverage, maxSpeedForSmoothening, /* losslessCompaction */ false); + } + + /** + * @param maxSpeedForSmoothening + * pass null if you don't want speed-based smoothening + * @param losslessCompaction + * If {@code true}, {@link Wind} fixes will be compacted in a way that they remain precisely equal to + * their original, without rounding or range limitations different from those of the original + * {@link Wind} fix. Lossy compaction, in contrast, may use a more compact form that, however, has + * stricter limits on ranges and precisions. See {@link CompactPositionHelper} for details on lossy + * compaction. + */ + public DynamicGPSFixMovingTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage, Speed maxSpeedForSmoothening, boolean losslessCompaction) { + super(trackedItem, millisecondsOverWhichToAverage, maxSpeedForSmoothening, losslessCompaction); + } + + /** + * @param losslessCompaction + * If {@code true}, {@link Wind} fixes will be compacted in a way that they remain precisely equal to + * their original, without rounding or range limitations different from those of the original + * {@link Wind} fix. Lossy compaction, in contrast, may use a more compact form that, however, has + * stricter limits on ranges and precisions. See {@link CompactPositionHelper} for details on lossy + * compaction. + */ + public DynamicGPSFixMovingTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage, boolean losslessCompaction) { + super(trackedItem, millisecondsOverWhichToAverage, losslessCompaction); } /** @@ -57,7 +99,14 @@ public class DynamicGPSFixMovingTrackImpl extends GPSFixTrackImpl extends GPSFixTrackImpl implements DynamicGPSFixTrack { private static final long serialVersionUID = 4035953954507697564L; + /** + * By default uses lossy compaction. See {@link CompactPositionHelper}. + */ public DynamicGPSFixTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage) { - super(trackedItem, millisecondsOverWhichToAverage); + this(trackedItem, millisecondsOverWhichToAverage, /* losslessCompaction */ false); + } + + public DynamicGPSFixTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage, boolean losslessCompaction) { + super(trackedItem, millisecondsOverWhichToAverage, losslessCompaction); } public void addGPSFix(GPSFix gpsFix) { @@ -22,7 +31,8 @@ public class DynamicGPSFixTrackImpl extends GPSFixTrackImpl extends MappedTrackImpl +public abstract class GPSFixTrackImpl extends MappedTrackImpl implements GPSFixTrack { private static final Logger logger = Logger.getLogger(GPSFixTrackImpl.class.getName()); private static final long serialVersionUID = 2115321069242514378L; @@ -121,8 +123,25 @@ public class GPSFixTrackImpl extends MappedTra private int estimatedSpeedCacheHits; private int estimatedSpeedCacheMisses; - public GPSFixTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage) { - this(trackedItem, millisecondsOverWhichToAverage, DEFAULT_MAX_SPEED_FOR_SMOOTHING); + /** + * If {@code true}, {@link Wind} fixes will be compacted in a way that they remain precisely + * equal to their original, without rounding or range limitations different from those of the + * original {@link Wind} fix. Lossy compaction, in contrast, may use a more compact form that, + * however, has stricter limits on ranges and precisions. See {@link CompactPositionHelper} for + * details on lossy compaction. + */ + private final boolean losslessCompaction; + + /** + * @param losslessCompaction + * If {@code true}, {@link Wind} fixes will be compacted in a way that they remain precisely equal to + * their original, without rounding or range limitations different from those of the original + * {@link Wind} fix. Lossy compaction, in contrast, may use a more compact form that, however, has + * stricter limits on ranges and precisions. See {@link CompactPositionHelper} for details on lossy + * compaction. + */ + protected GPSFixTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage, boolean losslessCompaction) { + this(trackedItem, millisecondsOverWhichToAverage, DEFAULT_MAX_SPEED_FOR_SMOOTHING, losslessCompaction); } /** @@ -130,7 +149,7 @@ public class GPSFixTrackImpl extends MappedTra * if null, any fix speed will be accepted as long as fix-provided speed (if any) and * inferred speed can be matched. */ - public GPSFixTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage, Speed maxSpeedForSmoothening) { + protected GPSFixTrackImpl(ItemType trackedItem, long millisecondsOverWhichToAverage, Speed maxSpeedForSmoothening, boolean losslessCompaction) { super(trackedItem, /* nameForReadWriteLock */ GPSFixTrackImpl.class.getSimpleName() + (trackedItem == null ? "" : (" for " + trackedItem.toString()))); this.millisecondsOverWhichToAverage = millisecondsOverWhichToAverage; @@ -139,8 +158,13 @@ public class GPSFixTrackImpl extends MappedTra this.distanceCache = new DistanceCache(trackedItem==null?"null":trackedItem.toString()); this.maxSpeedCache = createMaxSpeedCache(); this.validityCachingSuspended = false; + this.losslessCompaction = losslessCompaction; } - + + protected boolean isLosslessCompaction() { + return losslessCompaction; + } + @Override public void suspendValidityCaching() { validityCachingSuspended = true; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/SensorFixTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/SensorFixTrackImpl.java index dd4b5984764..c72d285ad50 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/SensorFixTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/SensorFixTrackImpl.java @@ -21,21 +21,17 @@ public class SensorFixTrackImpl valueNames; private final String trackName; private final TrackListenerCollection> listeners; /** * @param trackedItem the item this track is mapped to * @param trackName the name of the track by which it can be obtained from the {@link TrackedRace}. - * @param valueNames the name of the values that can be obtained by fixes contained in the track * @param nameForReadWriteLock the name to use for the lock object that is used internally */ - public SensorFixTrackImpl(ItemType trackedItem, String trackName, Iterable valueNames, - String nameForReadWriteLock) { + public SensorFixTrackImpl(ItemType trackedItem, String trackName, String nameForReadWriteLock) { super(trackedItem, nameForReadWriteLock); this.trackName = trackName; - this.valueNames = valueNames; this.listeners = new TrackListenerCollection<>(); } @@ -57,11 +53,6 @@ public class SensorFixTrackImpl getValueNames() { - return valueNames; - } - @Override public void addListener(SensorFixTrackListener listener) { this.listeners.addListener(listener); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java index 9f0e79a70a4..82a9a479a89 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java @@ -19,7 +19,10 @@ import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.confidence.impl.PositionAndTimePointWeigher; -import com.sap.sailing.domain.common.tracking.impl.CompactWindImpl; +import com.sap.sailing.domain.common.tracking.impl.CompactPositionHelper; +import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; +import com.sap.sailing.domain.common.tracking.impl.PreciseCompactWindImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactWindImpl; import com.sap.sailing.domain.confidence.ConfidenceBasedWindAverager; import com.sap.sailing.domain.confidence.ConfidenceFactory; import com.sap.sailing.domain.tracking.WindListener; @@ -56,11 +59,23 @@ public class WindTrackImpl extends TrackImpl implements WindTrack { */ private transient Set listeners; + /** + * If {@code true}, {@link Wind} fixes will be compacted in a way that they remain precisely + * equal to their original, without rounding or range limitations different from those of the + * original {@link Wind} fix. Lossy compaction, in contrast, may use a more compact form that, + * however, has stricter limits on ranges and precisions. See {@link CompactPositionHelper} for + * details on lossy compaction. + */ + private final boolean losslessCompaction; + public WindTrackImpl(long millisecondsOverWhichToAverage, boolean useSpeed, String nameForReadWriteLock) { this(millisecondsOverWhichToAverage, DEFAULT_BASE_CONFIDENCE, useSpeed, nameForReadWriteLock); } /** + * Uses lossy compaction. See {@link CompactPositionHelper}. Use {@link #WindTrackImpl(long, double, boolean, String, boolean)} + * to select lossless compaction. + * * @param baseConfidence * the confidence to attribute to the raw wind fixes in this track * @param useSpeed @@ -69,11 +84,29 @@ public class WindTrackImpl extends TrackImpl implements WindTrack { * value for the speed */ public WindTrackImpl(long millisecondsOverWhichToAverage, double baseConfidence, boolean useSpeed, String nameForReadWriteLock) { + this(millisecondsOverWhichToAverage, baseConfidence, useSpeed, nameForReadWriteLock, /* losslessCompaction */ false); + } + + /** + * Uses lossy compaction. See {@link CompactPositionHelper}. + * + * @param baseConfidence + * the confidence to attribute to the raw wind fixes in this track + * @param useSpeed + * whether the wind speed described by the fixes in this track are usable at all; example for an unusable + * wind speed would be that of an estimation that only estimates the wind direction and uses some default + * value for the speed + * @param losslessCompaction + * whether or not to use lossless compaction; see {@link CompactPositionHelper} for details on lossy + * compaction + */ + public WindTrackImpl(long millisecondsOverWhichToAverage, double baseConfidence, boolean useSpeed, String nameForReadWriteLock, boolean losslessCompaction) { super(new ArrayListNavigableSet(WindComparator.INSTANCE), nameForReadWriteLock); this.baseConfidence = baseConfidence; this.millisecondsOverWhichToAverage = millisecondsOverWhichToAverage; listeners = new HashSet(); this.useSpeed = useSpeed; + this.losslessCompaction = losslessCompaction; } private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException { @@ -114,12 +147,23 @@ public class WindTrackImpl extends TrackImpl implements WindTrack { @Override public boolean add(Wind wind, boolean replace) { - final CompactWindImpl compactWind = new CompactWindImpl(wind); + final Wind compactWind = compactify(wind); final boolean result = super.add(compactWind, replace); notifyListenersAboutReceive(compactWind); return result; } + private Wind compactify(Wind wind) { + Wind compactWind; + try { + compactWind = losslessCompaction ? new PreciseCompactWindImpl(wind) : new VeryCompactWindImpl(wind); + } catch (CompactionNotPossibleException e) { + logger.log(Level.FINE, "Couldn't compact wind fix "+wind+". Using lossless compactification instead.", e); + compactWind = new PreciseCompactWindImpl(wind); + } + return compactWind; + } + private void notifyListenersAboutReceive(Wind wind) { synchronized (listeners) { for (WindListener listener : listeners) { @@ -420,7 +464,8 @@ public class WindTrackImpl extends TrackImpl implements WindTrack { public void remove(Wind wind) { lockForWrite(); try { - getInternalRawFixes().remove(wind); + // map through "compactify" to account for possible rounding / accuracy differences and still achieve "equals" + getInternalRawFixes().remove(compactify(wind)); } finally { unlockAfterWrite(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java index 590b96c9ade..5d1223ad852 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactWindImpl.java @@ -1,5 +1,7 @@ package com.google.gwt.user.client.rpc.core.com.sap.sailing.domain.common.tracking.impl; +import java.util.logging.Logger; + import com.google.gwt.user.client.rpc.CustomFieldSerializer; import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.SerializationStreamReader; @@ -8,46 +10,54 @@ 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; -import com.sap.sailing.domain.common.tracking.impl.CompactWindImpl.CompactPosition; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactWindImpl.VeryCompactPosition; +import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; public final class CompactWindImpl { - public static final class CompactPosition_CustomFieldSerializer extends CustomFieldSerializer { + private static final Logger logger = Logger.getLogger(CompactWindImpl.class.getName()); + + public static final class CompactPosition_CustomFieldSerializer extends CustomFieldSerializer { @Override public boolean hasCustomInstantiateInstance() { return true; } @Override - public CompactPosition instantiateInstance(SerializationStreamReader streamReader) + public VeryCompactPosition instantiateInstance(SerializationStreamReader streamReader) throws SerializationException { return instantiate(streamReader); } - public static CompactPosition instantiate(SerializationStreamReader streamReader) throws SerializationException { + public static VeryCompactPosition instantiate(SerializationStreamReader streamReader) throws SerializationException { final double latDeg = streamReader.readDouble(); final double lngDeg = streamReader.readDouble(); - return (CompactPosition) new com.sap.sailing.domain.common.tracking.impl.CompactWindImpl(new WindImpl( - new DegreePosition(latDeg, lngDeg), /* timePoint */null, new KnotSpeedWithBearingImpl(0, - new DegreeBearingImpl(0)))).getPosition(); + try { + return (VeryCompactPosition) new com.sap.sailing.domain.common.tracking.impl.VeryCompactWindImpl(new WindImpl( + new DegreePosition(latDeg, lngDeg), /* timePoint */null, new KnotSpeedWithBearingImpl(0, + new DegreeBearingImpl(0)))).getPosition(); + } catch (CompactionNotPossibleException e) { + logger.severe("Internal error: Cannot de-serialize compact position: "+e.getMessage()+"; throwing runtime exception"); + throw new RuntimeException(e); + } } @Override - public void deserializeInstance(SerializationStreamReader streamReader, CompactPosition instance) + public void deserializeInstance(SerializationStreamReader streamReader, VeryCompactPosition instance) throws SerializationException { deserialize(streamReader, instance); } - public static void deserialize(SerializationStreamReader streamReader, CompactPosition instance) { + public static void deserialize(SerializationStreamReader streamReader, VeryCompactPosition instance) { // handled by instantiate } @Override - public void serializeInstance(SerializationStreamWriter streamWriter, CompactPosition instance) + public void serializeInstance(SerializationStreamWriter streamWriter, VeryCompactPosition instance) throws SerializationException { serialize(streamWriter, instance); } - public static void serialize(SerializationStreamWriter streamWriter, CompactPosition instance) + public static void serialize(SerializationStreamWriter streamWriter, VeryCompactPosition instance) throws SerializationException { streamWriter.writeDouble(instance.getLatDeg()); streamWriter.writeDouble(instance.getLngDeg()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java new file mode 100755 index 00000000000..ac837e8f190 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/PreciseCompactGPSFixImpl.java @@ -0,0 +1,52 @@ +package com.google.gwt.user.client.rpc.core.com.sap.sailing.domain.common.tracking.impl; + +import com.google.gwt.user.client.rpc.CustomFieldSerializer; +import com.google.gwt.user.client.rpc.SerializationException; +import com.google.gwt.user.client.rpc.SerializationStreamReader; +import com.google.gwt.user.client.rpc.SerializationStreamWriter; +import com.sap.sailing.domain.common.impl.DegreePosition; +import com.sap.sailing.domain.common.tracking.impl.PreciseCompactGPSFixImpl.PreciseCompactPosition; + +public final class PreciseCompactGPSFixImpl { + public static final class PreciseCompactPosition_CustomFieldSerializer extends CustomFieldSerializer { + @Override + public boolean hasCustomInstantiateInstance() { + return true; + } + + @Override + public PreciseCompactPosition instantiateInstance(SerializationStreamReader streamReader) + throws SerializationException { + return instantiate(streamReader); + } + + public static PreciseCompactPosition instantiate(SerializationStreamReader streamReader) throws SerializationException { + final double latDeg = streamReader.readDouble(); + final double lngDeg = streamReader.readDouble(); + return (PreciseCompactPosition) new com.sap.sailing.domain.common.tracking.impl.PreciseCompactGPSFixImpl( + new DegreePosition(latDeg, lngDeg), /* timePoint */null).getPosition(); + } + + @Override + public void deserializeInstance(SerializationStreamReader streamReader, PreciseCompactPosition instance) + throws SerializationException { + deserialize(streamReader, instance); + } + + public static void deserialize(SerializationStreamReader streamReader, PreciseCompactPosition instance) { + // handled by instantiate + } + + @Override + public void serializeInstance(SerializationStreamWriter streamWriter, PreciseCompactPosition instance) + throws SerializationException { + serialize(streamWriter, instance); + } + + public static void serialize(SerializationStreamWriter streamWriter, PreciseCompactPosition instance) + throws SerializationException { + streamWriter.writeDouble(instance.getLatDeg()); + streamWriter.writeDouble(instance.getLngDeg()); + } + } +} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java similarity index 90% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixImpl.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java index 17d2493f089..87f5026329c 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/CompactGPSFixImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixImpl.java @@ -5,9 +5,9 @@ import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.SerializationStreamReader; import com.google.gwt.user.client.rpc.SerializationStreamWriter; import com.sap.sailing.domain.common.impl.DegreePosition; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixImpl.CompactPosition; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixImpl.CompactPosition; -public final class CompactGPSFixImpl { +public final class VeryCompactGPSFixImpl { public static final class CompactPosition_CustomFieldSerializer extends CustomFieldSerializer { @Override public boolean hasCustomInstantiateInstance() { @@ -23,7 +23,7 @@ public final class CompactGPSFixImpl { public static CompactPosition instantiate(SerializationStreamReader streamReader) throws SerializationException { final double latDeg = streamReader.readDouble(); final double lngDeg = streamReader.readDouble(); - return (CompactPosition) new com.sap.sailing.domain.common.tracking.impl.CompactGPSFixImpl( + return (CompactPosition) new com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixImpl( new DegreePosition(latDeg, lngDeg), /* timePoint */null).getPosition(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java new file mode 100755 index 00000000000..3925d573458 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactGPSFixMovingImpl.java @@ -0,0 +1,64 @@ +package com.google.gwt.user.client.rpc.core.com.sap.sailing.domain.common.tracking.impl; + +import java.util.logging.Level; +import java.util.logging.Logger; + +import com.google.gwt.user.client.rpc.CustomFieldSerializer; +import com.google.gwt.user.client.rpc.SerializationException; +import com.google.gwt.user.client.rpc.SerializationStreamReader; +import com.google.gwt.user.client.rpc.SerializationStreamWriter; +import com.sap.sailing.domain.common.impl.DegreePosition; +import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl.VeryCompactPosition; + +public final class VeryCompactGPSFixMovingImpl { + private static final Logger logger = Logger.getLogger(VeryCompactGPSFixMovingImpl.class.getName()); + + public static final class VeryCompactPosition_CustomFieldSerializer extends CustomFieldSerializer { + @Override + public boolean hasCustomInstantiateInstance() { + return true; + } + + @Override + public VeryCompactPosition instantiateInstance(SerializationStreamReader streamReader) + throws SerializationException { + return instantiate(streamReader); + } + + public static VeryCompactPosition instantiate(SerializationStreamReader streamReader) throws SerializationException { + final double latDeg = streamReader.readDouble(); + final double lngDeg = streamReader.readDouble(); + try { + return (VeryCompactPosition) new com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl( + new DegreePosition(latDeg, lngDeg), /* timePoint */null, /* speed with bearing */ null).getPosition(); + } catch (CompactionNotPossibleException e) { + logger.log(Level.SEVERE, "Internal error: an object that was a very compact position and was serialized "+ + "couldn't be de-serialized again as such an object", e); + throw new RuntimeException(e); + } + } + + @Override + public void deserializeInstance(SerializationStreamReader streamReader, VeryCompactPosition instance) + throws SerializationException { + deserialize(streamReader, instance); + } + + public static void deserialize(SerializationStreamReader streamReader, VeryCompactPosition instance) { + // handled by instantiate + } + + @Override + public void serializeInstance(SerializationStreamWriter streamWriter, VeryCompactPosition instance) + throws SerializationException { + serialize(streamWriter, instance); + } + + public static void serialize(SerializationStreamWriter streamWriter, VeryCompactPosition instance) + throws SerializationException { + streamWriter.writeDouble(instance.getLatDeg()); + streamWriter.writeDouble(instance.getLngDeg()); + } + } +} \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java new file mode 100755 index 00000000000..68a9d961cc7 --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/google/gwt/user/client/rpc/core/com/sap/sailing/domain/common/tracking/impl/VeryCompactWindImpl.java @@ -0,0 +1,66 @@ +package com.google.gwt.user.client.rpc.core.com.sap.sailing.domain.common.tracking.impl; + +import java.util.logging.Logger; + +import com.google.gwt.user.client.rpc.CustomFieldSerializer; +import com.google.gwt.user.client.rpc.SerializationException; +import com.google.gwt.user.client.rpc.SerializationStreamReader; +import com.google.gwt.user.client.rpc.SerializationStreamWriter; +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; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactWindImpl.VeryCompactPosition; +import com.sap.sailing.domain.common.tracking.impl.CompactionNotPossibleException; + +public final class VeryCompactWindImpl { + private static final Logger logger = Logger.getLogger(VeryCompactWindImpl.class.getName()); + + public static final class VeryCompactPosition_CustomFieldSerializer extends CustomFieldSerializer { + @Override + public boolean hasCustomInstantiateInstance() { + return true; + } + + @Override + public VeryCompactPosition instantiateInstance(SerializationStreamReader streamReader) + throws SerializationException { + return instantiate(streamReader); + } + + public static VeryCompactPosition instantiate(SerializationStreamReader streamReader) throws SerializationException { + final double latDeg = streamReader.readDouble(); + final double lngDeg = streamReader.readDouble(); + try { + return (VeryCompactPosition) new com.sap.sailing.domain.common.tracking.impl.VeryCompactWindImpl(new WindImpl( + new DegreePosition(latDeg, lngDeg), /* timePoint */null, new KnotSpeedWithBearingImpl(0, + new DegreeBearingImpl(0)))).getPosition(); + } catch (CompactionNotPossibleException e) { + logger.severe("Internal error: Cannot de-serialize compact position: "+e.getMessage()+"; throwing runtime exception"); + throw new RuntimeException(e); + } + } + + @Override + public void deserializeInstance(SerializationStreamReader streamReader, VeryCompactPosition instance) + throws SerializationException { + deserialize(streamReader, instance); + } + + public static void deserialize(SerializationStreamReader streamReader, VeryCompactPosition instance) { + // handled by instantiate + } + + @Override + public void serializeInstance(SerializationStreamWriter streamWriter, VeryCompactPosition instance) + throws SerializationException { + serialize(streamWriter, instance); + } + + public static void serialize(SerializationStreamWriter streamWriter, VeryCompactPosition instance) + throws SerializationException { + streamWriter.writeDouble(instance.getLatDeg()); + streamWriter.writeDouble(instance.getLngDeg()); + } + } +} \ No newline at end of file diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java index 604d7abfe9e..90007ee2c92 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java @@ -35,6 +35,7 @@ import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl; import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; import com.sap.sailing.domain.regattalog.impl.EmptyRegattaLogStore; import com.sap.sailing.domain.test.AbstractTracTracLiveTest; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.tracking.DynamicRaceDefinitionSet; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRegatta; @@ -124,9 +125,9 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive result.lockForRead(); try { for (Wind wind : result.getRawFixes()) { - assertEquals(pos, wind.getPosition()); - assertEquals(10., wind.getKnots(), 0.000000000001); - assertEquals(myBearingDeg, wind.getBearing().getDegrees(), 0.000000001); + PositionAssert.assertPositionEquals(pos, wind.getPosition(), /* deg delta */ 0.000001); + assertEquals(10., wind.getKnots(), 0.01); + assertEquals(myBearingDeg, wind.getBearing().getDegrees(), 0.01); myBearingDeg += 1.1; } } finally { diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java index ae1fb17f687..9ec6ea13e9a 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TracTracConnectivityParamsLoadAndStoreTest.java @@ -12,6 +12,7 @@ import java.util.Set; import org.junit.Test; import com.mongodb.MongoException; +import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.RaceTrackingConnectivityParameters; import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants; @@ -47,7 +48,8 @@ public class TracTracConnectivityParamsLoadAndStoreTest extends AbstractConnecti paramURL, /* live URI */ null, storedURI, courseDesignUpdateURI, startOfTracking, endOfTracking, delayToLiveInMillis, offsetToStartTimeOfSimulatedRace, useInternalMarkPassingAlgorithm, /* raceLogStore */ null, /* regattaLogStore */ null, DomainFactory.INSTANCE, tracTracUsername, tracTracPassword, - raceStatus, raceVisibility, trackWind, correctWindDirectionByMagneticDeclination, /* preferReplayIfAvailable */ false); + raceStatus, raceVisibility, trackWind, correctWindDirectionByMagneticDeclination, /* preferReplayIfAvailable */ false, + /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); // store mongoObjectFactory.addConnectivityParametersForRaceToRestore(tracTracParams); // load diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java index 40e01f6ce29..332fc9f4346 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/HostPage.java @@ -20,7 +20,7 @@ public abstract class HostPage extends PageObject { /** *

The default timeout of 60 seconds for the initialization of the page object.

*/ - protected static final int DEFAULT_PAGE_LOAD_TIMEOUT = 60; + protected static final int DEFAULT_PAGE_LOAD_TIMEOUT = 120; public static final String getGWTCodeServer() { String codeServer = System.getProperty(GWT_CODE_SERVER_PARAMETER_NAME); diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java index 85ca57badff..f7102d090a3 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java @@ -1,6 +1,7 @@ package com.sap.sailing.server.gateway.jaxrs.api; import java.util.ArrayList; +import java.util.Comparator; import java.util.Date; import java.util.HashSet; import java.util.Iterator; @@ -9,6 +10,8 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; @@ -33,6 +36,7 @@ import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaName; import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; @@ -44,6 +48,7 @@ import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.domain.ranking.RankingMetric.RankingInfo; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.GPSFixTrack; +import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; @@ -868,6 +873,102 @@ public class RegattasResource extends AbstractSailingServerResource { return response; } + /** + * @return the actual or anticipated start order for the race identified by {@coode regattaName} and {@code raceName}. + * Those competitors for which a start mark passing is already known are sorted by those start mark passings. All other + * boats are ordered by their geometrical distance from the start line or the windward distance from the start mark + * if the start for some reason is defined by a single mark. See {@link #compareDistanceFromStartLine(Competitor, Competitor)}. + */ + @GET + @Produces("application/json;charset=UTF-8") + @Path("{regattaname}/races/{racename}/startorder") + public Response getStartOrder(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { + Response response; + Regatta regatta = findRegattaByName(regattaName); + if (regatta == null) { + response = Response.status(Status.NOT_FOUND) + .entity("Could not find a regatta with name '" + StringEscapeUtils.escapeHtml(regattaName) + "'.").type(MediaType.TEXT_PLAIN) + .build(); + } else { + RaceDefinition race = findRaceByName(regatta, raceName); + if (race == null) { + response = Response.status(Status.NOT_FOUND) + .entity("Could not find a race with name '" + StringEscapeUtils.escapeHtml(raceName) + "'.").type(MediaType.TEXT_PLAIN) + .build(); + } else { + final TrackedRace trackedRace = findTrackedRace(regattaName, raceName); + Course course = trackedRace.getRace().getCourse(); + final List competitors = new ArrayList<>(); + final Waypoint firstWaypoint = course.getFirstWaypoint(); + final TimePoint timeToUseForStart; + if (trackedRace.getStartOfRace() != null) { + timeToUseForStart = trackedRace.getStartOfRace(); + } else { + timeToUseForStart = MillisecondsTimePoint.now(); + } + if (firstWaypoint != null) { + final List startWaypointMarkPositions = + StreamSupport.stream(firstWaypoint.getMarks().spliterator(), /* parallel */ false). + map(mark->trackedRace.getTrack(mark)).filter(markTrack->markTrack!=null). + map(markTrack->markTrack.getEstimatedPosition(timeToUseForStart, /* extrapolate */ false)). + collect(Collectors.toList()); + Util.addAll(trackedRace.getRace().getCompetitors(), competitors); + competitors.sort((a, b)->{ + final MarkPassing aStartMarkPassing = trackedRace.getMarkPassing(a, firstWaypoint); + final MarkPassing bStartMarkPassing = trackedRace.getMarkPassing(b, firstWaypoint); + final int result; + if (aStartMarkPassing == null) { + if (bStartMarkPassing == null) { + result = compareDistanceFromStartLine(trackedRace, startWaypointMarkPositions, timeToUseForStart, a, b); + } else { + result = 1; // b consider less than a because it has a start mark passing and therefore is assumed to have started before a + } + } else if (bStartMarkPassing == null) { + result = -1; // a consider less than b because it has a start mark passing and therefore is assumed to have started before b + } else { + // both have a start mark passing; compare time points + result = aStartMarkPassing.getTimePoint().compareTo(bStartMarkPassing.getTimePoint()); + } + return result; + }); + } + CompetitorJsonSerializer serializer = new CompetitorJsonSerializer(); + JSONArray result = new JSONArray(); + for (final Competitor c : competitors) { + JSONObject jsonCompetitor = serializer.serialize(c); + result.add(jsonCompetitor); + } + String json = result.toJSONString(); + return Response.ok(json).header("Content-Type", MediaType.APPLICATION_JSON + ";charset=UTF-8").build(); + } + } + return response; + } + + private int compareDistanceFromStartLine(TrackedRace trackedRace, Iterable startWaypointMarkPositions, + TimePoint timeToUseForStart, Competitor a, Competitor b) { + final Position aPos = trackedRace.getTrack(a).getEstimatedPosition(timeToUseForStart, /* extrapolate */ true); + final Position bPos = trackedRace.getTrack(b).getEstimatedPosition(timeToUseForStart, /* extrapolate */ true); + final Distance aDist = aPos==null?null:getDistanceFromStartWaypoint(aPos, startWaypointMarkPositions); + final Distance bDist = bPos==null?null:getDistanceFromStartWaypoint(bPos, startWaypointMarkPositions); + return Comparator.nullsLast(Comparator.naturalOrder()).compare(aDist, bDist); + } + + private Distance getDistanceFromStartWaypoint(Position pos, Iterable startWaypointMarkPositions) { + final Distance result; + if (Util.isEmpty(startWaypointMarkPositions)) { + result = null; + } else if (Util.size(startWaypointMarkPositions) == 1) { + // single mark start; strange, but possible: + result = startWaypointMarkPositions.iterator().next().getDistance(pos); + } else { + final Position first = Util.get(startWaypointMarkPositions, 0); + final Position second = Util.get(startWaypointMarkPositions, 1); + result = pos.getDistanceToLine(first, second).abs(); + } + return result; + } + @GET @Produces("application/json;charset=UTF-8") @Path("{regattaname}/races") diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java index ff35ebd6f41..1897dee07c4 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java @@ -1,7 +1,6 @@ package com.sap.sailing.server.replication.test; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; @@ -57,6 +56,7 @@ import com.sap.sailing.domain.persistence.PersistenceFactory; import com.sap.sailing.domain.persistence.media.MediaDBFactory; import com.sap.sailing.domain.racelog.tracking.EmptySensorFixStore; import com.sap.sailing.domain.ranking.OneDesignRankingMetric; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.test.TrackBasedTest; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.TrackedRace; @@ -158,7 +158,7 @@ public class InitialLoadReplicationObjectIdentityTest extends AbstractServerRepl WindTrack masterRCWindFixes = masterTrackedRace.getOrCreateWindTrack(new WindSourceImpl(WindSourceType.RACECOMMITTEE)); masterRCWindFixes.lockForRead(); try { - assertEquals(masterWindFix, masterRCWindFixes.getRawFixes().iterator().next()); + PositionAssert.assertWindEquals(masterWindFix, masterRCWindFixes.getRawFixes().iterator().next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.01); } finally { masterRCWindFixes.unlockAfterRead(); } @@ -233,7 +233,7 @@ public class InitialLoadReplicationObjectIdentityTest extends AbstractServerRepl try { Iterator replicaRCWindFixesIter = replicaRCWindFixes.getRawFixes().iterator(); replicaRCWindFixesIter.next(); - assertEquals(replicaWindFix, replicaRCWindFixesIter.next()); + PositionAssert.assertWindEquals(replicaWindFix, replicaRCWindFixesIter.next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.02); } finally { replicaRCWindFixes.unlockAfterRead(); } diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java index 279a13d9c83..4b7c1667942 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java @@ -20,6 +20,7 @@ import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; import com.sap.sailing.domain.regattalog.impl.EmptyRegattaLogStore; import com.sap.sailing.domain.test.AbstractTracTracLiveTest; import com.sap.sailing.domain.tracking.RaceHandle; +import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.RaceTrackingConnectivityParameters; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.server.RacingEventService; @@ -72,7 +73,7 @@ public class TrackRaceBoatCompetitorMetadataReplicationTest extends AbstractServ startOfTracking, endOfTracking, /* delayToLiveInMillis */ 0l, /* offsetToStartTimeOfSimulatedRace */null, /*ignoreTracTracMarkPassings*/ false, EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, tracTracUsername, tracTracPassword, "", "", /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ false, - /* preferReplayIfAvailable */ false); + /* preferReplayIfAvailable */ false, /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); } private void startTracking() throws Exception, InterruptedException { diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java index 947ea39cbc0..9fa2b1ea6bb 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java @@ -31,6 +31,7 @@ import com.sap.sailing.domain.regattalog.impl.EmptyRegattaLogStore; import com.sap.sailing.domain.test.AbstractTracTracLiveTest; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.RaceHandle; +import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.RaceTrackingConnectivityParameters; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.server.RacingEventService; @@ -90,7 +91,7 @@ public class TrackRaceReplicationTest extends AbstractServerReplicationTest { startOfTracking, endOfTracking, /* delayToLiveInMillis */ 0l, /* offsetToStartTimeOfSimulatedRace */null, /*ignoreTracTracMarkPassings*/ false, EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, tracTracUsername, tracTracPassword, "", "", /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ false, - /* preferReplayIfAvailable */ false); + /* preferReplayIfAvailable */ false, /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); } private void startTracking() throws Exception, InterruptedException { diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java index e1627fad87f..06ba867545a 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java @@ -44,6 +44,7 @@ import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.persistence.MongoWindStore; import com.sap.sailing.domain.persistence.MongoWindStoreFactory; import com.sap.sailing.domain.persistence.PersistenceFactory; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRegatta; import com.sap.sailing.domain.tracking.GPSFixTrack; @@ -130,7 +131,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio competitorTrack.lockForRead(); try { assertEquals(1, Util.size(competitorTrack.getRawFixes())); - assertEquals(fix, competitorTrack.getRawFixes().iterator().next()); + PositionAssert.assertGPSFixEquals(fix, competitorTrack.getRawFixes().iterator().next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.01); assertNotSame(fix, competitorTrack.getRawFixes().iterator().next()); } finally { competitorTrack.unlockAfterRead(); @@ -151,7 +152,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio replicaMarkTrack.lockForRead(); try { assertEquals(1, Util.size(replicaMarkTrack.getRawFixes())); - assertEquals(replicaMarkTrack.getRawFixes().iterator().next(), fix); + PositionAssert.assertGPSFixEquals(replicaMarkTrack.getRawFixes().iterator().next(), fix, /* pos deg delta */ 0.0000001); assertNotSame(fix, replicaMarkTrack.getRawFixes().iterator().next()); } finally { replicaMarkTrack.unlockAfterRead(); @@ -174,7 +175,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio try { assertEquals(1, Util.size(replicaWindTrack.getRawFixes())); Wind replicaWind = replicaWindTrack.getRawFixes().iterator().next(); - assertEquals(wind, replicaWind); + PositionAssert.assertWindEquals(wind, replicaWind, /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.02, /* knot speed delta */ 0.02); assertNotSame(wind, replicaWind); } finally { replicaWindTrack.unlockAfterRead(); diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java index fa18de8ae77..33d122a22b9 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java @@ -37,6 +37,8 @@ import com.sap.sailing.domain.common.tracking.GPSFixMoving; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.persistence.MongoWindStoreFactory; import com.sap.sailing.domain.persistence.PersistenceFactory; +import com.sap.sailing.domain.racelog.tracking.GPSFixStore; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRegatta; import com.sap.sailing.domain.tracking.GPSFixTrack; @@ -157,7 +159,7 @@ public class TrackedRaceWithGPSFixStoreContentsReplicationTest extends AbstractS competitorTrack.lockForRead(); try { assertEquals(1, Util.size(competitorTrack.getRawFixes())); - assertEquals(fix, competitorTrack.getRawFixes().iterator().next()); + PositionAssert.assertGPSFixEquals(fix, competitorTrack.getRawFixes().iterator().next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.01); assertNotSame(fix, competitorTrack.getRawFixes().iterator().next()); } finally { competitorTrack.unlockAfterRead(); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java index ec41b6df4e8..88cdb29ee79 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -21,6 +21,7 @@ import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; import com.sap.sailing.domain.regattalog.impl.EmptyRegattaLogStore; import com.sap.sailing.domain.tracking.RaceHandle; import com.sap.sailing.domain.tracking.RaceListener; +import com.sap.sailing.domain.tracking.RaceTracker; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.TrackedRegatta; import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants; @@ -73,7 +74,8 @@ public class RaceTrackerTest { service, paramUrl, liveUri, storedUri, courseDesignUpdateUri, EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, /* timeoutInMilliseconds */60000, tracTracUsername, tracTracPassword, TracTracConnectionConstants.ONLINE_STATUS, TracTracConnectionConstants.ONLINE_VISIBILITY, - /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ false); + /* trackWind */ false, /* correctWindDirectionByMagneticDeclination */ false, + /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); logger.info("Calling raceHandle.getRaces()"); RaceDefinition race = raceHandle.getRace(); // wait for RaceDefinition to be completely wired in Regatta logger.info("Obtained race: "+race); @@ -133,7 +135,7 @@ public class RaceTrackerTest { EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, /* timeoutInMilliseconds */60000, tracTracUsername, tracTracPassword, TracTracConnectionConstants.ONLINE_STATUS, TracTracConnectionConstants.ONLINE_VISIBILITY, /* trackWind */ false, - /* correctWindDirectionByMagneticDeclination */ false); + /* correctWindDirectionByMagneticDeclination */ false, /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); TrackedRegatta newTrackedRegatta = myRaceHandle.getTrackedRegatta(); assertNotSame(oldTrackedRegatta, newTrackedRegatta); TrackedRace newTrackedRace = getTrackedRace(newTrackedRegatta); @@ -162,7 +164,7 @@ public class RaceTrackerTest { EmptyRaceLogStore.INSTANCE, EmptyRegattaLogStore.INSTANCE, /* timeoutInMilliseconds */60000, tracTracUsername, tracTracPassword, TracTracConnectionConstants.ONLINE_STATUS, TracTracConnectionConstants.ONLINE_VISIBILITY, /* trackWind */ false, - /* correctWindDirectionByMagneticDeclination */ false); + /* correctWindDirectionByMagneticDeclination */ false, /* timeoutInMillis */ (int) RaceTracker.TIMEOUT_FOR_RECEIVING_RACE_DEFINITION_IN_MILLISECONDS); TrackedRegatta newTrackedEvent = myRaceHandle.getTrackedRegatta(); TrackedRace newTrackedRace = getTrackedRace(newTrackedEvent); // expecting a new tracked race to be created when starting over with tracking diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java index a066b9d3e15..ae25eebe128 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java @@ -42,6 +42,7 @@ import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.WindImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.leaderboard.impl.LowPoint; +import com.sap.sailing.domain.test.PositionAssert; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.WindTrack; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; @@ -146,8 +147,22 @@ public class WindByRaceLogTest { try { windTrack.lockForRead(); - assertTrue(Util.contains(windTrack.getFixes(), wind1)); - assertTrue(Util.contains(windTrack.getFixes(), wind2)); + boolean foundWind1 = false; + boolean foundWind2 = false; + for (Wind w : windTrack.getFixes()) { + try { + PositionAssert.assertWindEquals(w, wind1, /* posDegDelta */ 0.000001, /* bearingDegreeDelta */ 0.01, /* knotSpeedDelta */ 0.01); + foundWind1 = true; + } catch (AssertionError e) { + } + try { + PositionAssert.assertWindEquals(w, wind2, /* posDegDelta */ 0.000001, /* bearingDegreeDelta */ 0.01, /* knotSpeedDelta */ 0.01); + foundWind2 = true; + } catch (AssertionError e) { + } + } + assertTrue(foundWind1); + assertTrue(foundWind2); } finally { windTrack.unlockAfterRead(); } @@ -172,7 +187,15 @@ public class WindByRaceLogTest { try { windTrack.lockForRead(); - assertTrue(Util.contains(windTrack.getFixes(), wind1)); + boolean foundWind1 = false; + for (Wind w : windTrack.getFixes()) { + try { + PositionAssert.assertWindEquals(w, wind1, /* posDegDelta */ 0.000001, /* bearingDegreeDelta */ 0.01, /* knotSpeedDelta */ 0.01); + foundWind1 = true; + } catch (AssertionError e) { + } + } + assertTrue(foundWind1); } finally { windTrack.unlockAfterRead(); } diff --git a/java/com.sap.sailing.server.trackfiles.test/resources/FMU_out_new.txt b/java/com.sap.sailing.server.trackfiles.test/resources/FMU_out_new.txt new file mode 100755 index 00000000000..d93a9867c48 --- /dev/null +++ b/java/com.sap.sailing.server.trackfiles.test/resources/FMU_out_new.txt @@ -0,0 +1,10 @@ +#------------------------------------------------------------ +#-- File created 08/03/2017 at 05:38:19 +#------------------------------------------------------------ +jjlDATE jjlTIME Epoch RideHeight RideHeightPortHull RideHeightStbdHull Heel Trim ImuSensor_GyroX ImuSensor_GyroY ImuSensor_GyroZ ImuSensor_Pitch ImuSensor_Roll ImuSensor_Yaw ImuSensor_LinearAccX ImuSensor_LinearAccY ImuSensor_LinearAccZ Hb_Z Dn_Z Db_Z LKF_ride_hgh LKF_ride_hgh_Position LKF_ride_hgh_Velocity LKF_ride_hgh_Acceleration LKF_ride_hgh_PositionError LKF_ride_hgh_VelocityError LKF_ride_hgh_AccelerationError Gps_Gga_PosFixTime Gps_Gga_Lat Gps_Gga_Lon Gps_Gga_QI Gps_Gga_HDOP Gps_Gga_AntHeight Gps_Vtg_TMG Gps_Vtg_SOGKnots Gps_Rmc_MagVar Gps_EastVelocity Gps_NorthVelocity Gps_UpVelocity BravoNet_Node0x0A0_Ch0 BravoNet_Node0x0A0_Voltage BravoNet_Node0x0A0_Temperature BravoNet_Node0x0A0_Current SyncTimeDiff SyncTimeSync SyncTimeUpdateCount SyncTimePercentageToSync ES_OnTimeSync +20170308.000000 53819.390491 1488951499390.000000 0.313796 -0.714744 -0.853481 -1.500000 3.200000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.100172 -0.314127 -0.330172 0.016091 -0.314174 -0.004288 -0.000000 0.121613 1.403056 0.062733 53819.200000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.001831 24.295210 21.217340 0.015640 542266653.468207 0.000000 1.000000 0.000000 0.000000 +20170308.000000 53819.487567 1488951499481.000000 0.313992 -0.714548 -0.853286 -1.500000 3.200000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.100172 -0.314127 -0.330172 0.016090 -0.314261 -0.002298 0.000000 0.097345 0.648185 0.049813 53819.400000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.295210 21.000116 0.023460 0.000077 1.000000 1.000000 0.000000 1.000000 +20170308.000000 53819.585786 1488951499572.000000 0.314025 -0.714515 -0.853253 -1.500000 3.200000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 -0.099696 -0.313652 -0.329696 0.019540 -0.313953 -0.000227 0.000001 0.086096 0.423595 0.043597 53819.400000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.295210 20.782894 0.046921 0.000077 1.000000 1.000000 0.000000 1.000000 +20170308.000000 53819.685771 1488951499682.000000 0.313923 -0.714617 -0.853355 -1.500000 3.200000 -0.086588 -0.214116 0.175599 -0.000000 0.000000 0.000000 -0.258920 0.519435 -0.087402 -0.099696 -0.313652 -0.329696 0.019270 -0.313730 0.000672 0.000839 0.075893 0.287746 0.038563 53819.600000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.253178 21.000116 0.046921 -0.000199 1.000000 1.000000 0.000000 1.000000 +20170308.000000 53819.782123 1488951499772.000000 0.313831 -0.714709 -0.853447 -1.500000 3.200000 0.013137 -0.213877 0.120009 -1.060399 -3.133662 0.001262 -0.108944 0.029720 0.070589 -0.099696 -0.313652 -0.329696 0.015927 -0.313576 0.001633 0.003961 0.069401 0.222243 0.035510 53819.600000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.295210 21.000116 0.046921 -0.000199 1.000000 1.000000 0.000000 1.000000 +20170308.000000 53819.880156 1488951499863.000000 0.314961 -0.768407 -0.798152 -0.321583 2.797351 0.072364 -0.168356 0.209327 -1.091322 -3.133510 0.016635 -0.068841 0.000188 0.184953 -0.099696 -0.324611 -0.329696 0.016254 -0.318301 -0.005391 0.019517 0.064999 0.178037 0.033119 53819.800000 2337.887200 5815.964540 0.000000 0.000000 0.000000 0.000000 0.000000 1.300000 0.000000 0.000000 0.000000 -0.002441 24.295210 21.000116 0.031281 -0.000724 1.000000 1.000000 0.000000 1.000000 diff --git a/java/com.sap.sailing.server.trackfiles.test/resources/Undefined Race - BRAVO.txt b/java/com.sap.sailing.server.trackfiles.test/resources/Undefined Race - BRAVO.txt index df22ca99e10..1ef50c43ef3 100644 --- a/java/com.sap.sailing.server.trackfiles.test/resources/Undefined Race - BRAVO.txt +++ b/java/com.sap.sailing.server.trackfiles.test/resources/Undefined Race - BRAVO.txt @@ -1,7 +1,7 @@ #------------------------------------------------------------ #-- File created 09/04/2016 at 23:26:40 #------------------------------------------------------------ -jjlDATE jjlTIME Epoch RideHeight RideHeightPortHull RideHeightStbdHull Heel Trim ImuSensor_GyroX ImuSensor_GyroY ImuSensor_GyroZ ImuSensor_Pitch ImuSensor_Roll ImuSensor_Yaw ImuSensor_LinearAccX ImuSensor_LinearAccY ImuSensor_LinearAccZ Hb_Z Dn_Z Db_Z LKF_ride_hgh LKF_ride_hgh_Position LKF_ride_hgh_Velocity LKF_ride_hgh_Acceleration LKF_ride_hgh_PositionError LKF_ride_hgh_VelocityError LKF_ride_hgh_AccelerationError Gps_Gga_PosFixTime Gps_Gga_Lat Gps_Gga_Lon Gps_Gga_QI Gps_Gga_HDOP Gps_Gga_AntHeight Gps_Vtg_TMG Gps_Vtg_SOGKnots Gps_Rmc_MagVar Gps_EastVelocity Gps_NorthVelocity Gps_UpVelocity BravoNet_Node0x0A0_Ch0 BravoNet_Node0x0A0_Voltage BravoNet_Node0x0A0_Temperature BravoNet_Node0x0A0_Current +jjlDATE jjlTIME Epoch RideHeight RideHeightPortHull RideHeightStbdHull Heel Trim ImuSensor_GyroX ImuSensor_GyroY ImuSensor_GyroZ ImuSensor_Pitch ImuSensor_Roll ImuSensor_Yaw ImuSensor_LinearAccX ImuSensor_LinearAccY ImuSensor_LinearAccZ Hb_Z Dn_Z Db_Z LKF_ride_hgh LKF_ride_hgh_Position LKF_ride_hgh_Velocity LKF_ride_hgh_Acceleration LKF_ride_hgh_PositionError LKF_ride_hgh_VelocityError LKF_ride_hgh_AccelerationError Gps_Gga_PosFixTime Gps_Gga_Lat Gps_Gga_Lon Gps_Gga_QI Gps_Gga_HDOP Gps_Gga_AntHeight Gps_Vtg_TMG Gps_Vtg_SOGKnots Gps_Rmc_MagVar Gps_EastVelocity Gps_NorthVelocity Gps_UpVelocity BravoNet_Node0x0A0_Ch0 BravoNet_Node0x0A0_Voltage BravoNet_Node0x0A0_Temperature BravoNet_Node0x0A0_Current 20160409.000000 232640.908740 1460244399905.000000 0.757862 0.650044 0.865680 2.095203 -10.572519 0.014012 0.080612 0.075319 -10.572519 -2.095203 358.804353 -0.021935 0.017397 0.000239 -0.673131 -0.757548 -0.743131 0.013623 -0.757862 -0.004228 -0.018140 0.074238 0.272712 0.037974 212640.800000 5232.276310 1325.488310 1.000000 1.100000 80.800000 306.100000 0.370000 3.200000 -0.170000 0.130000 -0.000000 0.733032 24.043011 36.640236 0.054741 20160409.000000 232641.008763 1460244399995.000000 0.758014 0.650158 0.865870 2.095937 -10.571562 0.032092 0.217810 -0.023014 -10.571683 -2.096830 358.798479 -0.028412 0.021632 -0.027246 -0.673131 -0.757548 -0.743131 0.019586 -0.758014 -0.005095 -0.018096 0.069231 0.211765 0.035063 212640.800000 5232.276310 1325.488310 1.000000 1.100000 80.800000 306.100000 0.370000 3.200000 -0.150000 0.110000 -0.000000 0.733032 24.000978 35.988564 0.054741 20160409.000000 232641.105742 1460244400089.000000 0.758203 0.650319 0.866087 2.096466 -10.570188 0.073738 0.193435 0.107095 -10.570447 -2.097253 358.792882 -0.042638 0.045676 -0.010817 -0.673131 -0.757547 -0.743131 0.019374 -0.758203 -0.006152 -0.018839 0.064587 0.170564 0.032760 212641.000000 5232.276260 1325.488390 1.000000 1.100000 80.800000 306.100000 0.300000 3.200000 -0.150000 0.110000 -0.000000 0.733032 24.043011 35.988564 0.054741 diff --git a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java index 064f35a4b2d..2112fffb572 100644 --- a/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java +++ b/java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/BravoDataImportTest.java @@ -48,6 +48,11 @@ public class BravoDataImportTest { testImport(ImportData.FILE_UNDEFINED_RACE_BRAVO); } + @Test + public void testFileImportNewFormat() throws FormatNotSupportedException, IOException { + testImport(ImportData.FILE_NEW_BRAVO_FORMAT); + } + @Test public void testDefaultHeaderNoDataImport() throws FormatNotSupportedException, IOException { testImport(ImportData.DUMMY_DEFAULT_HEADER_NO_DATA); @@ -64,7 +69,6 @@ public class BravoDataImportTest { } private void testImport(ImportData importData) throws FormatNotSupportedException, IOException { - bravoDataImporter.importFixes(importData.getInputStream(), (fixes, device) -> { for (DoubleVectorFix fix : fixes) { callbackCallCount++; @@ -85,6 +89,12 @@ public class BravoDataImportTest { return getClass().getResourceAsStream("/Undefined Race - BRAVO.txt"); } }, + FILE_NEW_BRAVO_FORMAT(6, 1) { + @Override + protected InputStream getInputStream() { + return getClass().getResourceAsStream("/FMU_out_new.txt"); + } + }, DUMMY_DEFAULT_HEADER_NO_DATA(0, 0) { @Override protected InputStream getInputStream() { diff --git a/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/BravoDataImporterImpl.java b/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/BravoDataImporterImpl.java index f18665cde9d..25dd4f54226 100644 --- a/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/BravoDataImporterImpl.java +++ b/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/BravoDataImporterImpl.java @@ -6,8 +6,10 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Serializable; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; @@ -142,10 +144,12 @@ public class BravoDataImporterImpl implements DoubleVectorFixImporter { String header = headerTokens[j]; colIndicesInFile.put(header, j); } - List columnsInFix = metadata.getFileColumns(); - if (colIndicesInFile.size() != columnsInFix.size() || !colIndicesInFile.keySet().containsAll(columnsInFix)) { - LOG.log(Level.SEVERE, "Missing headers"); - throw new RuntimeException("Missing headers in import files"); + List requiredColumnsInFix = metadata.getTrackColumns(); + if (!colIndicesInFile.keySet().containsAll(requiredColumnsInFix)) { + final Set missingColumns = new HashSet<>(requiredColumnsInFix); + missingColumns.removeAll(colIndicesInFile.keySet()); + LOG.log(Level.SEVERE, "Missing headers: "+missingColumns); + throw new RuntimeException("Missing headers "+missingColumns+" in import files"); } return colIndicesInFile; } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 41d0ce96686..03cf94a9d5d 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -1707,7 +1707,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes } @Override - public void correctedScoreChanced(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, + public void correctedScoreChanged(Competitor competitor, RaceColumn raceColumn, Double oldCorrectedScore, Double newCorrectedScore) { notifyForCompetitorIfNotAlreadyNotifiedRecently(competitor, raceColumn); } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java index d861dd49adc..7ca30b7528d 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java @@ -31,8 +31,8 @@ import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.impl.MasterDataImportObjectCreationCountImpl; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixImpl; -import com.sap.sailing.domain.common.tracking.impl.CompactGPSFixMovingImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixImpl; +import com.sap.sailing.domain.common.tracking.impl.VeryCompactGPSFixMovingImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl; import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl; import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard; @@ -415,12 +415,12 @@ public class ImportMasterDataOperation extends DeviceIdentifier device = entry.getKey(); final Collection fixesToAddAsBatch = new ArrayList<>(BATCH_SIZE_FOR_IMPORTING_FIXES); for (Timed fixToAdd : entry.getValue()) { - if (fixToAdd instanceof CompactGPSFixMovingImpl) { - CompactGPSFixMovingImpl gpsFix = (CompactGPSFixMovingImpl) fixToAdd; + if (fixToAdd instanceof VeryCompactGPSFixMovingImpl) { + VeryCompactGPSFixMovingImpl gpsFix = (VeryCompactGPSFixMovingImpl) fixToAdd; fixToAdd = new GPSFixMovingImpl(gpsFix.getPosition(), fixToAdd.getTimePoint(), - ((CompactGPSFixMovingImpl) fixToAdd).getSpeed()); - } else if (fixToAdd instanceof CompactGPSFixImpl) { - CompactGPSFixImpl gpsFix = (CompactGPSFixImpl) fixToAdd; + ((VeryCompactGPSFixMovingImpl) fixToAdd).getSpeed()); + } else if (fixToAdd instanceof VeryCompactGPSFixImpl) { + VeryCompactGPSFixImpl gpsFix = (VeryCompactGPSFixImpl) fixToAdd; fixToAdd = new GPSFixImpl(gpsFix.getPosition(), fixToAdd.getTimePoint()); } fixesToAddAsBatch.add(fixToAdd); diff --git a/java/com.sap.sailing.www/release_notes_admin.html b/java/com.sap.sailing.www/release_notes_admin.html old mode 100644 new mode 100755 index 8756280da20..0005b394c06 --- a/java/com.sap.sailing.www/release_notes_admin.html +++ b/java/com.sap.sailing.www/release_notes_admin.html @@ -23,6 +23,23 @@

Release Notes - Administration Console

+

March 2017

+
    +
  • A more compact internal storage format for GPS and Wind fixes is now being used. Instead of a full + 64-bit "double" value for all components such at latitude, longitude, speed over ground or course over + ground, "smaller" data types such as "int" and "short" are now employed. The reduction of accuracy + that this brings about is negligible given the accuracy of the tracking systems used. For example, + the latitude values are encoded such that while covering the full range from -90° to +90°, the + resolution is at 4.6mm. Similarly, speeds are represented in their compact form in such a way + that speeds up to 500kts can be represented at a resolution of 0.015kts. +
    • +
  • When a race cannot be loaded successfully through the TracTrac connector, e.g., because its boat + class does not match the regatta's boat class, the tracker is now stopped, and a SEVERE log message + is written, giving the reason for the failure to load the race. This gives administrators an opportunity + to correct any errors in the underlying data and try again. Previously, tracking such a + was not possible without a server re-start because the tracker continued to exist. +
    • +

February 2017

  • Wind data in GRIB format can now be imported in the "Wind" sub-tab of the "Tracked Races" tab diff --git a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java index cea1755f607..f95629286a3 100644 --- a/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java +++ b/java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java @@ -19,6 +19,7 @@ import java.net.URL; import java.net.URLConnection; import java.util.ArrayList; import java.util.List; +import java.util.Random; import java.util.UUID; import java.util.logging.Level; import java.util.logging.Logger; @@ -131,7 +132,7 @@ public abstract class AbstractServerReplicationTestSetUp script that compiles the code in the src folder, creates the test.jar library and execute the code of the example. - Manifest.txt -> manifest used to create the test.jar file +******************************************** +************* TracAPI 3.6.0 **************** +******************************************** +This is a final version. It change the signature of a couple of methods, breaking the +backward compatibility. These changes are: + + - The IEventFactory.createRace(URI) doesn't throw the TimeOutException. + - The IEventFactory.createRace(URI, URI, URI) doesn't throw the TimeOutException. + +This version provides a new JavaDoc version. + +Release date: 08/03/2017 +Build number: 13498 + + 1) Features + + - Removing the TimeOutException of some methods of the IEventFactory (Requested by Axel Uhl, 08/03/2017) + +******************************************** +************* TracAPI 3.5.0 **************** +******************************************** +This is a final version. It fixes bugs in the implementation and it adds some new features. +These features add methods to the API breaking the backward compatibility. These changes are: + + - The IRaceCompetitor interface changes the return type of the getStatusTime method + from Date to long. + - The methods IEventFactory.createRace throw now a TimeOutException when there is a timeout + downloading the parameters file. + +This version provides a new JavaDoc version. + +Release date: 07/03/2017 +Build number: 13490 + + 1) Features + + - Updating the return type of the IRaceCompetitor.getStatusTime from Date to long to + be consistent with the API (Requested by Jorge Piera, 13/02/2017) + - Adding the methods ISegment.getExtent(), the IRoute.getExtent() and IRace.getExtent() + that return the extent of the object (Requested by Jorge Piera, 23/02/2017) + - Adding an extra parameter to the IEventFactory.createRace methods to indicate + the timeout used to download the parameters file. The IEventFactory also includes a method + getDefaultTimeOut that returns the default timeout (Requested by Axel Uhl, 06/03/2017) + +******************************************** +************* TracAPI 3.4.1 **************** +******************************************** +This is a final version. Only fixes bugs in the implementation + +Release date: 20/02/2017 +Build number: 13415 + + 1) Bugs + + - TracAPI doesn't send all data when the races are retrieved in parallel. + It is an error in the thread that executes the callback messages that in some + internal circumstances, doesn't execute the callback (Reported by Axel Uhl, + 13/02/2017) + ******************************************** ************* TracAPI 3.4.0 **************** ******************************************** @@ -33,9 +92,9 @@ Build number: 13339 1) Features - Adding the method IRace.getDataSource that returns the datasource used by the race - to load data (Requested by Axel Ulh, 25/01/2017) + to load data (Requested by Axel Uhl, 25/01/2017) - Adding the method IRacesListener.dataSourceChanged that sends a notification - every time that the datasource of a race changes (Requested by Axel Ulh, 25/01/2017) + every time that the datasource of a race changes (Requested by Axel Uhl, 25/01/2017) 2) Bugs diff --git a/java/com.tractrac.clientmodule/javadoc/allclasses-frame.html b/java/com.tractrac.clientmodule/javadoc/allclasses-frame.html index 8df91bfc193..566bce0b293 100755 --- a/java/com.tractrac.clientmodule/javadoc/allclasses-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/allclasses-frame.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -14,6 +14,7 @@
    • AbstractAttachable
    • CreateModelException
      • +
    • DataSource
    • EventType
    • IAttachable
    • IAttachmentKey
      • @@ -37,6 +38,7 @@
    • IEventFactory
    • IEventMessageListener
    • IEventSubscriber
      • +
    • IExtent
    • IGeoCoordinate
    • IIdentifiable
    • ILiveDataEvent
      • diff --git a/java/com.tractrac.clientmodule/javadoc/allclasses-noframe.html b/java/com.tractrac.clientmodule/javadoc/allclasses-noframe.html index 5141cbb0cce..2ce68ebe1c8 100755 --- a/java/com.tractrac.clientmodule/javadoc/allclasses-noframe.html +++ b/java/com.tractrac.clientmodule/javadoc/allclasses-noframe.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -14,6 +14,7 @@
      • AbstractAttachable
      • CreateModelException
        • +
      • DataSource
      • EventType
      • IAttachable
      • IAttachmentKey
        • @@ -37,6 +38,7 @@
      • IEventFactory
      • IEventMessageListener
      • IEventSubscriber
        • +
      • IExtent
      • IGeoCoordinate
      • IIdentifiable
      • ILiveDataEvent
        • diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/IIdentifiable.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/IIdentifiable.html index 9492d492d83..0b765adeb63 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/IIdentifiable.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/IIdentifiable.html @@ -2,9 +2,9 @@ - + IIdentifiable - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/INamed.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/INamed.html index 6468c81199e..417fdce74fd 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/INamed.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/INamed.html @@ -2,9 +2,9 @@ - + INamed - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/ModelLocator.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/ModelLocator.html index ae65c92b7f7..e1e79ae60c4 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/ModelLocator.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/ModelLocator.html @@ -2,9 +2,9 @@ - + ModelLocator - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/AbstractAttachable.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/AbstractAttachable.html index 38aad0e3192..72d510de9a9 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/AbstractAttachable.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/AbstractAttachable.html @@ -2,9 +2,9 @@ - + AbstractAttachable - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachable.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachable.html index 1ec28d7b4b4..5a83ea6eb5c 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachable.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachable.html @@ -2,9 +2,9 @@ - + IAttachable - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentKey.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentKey.html index 8ad21a3ab94..ca59ba35b02 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentKey.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentKey.html @@ -2,9 +2,9 @@ - + IAttachmentKey - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentManager.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentManager.html index 316b10ffab0..092ad80102d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentManager.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/IAttachmentManager.html @@ -2,9 +2,9 @@ - + IAttachmentManager - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-frame.html index 1e18edcce7e..fe6f81f8b18 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.attachment - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-summary.html index f0daf6f5027..4328cd04606 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.attachment - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-tree.html index f34990ed89e..dd90a447ce4 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/attachment/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.attachment Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassing.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassing.html index 8545c8b9b44..1947744110d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassing.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassing.html @@ -2,9 +2,9 @@ - + IControlPassing - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassings.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassings.html index 18ffb2870fa..4a5c8bde5ff 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassings.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IControlPassings.html @@ -2,9 +2,9 @@ - + IControlPassings - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IMessageData.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IMessageData.html index f018c64e374..6c46fb7c22a 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IMessageData.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IMessageData.html @@ -2,9 +2,9 @@ - + IMessageData - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPosition.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPosition.html index 7900eecc0c1..0f4db8a93be 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPosition.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPosition.html @@ -2,9 +2,9 @@ - + IPosition - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionFactory.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionFactory.html index 71e893e4ed1..3b0d167eced 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionFactory.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionFactory.html @@ -2,9 +2,9 @@ - + IPositionFactory - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionOffset.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionOffset.html index 672add36389..b117f50b281 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionOffset.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionOffset.html @@ -2,9 +2,9 @@ - + IPositionOffset - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionSnapped.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionSnapped.html index b84155cfeb4..d2e48ffa570 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionSnapped.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IPositionSnapped.html @@ -2,9 +2,9 @@ - + IPositionSnapped - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IStartStopData.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IStartStopData.html index f4fbf377e26..f120f3de3dc 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IStartStopData.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/IStartStopData.html @@ -2,9 +2,9 @@ - + IStartStopData - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/ITimeData.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/ITimeData.html index 11e80755e12..5a5c58af6cf 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/ITimeData.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/ITimeData.html @@ -2,9 +2,9 @@ - + ITimeData - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-frame.html index eb6a26e0012..a47158fb949 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.data - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-summary.html index e1840cb3bcc..b1dba5e600d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.data - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-tree.html index e4bd9d9035f..b3d721180d6 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/data/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.data Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/CreateModelException.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/CreateModelException.html index 018b2a199b9..ddd02166c06 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/CreateModelException.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/CreateModelException.html @@ -2,9 +2,9 @@ - + CreateModelException - + @@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
        • Frames
          • @@ -254,7 +254,7 @@ extends java.lang.Exception
          • Frames
            • diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/EventType.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/EventType.html index 148f6e9baaf..f01b80d52c8 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/EventType.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/EventType.html @@ -2,9 +2,9 @@ - + EventType - + @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
            @@ -391,7 +391,7 @@ not permitted.)
          diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ICompetitor.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ICompetitor.html index ed50af16641..168af32ae1d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ICompetitor.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ICompetitor.html @@ -2,9 +2,9 @@ - + ICompetitor - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ICompetitorClass.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ICompetitorClass.html index 16df0eb6e49..55bcf50b9fd 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ICompetitorClass.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ICompetitorClass.html @@ -2,9 +2,9 @@ - + ICompetitorClass - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IEvent.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IEvent.html index e625fcae100..0591bbaddfe 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IEvent.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IEvent.html @@ -2,9 +2,9 @@ - + IEvent - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IEventFactory.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IEventFactory.html index 73057c2537a..380c412cd4b 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IEventFactory.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IEventFactory.html @@ -2,9 +2,9 @@ - + IEventFactory - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6}; +var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -168,23 +168,47 @@ extends com.tractrac.common.lib.api.service.IServiceProvider IRace createRace(java.net.URI parametersURI) -
          Creates an IRace from a parameters file
          +
          Creates an IRace from a parameters file.
          IRace -createRace(java.net.URI parametersURI, +createRace(java.net.URI parametersURI, + int timeout) +
          Creates an IRace from a parameters file
          + + + +IRace +createRace(java.net.URI parametersURI, + int timeout, java.net.URI liveUri, java.net.URI storedUri)
          Creates an IRace from a parameters file
          - + +IRace +createRace(java.net.URI parametersURI, + java.net.URI liveUri, + java.net.URI storedUri) +
          Creates an IRace from a parameters file.
          + + + void deleteCache()
          Deletes all the cached objects that has been created
          + +int +getDefaultTimeOut() +
          Gets the number of milliseconds of the default timeout that has this + IEventFactory that is used to download the different + resources
          + +
        @@ -265,7 +289,8 @@ extends com.tractrac.common.lib.api.service.IServiceProvider

        createRace

        IRace createRace(java.net.URI parametersURI)
           throws CreateModelException
        -
        Creates an IRace from a parameters file
        +
        Creates an IRace from a parameters file. It waits forever to download the + requested parameters file
        Parameters:
        parametersURI - the parameters file
        @@ -276,6 +301,29 @@ extends com.tractrac.common.lib.api.service.IServiceProvider
      + + + +
        +
      • +

        createRace

        +
        IRace createRace(java.net.URI parametersURI,
+                 int timeout)
+          throws CreateModelException,
+                 com.tractrac.util.lib.api.exceptions.TimeOutException
        +
        Creates an IRace from a parameters file
        +
        +
        Parameters:
        +
        parametersURI - the parameters file
        +
        timeout - the timeout in milliseconds used to download the parameters file
        +
        Returns:
        +
        a race
        +
        Throws:
        +
        CreateModelException - if there is any error creating the model
        +
        com.tractrac.util.lib.api.exceptions.TimeOutException - when the factory gets a timeout downloading an external resource.
        +
        +
        • +
      @@ -286,7 +334,8 @@ extends com.tractrac.common.lib.api.service.IServiceProvider java.net.URI liveUri, java.net.URI storedUri) throws CreateModelException -
      Creates an IRace from a parameters file
      +
      Creates an IRace from a parameters file. It waits forever to download the + requested parameters file
      Parameters:
      parametersURI - the parameters file
      @@ -299,6 +348,33 @@ extends com.tractrac.common.lib.api.service.IServiceProvider
    + + + +
      +
    • +

      createRace

      +
      IRace createRace(java.net.URI parametersURI,
+                 int timeout,
+                 java.net.URI liveUri,
+                 java.net.URI storedUri)
+          throws CreateModelException,
+                 com.tractrac.util.lib.api.exceptions.TimeOutException
      +
      Creates an IRace from a parameters file
      +
      +
      Parameters:
      +
      parametersURI - the parameters file
      +
      timeout - the timeout in milliseconds used to download the parameters file
      +
      liveUri - the uri where the live provider is located
      +
      storedUri - the uri where the stored provider is located
      +
      Returns:
      +
      a race
      +
      Throws:
      +
      CreateModelException - if there is any error creating the model
      +
      com.tractrac.util.lib.api.exceptions.TimeOutException - when the factory gets a timeout downloading an external resource.
      +
      +
      • +
    @@ -344,13 +420,29 @@ extends com.tractrac.common.lib.api.service.IServiceProvider -
      +

      • deleteCache

        void deleteCache()
        Deletes all the cached objects that has been created
      + + + +
        +
      • +

        getDefaultTimeOut

        +
        int getDefaultTimeOut()
        +
        Gets the number of milliseconds of the default timeout that has this + IEventFactory that is used to download the different + resources
        +
        +
        Returns:
        +
        the default timeout in milliseconds
        +
        +
        • +
    • diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRace.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRace.html index 3b4255a0047..9c78dc501fb 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRace.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRace.html @@ -2,9 +2,9 @@ - + IRace - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6}; +var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -146,96 +146,108 @@ extends +DataSource +getDataSource() +
    Gets the datasource used to retrieve data for the race
    + + + IRoute getDefaultRoute()
    Gets the default route
    - + IEvent getEvent()
    Gets the event that contains the race
    - + long getExpectedRaceStartDate()
    It returns the expected date when the race starts.
    - + +IExtent +getExtent() +
    Gets the extent where the race is going to be celebrated
    + + + int getLiveDelay()
    Returns the live delay in seconds.
    - + java.net.URI getLiveURI()
    Gets the live URI of this race.
    - + com.tractrac.util.lib.api.programparameters.IParameterSet getParameterSet()
    Returns the parameters used to create this event.
    - + java.net.URI getParamsURI()
    Gets the parameters file used to load this race
    - + IRaceCompetitor getRaceCompetitor(java.util.UUID competitorId)
    Returns a race competitor by competitor id
    - + java.util.List<IRaceCompetitor> getRaceCompetitors()
    Returns the competitors that participate in this race.
    - + long getRaceEndTime()
    End time of race.
    - + IRaceSerie getRaceSerie()
    If the race is a part of a serie.
    - + long getRaceStartTime()
    Start time of race.
    - + java.util.List<IRoute> getRoutes()
    Gets the routes of this race
    - + StartTimeType getStartTimeType()
    Gets the start time type of the race.
    - + RaceStatusType getStatus()
    Gets the status of the race that can be: @@ -256,60 +268,85 @@ extends - + java.net.URI getStoredURI()
    Gets the stored URI of this race.
    - + long getTrackingEndTime()
    End of tracking time when the trackers have stopped to send positions.
    - + long getTrackingStartTime()
    Start of tracking time can be set before start of race time in case it is interesting to follow what happens up til the start time of the race.
    - + RaceVisibilityType getVisibility() -
    Gets the visibility of the race that can be: +
    According to the event manager, the visibility of the race can be: Hidden: the race is not visible Offline: the race is visible but it is not accessible - Online: the race is visible and accessible (the replay status has - been merged with this status) + Online: the race is visible and accessible + + + If we also consider the race tracking time, the race can be: + + Replay: the race was celebrated in the past + Live: the race is in an online status ath this moment + Coming up: the race will be celebrated in the future + + + Combining these two dimensions, the possible values for the RaceVisibilityType + enum are: + + + Hidden: if the race has the HIDDEN value in the event manager + Offline: if the race has the OFFLINE value in the event manager + Replay: if the race has the ONLINE value in the event manager and it is over + Live: if the race has the ONLINE value in the event manager and it is online + Coming up: if the race has the ONLINE value in the event manager and it is coming up
    - + boolean isInitialized()
    This value means if the race has been initialized.
    - + void reloadFromServer()
    This method is used to reload a race from the server using the parameters file
    - + +void +setDatasourceURIs(java.net.URI liveURI, + java.net.URI storedURI, + java.net.URI wsURI) +
    Sets the datasources used to load data
    + + + void setInitialized(boolean initialized)
    Sets a race to an initialized state.
    - + IRaceCompetitor updateRaceCompetitor(IRaceCompetitor raceCompetitor)
    Updates a race competitor
    @@ -608,12 +645,29 @@ extends

    getVisibility

    RaceVisibilityType getVisibility()
    -
    Gets the visibility of the race that can be: +
    According to the event manager, the visibility of the race can be:
    • Hidden: the race is not visible
    • Offline: the race is visible but it is not accessible
      • -
    • Online: the race is visible and accessible (the replay status has - been merged with this status)
      • +
    • Online: the race is visible and accessible
      • +
    + + If we also consider the race tracking time, the race can be: +
      +
    • Replay: the race was celebrated in the past
      • +
    • Live: the race is in an online status ath this moment
      • +
    • Coming up: the race will be celebrated in the future
      • +
    + + Combining these two dimensions, the possible values for the RaceVisibilityType + enum are: + +
      +
    • Hidden: if the race has the HIDDEN value in the event manager
      • +
    • Offline: if the race has the OFFLINE value in the event manager
      • +
    • Replay: if the race has the ONLINE value in the event manager and it is over
      • +
    • Live: if the race has the ONLINE value in the event manager and it is online
      • +
    • Coming up: if the race has the ONLINE value in the event manager and it is coming up
    Returns:
    @@ -808,10 +862,28 @@ extends
+ + + +
    +
  • +

    setDatasourceURIs

    +
    void setDatasourceURIs(java.net.URI liveURI,
+                       java.net.URI storedURI,
+                       java.net.URI wsURI)
    +
    Sets the datasources used to load data
    +
    +
    Parameters:
    +
    liveURI - the live URI
    +
    storedURI - the stored URI
    +
    wsURI - the web sockets URI
    +
    +
    • +
-
    +

    • getStartTimeType

      StartTimeType getStartTimeType()
      @@ -830,6 +902,34 @@ extends
    + + + +
      +
    • +

      getDataSource

      +
      DataSource getDataSource()
      +
      Gets the datasource used to retrieve data for the race
      +
      +
      Returns:
      +
      the datasource
      +
      +
      • +
    + + + +
      +
    • +

      getExtent

      +
      IExtent getExtent()
      +
      Gets the extent where the race is going to be celebrated
      +
      +
      Returns:
      +
      the extent
      +
      +
      • +
diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRaceCompetitor.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRaceCompetitor.html index fddbffab4bb..719006802fe 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRaceCompetitor.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRaceCompetitor.html @@ -2,9 +2,9 @@ - + IRaceCompetitor - + @@ -162,9 +162,10 @@ extends -java.util.Date +long getStatusTime() -
When the status is one of: ABANDONED, RETIRED or DISQUALIFIED it contains when the +
+ When the status is one of: ABANDONED, RETIRED or DISQUALIFIED it contains when the competitor has changed to this state.
@@ -290,9 +291,16 @@ extends

  • getStatusTime

    -
    java.util.Date getStatusTime()
    -
    When the status is one of: ABANDONED, RETIRED or DISQUALIFIED it contains when the - competitor has changed to this state.
    +
    long getStatusTime()
    +

    + When the status is one of: ABANDONED, RETIRED or DISQUALIFIED it contains when the + competitor has changed to this state. +

    + +

    + If this value is 0L means that this value has not been + established. +

    Returns:
    Date when the current status became active.
    diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRaceSerie.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRaceSerie.html index 9d97f67f453..edcc3aa751e 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRaceSerie.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/IRaceSerie.html @@ -2,9 +2,9 @@ - + IRaceSerie - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ITeam.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ITeam.html index 3a38b58f20e..87b5f6872c0 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ITeam.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/ITeam.html @@ -2,9 +2,9 @@ - + ITeam - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceCompetitorStatusType.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceCompetitorStatusType.html index 3a760eef207..76144387a5e 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceCompetitorStatusType.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceCompetitorStatusType.html @@ -2,9 +2,9 @@ - + RaceCompetitorStatusType - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceLoadingException.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceLoadingException.html index 2c0f3bcc518..6460b94a434 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceLoadingException.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceLoadingException.html @@ -2,9 +2,9 @@ - + RaceLoadingException - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceStatusType.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceStatusType.html index e352d88b66b..242baad9060 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceStatusType.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceStatusType.html @@ -2,9 +2,9 @@ - + RaceStatusType - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceVisibilityType.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceVisibilityType.html index 2e041b9dcfa..ec2e720ded6 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceVisibilityType.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/RaceVisibilityType.html @@ -2,9 +2,9 @@ - + RaceVisibilityType - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/StartTimeType.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/StartTimeType.html index 52fbdf78617..b4af5398d78 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/StartTimeType.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/StartTimeType.html @@ -2,9 +2,9 @@ - + StartTimeType - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-frame.html index fe541bc1b3c..0bffe93ec11 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.event - + @@ -24,6 +24,7 @@

    Enums

      +
    • DataSource
    • EventType
    • RaceCompetitorStatusType
    • RaceStatusType
      • diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-summary.html index 705061a553b..552aec60d85 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.event - + @@ -154,31 +154,38 @@ +DataSource + +
      + The datasource used to load data
      + + + EventType
      The type of the event, according with the EventManager
      - + RaceCompetitorStatusType
      Enumeration representing all the possible values for the competitor status.
      - + RaceStatusType
      Values for race status.
      - + RaceVisibilityType
      Values for race visitility.
      - + StartTimeType
      Type of start time to use.
      diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-tree.html index d6fd978a7df..4d205683748 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/event/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.event Class Hierarchy - + @@ -150,9 +150,10 @@
      • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadata.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadata.html index 834ff2455a8..b1ba5c589db 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadata.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadata.html @@ -2,9 +2,9 @@ - + IMetadata - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadataContainer.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadataContainer.html index 8ba84079035..7f6bf296902 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadataContainer.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadataContainer.html @@ -2,9 +2,9 @@ - + IMetadataContainer - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadataFactory.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadataFactory.html index 3c99bf4449a..15625e8087a 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadataFactory.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IMetadataFactory.html @@ -2,9 +2,9 @@ - + IMetadataFactory - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IPropertiesContainer.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IPropertiesContainer.html index 4d5296f5c4e..8ecf4ed5d9f 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IPropertiesContainer.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/IPropertiesContainer.html @@ -2,9 +2,9 @@ - + IPropertiesContainer - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-frame.html index 6cb897f6b81..92ab8c55049 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.metadata - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-summary.html index df5d00e3416..a2f64e7dc17 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.metadata - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-tree.html index f0442a55101..96dd0264c6e 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/metadata/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.metadata Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-frame.html index 719bd795d36..e4d027a7e24 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-summary.html index 7ba2e754d9f..bdaa39ea785 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-tree.html index c5132f18a9d..c27df950d6d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControl.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControl.html index a49c7d91837..975c21ad224 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControl.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControl.html @@ -2,9 +2,9 @@ - + IControl - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControlPoint.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControlPoint.html index 26208c5fb29..20ae94284c8 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControlPoint.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControlPoint.html @@ -2,9 +2,9 @@ - + IControlPoint - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControlRoute.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControlRoute.html index 008f085d385..29dfea9e78d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControlRoute.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IControlRoute.html @@ -2,9 +2,9 @@ - + IControlRoute - + @@ -161,6 +161,13 @@ extends +
        • diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathRoute.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathRoute.html index 03443c48ed6..746a5a9acdf 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathRoute.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathRoute.html @@ -2,9 +2,9 @@ - + IPathRoute - + @@ -162,6 +162,13 @@ extends +
          • diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathRouteFactory.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathRouteFactory.html index fb278a18d87..c9914b80aa5 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathRouteFactory.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathRouteFactory.html @@ -2,9 +2,9 @@ - + IPathRouteFactory - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathSegment.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathSegment.html index ef558c6d6bb..6e21036c367 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathSegment.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IPathSegment.html @@ -2,9 +2,9 @@ - + IPathSegment - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IRoute.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IRoute.html index fe9de82bb9d..b72a4445e96 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IRoute.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/IRoute.html @@ -2,9 +2,9 @@ - + IRoute - + @@ -18,6 +18,12 @@ catch(err) { } //--> +var methods = {"i0":6}; +var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]}; +var altColor = "altColor"; +var rowColor = "rowColor"; +var tableTab = "tableTab"; +var activeTableTab = "activeTableTab";
          • Detail: 
          • Field | 
          • Constr | 
            • -
          • Method
            • +
          • Method
    • @@ -125,6 +131,19 @@ extends

    Method Summary

    + + + + + + + + + + +
    All Methods Instance Methods Abstract Methods 
    Modifier and TypeMethod and Description
    IExtentgetExtent() +
    Gets the extent of the route
    +
    +
    +
      +
    • + +
        +
      • + + +

        Method Detail

        + + + +
          +
        • +

          getExtent

          +
          IExtent getExtent()
          +
          Gets the extent of the route
          +
          +
          Returns:
          +
          the extent
          +
          +
          • +
        +
        • +
      +
      • +
    +
    @@ -215,13 +262,13 @@ extends Nested | 
  • Field | 
  • Constr | 
    • -
  • Method
    • +
  • Method
    • Detail: 
    • Field | 
    • Constr | 
      • -
    • Method
      • +
    • Method
    diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/ISegment.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/ISegment.html index b4a441d2e62..e68772d0744 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/ISegment.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/ISegment.html @@ -2,9 +2,9 @@ - + ISegment - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6}; +var methods = {"i0":6,"i1":6}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -134,6 +134,12 @@ extends Returns the coordinates that the segment is based on. + +IExtent +getExtent() +
    Gets the segment's extent
    + +
    • @@ -173,7 +179,7 @@ extends -
        + + + + +
          +
        • +

          getExtent

          +
          IExtent getExtent()
          +
          Gets the segment's extent
          +
          +
          Returns:
          +
          the extent
          +
          +
          • +
      • diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-frame.html index 7daa3ba8858..c4e217b2101 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.route - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-summary.html index 1774f325c9e..d61cb339083 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.route - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-tree.html index 3045d7048ec..bbea61e7c24 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/route/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.route Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/ICoordinate.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/ICoordinate.html index 8da36066ec6..965a1c4ba40 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/ICoordinate.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/ICoordinate.html @@ -2,9 +2,9 @@ - + ICoordinate - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/ICoordinateSequence.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/ICoordinateSequence.html index fc756958d37..f4b2ec55bb2 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/ICoordinateSequence.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/ICoordinateSequence.html @@ -2,9 +2,9 @@ - + ICoordinateSequence - + @@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
      • Frames
        • @@ -254,7 +254,7 @@ var activeTableTab = "activeTableTab";
        • Frames
          • diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/IGeoCoordinate.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/IGeoCoordinate.html index 57a63180d86..76571bda4dd 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/IGeoCoordinate.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/IGeoCoordinate.html @@ -2,9 +2,9 @@ - + IGeoCoordinate - + @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
          @@ -341,7 +341,7 @@ var activeTableTab = "activeTableTab";
          diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-frame.html index 57e42f10368..8245d1a6f49 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.spatial - + @@ -15,6 +15,7 @@
        diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-summary.html index f006ca855ed..3dcceaaeb57 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.spatial - + @@ -101,6 +101,12 @@ +IExtent + +
        A simple extent
        + + + IGeoCoordinate
        diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-tree.html index 3ef90b1897e..4d77844c282 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/model/lib/api/spatial/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.model.lib.api.spatial Class Hierarchy - + @@ -80,6 +80,7 @@
        diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/IEventSubscriber.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/IEventSubscriber.html index 018f5e1419e..6671649f16b 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/IEventSubscriber.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/IEventSubscriber.html @@ -2,9 +2,9 @@ - + IEventSubscriber - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/IRaceSubscriber.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/IRaceSubscriber.html index 5adacf31c3b..43f7cb1ca66 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/IRaceSubscriber.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/IRaceSubscriber.html @@ -2,9 +2,9 @@ - + IRaceSubscriber - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriber.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriber.html index 8044ac3210a..d6d80cb0c94 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriber.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriber.html @@ -2,9 +2,9 @@ - + ISubscriber - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriberFactory.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriberFactory.html index 21f25b99907..435783d254e 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriberFactory.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriberFactory.html @@ -2,9 +2,9 @@ - + ISubscriberFactory - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriberListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriberListener.html index fa0594cd13f..c69a45db8c4 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriberListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/ISubscriberListener.html @@ -2,9 +2,9 @@ - + ISubscriberListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/SubscriberInitializationException.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/SubscriberInitializationException.html index ce514fc0ae5..529ff35b669 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/SubscriberInitializationException.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/SubscriberInitializationException.html @@ -2,9 +2,9 @@ - + SubscriberInitializationException - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/SubscriptionLocator.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/SubscriptionLocator.html index 0746b17e731..3bd4238c265 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/SubscriptionLocator.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/SubscriptionLocator.html @@ -2,9 +2,9 @@ - + SubscriptionLocator - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/ICompetitorsListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/ICompetitorsListener.html index ee1f878cf27..f43277d3ed8 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/ICompetitorsListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/ICompetitorsListener.html @@ -2,9 +2,9 @@ - + ICompetitorsListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionListener.html index eed71f3eee3..3d2f94922ee 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionListener.html @@ -2,9 +2,9 @@ - + IPositionListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionOffsetListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionOffsetListener.html index 669274acf3f..625ebb76535 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionOffsetListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionOffsetListener.html @@ -2,9 +2,9 @@ - + IPositionOffsetListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionSnappedListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionSnappedListener.html index 597841f58ef..972b73ed4ab 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionSnappedListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/IPositionSnappedListener.html @@ -2,9 +2,9 @@ - + IPositionSnappedListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-frame.html index 167593bf289..a3adcad5685 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.competitor - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-summary.html index 54d0e00f21c..bee0ca1c4e1 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.competitor - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-tree.html index 5f26cdd010b..46dbea9cfc3 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/competitor/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.competitor Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlPassingsListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlPassingsListener.html index 57e83f85585..572bd717d9f 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlPassingsListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlPassingsListener.html @@ -2,9 +2,9 @@ - + IControlPassingsListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlPointPositionListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlPointPositionListener.html index 069a9f35849..4b2e71e361f 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlPointPositionListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlPointPositionListener.html @@ -2,9 +2,9 @@ - + IControlPointPositionListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlRouteChangeListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlRouteChangeListener.html index cbae5c8c37c..a4b9b88530f 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlRouteChangeListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlRouteChangeListener.html @@ -2,9 +2,9 @@ - + IControlRouteChangeListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlsListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlsListener.html index 1fe06f0f40c..62b5c5bb1a4 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlsListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/IControlsListener.html @@ -2,9 +2,9 @@ - + IControlsListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-frame.html index 749fbc70473..f130e981d2d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.control - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-summary.html index da1dfb16334..86aef8190eb 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.control - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-tree.html index ea2a323efc3..b2df6aa9f2c 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/control/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.control Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IConnectionStatusListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IConnectionStatusListener.html index 3ceeebd1458..97aa7346c50 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IConnectionStatusListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IConnectionStatusListener.html @@ -2,9 +2,9 @@ - + IConnectionStatusListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IEventMessageListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IEventMessageListener.html index 85d7e1f0a26..ea5241afda7 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IEventMessageListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IEventMessageListener.html @@ -2,9 +2,9 @@ - + IEventMessageListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/ILiveDataEvent.StatusType.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/ILiveDataEvent.StatusType.html index c34bb834c25..5adc77f3d39 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/ILiveDataEvent.StatusType.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/ILiveDataEvent.StatusType.html @@ -2,9 +2,9 @@ - + ILiveDataEvent.StatusType - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/ILiveDataEvent.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/ILiveDataEvent.html index 5bd6b7b5cbb..e694892b117 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/ILiveDataEvent.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/ILiveDataEvent.html @@ -2,9 +2,9 @@ - + ILiveDataEvent - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IMessage.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IMessage.html index 3c987828bc5..89160a4c8d1 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IMessage.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IMessage.html @@ -2,9 +2,9 @@ - + IMessage - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IServerTimeListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IServerTimeListener.html index 12f1696a7d7..9806c244ab1 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IServerTimeListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IServerTimeListener.html @@ -2,9 +2,9 @@ - + IServerTimeListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IStoredDataEvent.Type.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IStoredDataEvent.Type.html index bb19e39f599..0473cf0aff8 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IStoredDataEvent.Type.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IStoredDataEvent.Type.html @@ -2,9 +2,9 @@ - + IStoredDataEvent.Type - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IStoredDataEvent.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IStoredDataEvent.html index 04424564b3d..675215b0857 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IStoredDataEvent.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/IStoredDataEvent.html @@ -2,9 +2,9 @@ - + IStoredDataEvent - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-frame.html index a91ed9e5ed3..2223e489d02 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.event - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-summary.html index d93e85a3452..ca19735da8d 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.event - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-tree.html index 449113cd9c9..10f48808e26 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/event/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.event Class Hierarchy - + @@ -95,8 +95,8 @@ diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-frame.html index e497de420cd..05f8f365462 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-summary.html index 1a5ffc90063..7ed571d4d16 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-tree.html index 2d789fc5b6c..dc5c5707bd7 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceCompetitorListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceCompetitorListener.html index d434ac786ca..2fcab6e2c8e 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceCompetitorListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceCompetitorListener.html @@ -2,9 +2,9 @@ - + IRaceCompetitorListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceMessageListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceMessageListener.html index 5c37d63ac20..b96f3a88b29 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceMessageListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceMessageListener.html @@ -2,9 +2,9 @@ - + IRaceMessageListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceStartStopTimesChangeListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceStartStopTimesChangeListener.html index 4fbc1dad2e6..c177a73ee7f 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceStartStopTimesChangeListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRaceStartStopTimesChangeListener.html @@ -2,9 +2,9 @@ - + IRaceStartStopTimesChangeListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRacesListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRacesListener.html index 29e60653ad1..1d99370e329 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRacesListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IRacesListener.html @@ -2,9 +2,9 @@ - + IRacesListener - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6}; +var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -143,11 +143,20 @@ extends void +dataSourceChanged(IRace race, + DataSource oldDataSource, + java.net.URI oldLiveURI, + java.net.URI oldStoredURI) +
        It is thrown when the datasource has changed
        + + + +void deleteRace(java.util.UUID raceId)
        A race has been removed from the event
        - + void reloadRace(java.util.UUID raceId)
        @@ -155,13 +164,13 @@ extends + void startTracking(java.util.UUID raceId)
        It is thrown when tracking of a race has started.
        - + void updateRace(IRace race)
        This event is thrown when a race is updated.
        @@ -263,7 +272,7 @@ extends -
          +

          • startTracking

            void startTracking(java.util.UUID raceId)
            @@ -277,6 +286,26 @@ extends + + +
              +
            • +

              dataSourceChanged

              +
              void dataSourceChanged(IRace race,
+                       DataSource oldDataSource,
+                       java.net.URI oldLiveURI,
+                       java.net.URI oldStoredURI)
              +
              It is thrown when the datasource has changed
              +
              +
              Parameters:
              +
              race - the race that contains the new datasource
              +
              oldDataSource - the old datasource
              +
              oldLiveURI - the old live URI
              +
              oldStoredURI - the new stored URI
              +
              +
              • +
          diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IStartStopTimesChangeListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IStartStopTimesChangeListener.html index 722a7016e8f..6a903ac1fe8 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IStartStopTimesChangeListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/IStartStopTimesChangeListener.html @@ -2,9 +2,9 @@ - + IStartStopTimesChangeListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-frame.html index b4f06f1c7ab..91b9761e00a 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.race - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-summary.html index 338247d0a12..77b15e34546 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.race - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-tree.html index d0ce1d03e50..0ee05dcf65f 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/race/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.race Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/IRoutesListener.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/IRoutesListener.html index 4808c97a365..81d0266dd9e 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/IRoutesListener.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/IRoutesListener.html @@ -2,9 +2,9 @@ - + IRoutesListener - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-frame.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-frame.html index 2371b9fc9a0..bc8450ab84c 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-frame.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-frame.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.route - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-summary.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-summary.html index 7780900e1f4..43d101ecfea 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-summary.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.route - + diff --git a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-tree.html b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-tree.html index f7464552b65..fd573c520e5 100755 --- a/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/com/tractrac/subscription/lib/api/route/package-tree.html @@ -2,9 +2,9 @@ - + com.tractrac.subscription.lib.api.route Class Hierarchy - + diff --git a/java/com.tractrac.clientmodule/javadoc/constant-values.html b/java/com.tractrac.clientmodule/javadoc/constant-values.html index 46752f470ce..32003c21aaf 100755 --- a/java/com.tractrac.clientmodule/javadoc/constant-values.html +++ b/java/com.tractrac.clientmodule/javadoc/constant-values.html @@ -2,9 +2,9 @@ - + Constant Field Values - + diff --git a/java/com.tractrac.clientmodule/javadoc/deprecated-list.html b/java/com.tractrac.clientmodule/javadoc/deprecated-list.html index c2519792309..1dcbbca54f6 100755 --- a/java/com.tractrac.clientmodule/javadoc/deprecated-list.html +++ b/java/com.tractrac.clientmodule/javadoc/deprecated-list.html @@ -2,9 +2,9 @@ - + Deprecated List - + diff --git a/java/com.tractrac.clientmodule/javadoc/help-doc.html b/java/com.tractrac.clientmodule/javadoc/help-doc.html index 942bb535ecf..d615eeb9f62 100755 --- a/java/com.tractrac.clientmodule/javadoc/help-doc.html +++ b/java/com.tractrac.clientmodule/javadoc/help-doc.html @@ -2,9 +2,9 @@ - + API Help - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-1.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-1.html index 411e94a398f..6f70e8b89d3 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-1.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-1.html @@ -2,9 +2,9 @@ - + A-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-10.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-10.html index e98eeb511a4..02c337ee722 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-10.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-10.html @@ -2,9 +2,9 @@ - + L-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-11.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-11.html index 6cc7ac618f8..8f2a014043e 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-11.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-11.html @@ -2,9 +2,9 @@ - + M-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-12.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-12.html index 3d919678410..d10ce703035 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-12.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-12.html @@ -2,9 +2,9 @@ - + N-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-13.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-13.html index 5cc1fa54ae7..ac687ffa254 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-13.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-13.html @@ -2,9 +2,9 @@ - + O-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-14.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-14.html index 1509009f265..8e2939dd56f 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-14.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-14.html @@ -2,9 +2,9 @@ - + R-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-15.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-15.html index 6c055422c47..9727e126319 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-15.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-15.html @@ -2,9 +2,9 @@ - + S-Index - + @@ -79,6 +79,10 @@
          Sets custom data for this object.
          +
          setDatasourceURIs(URI, URI, URI) - Method in interface com.tractrac.model.lib.api.event.IRace
          +
          +
          Sets the datasources used to load data
          +
          setDirection(double) - Method in interface com.tractrac.model.lib.api.data.IPosition
          Sets the direction
          diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-16.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-16.html index db588164a1e..34caa82b655 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-16.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-16.html @@ -2,9 +2,9 @@ - + T-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-17.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-17.html index a2d1e5021e3..62b2c76a7ce 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-17.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-17.html @@ -2,9 +2,9 @@ - + U-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-18.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-18.html index 5cac1989c21..0562ad0f124 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-18.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-18.html @@ -2,9 +2,9 @@ - + V-Index - + @@ -73,6 +73,10 @@

          V

          +
          valueOf(String) - Static method in enum com.tractrac.model.lib.api.event.DataSource
          +
          +
          Returns the enum constant of this type with the specified name.
          +
          valueOf(String) - Static method in enum com.tractrac.model.lib.api.event.EventType
          Returns the enum constant of this type with the specified name.
          @@ -101,6 +105,11 @@
          Returns the enum constant of this type with the specified name.
          +
          values() - Static method in enum com.tractrac.model.lib.api.event.DataSource
          +
          +
          Returns an array containing the constants of this enum type, in +the order they are declared.
          +
          values() - Static method in enum com.tractrac.model.lib.api.event.EventType
          Returns an array containing the constants of this enum type, in diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-2.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-2.html index 0c0464b4de4..e114f0715fc 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-2.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-2.html @@ -2,9 +2,9 @@ - + B-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-3.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-3.html index 20d49031073..3ac5043023a 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-3.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-3.html @@ -2,9 +2,9 @@ - + C-Index - + @@ -196,10 +196,18 @@
          createRace(URI) - Method in interface com.tractrac.model.lib.api.event.IEventFactory
          +
          Creates an IRace from a parameters file.
          +
          +
          createRace(URI, int) - Method in interface com.tractrac.model.lib.api.event.IEventFactory
          +
          Creates an IRace from a parameters file
          createRace(URI, URI, URI) - Method in interface com.tractrac.model.lib.api.event.IEventFactory
          +
          Creates an IRace from a parameters file.
          +
          +
          createRace(URI, int, URI, URI) - Method in interface com.tractrac.model.lib.api.event.IEventFactory
          +
          Creates an IRace from a parameters file
          createRace(IParameterSet) - Method in interface com.tractrac.model.lib.api.event.IEventFactory
          diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-4.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-4.html index 271b8131226..6400369e960 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-4.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-4.html @@ -2,9 +2,9 @@ - + D-Index - + @@ -73,6 +73,15 @@

          D

          +
          DataSource - Enum in com.tractrac.model.lib.api.event
          +
          +
          + The datasource used to load data
          +
          +
          dataSourceChanged(IRace, DataSource, URI, URI) - Method in interface com.tractrac.subscription.lib.api.race.IRacesListener
          +
          +
          It is thrown when the datasource has changed
          +
          deleteCache() - Method in interface com.tractrac.model.lib.api.event.IEventFactory
          Deletes all the cached objects that has been created
          diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-5.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-5.html index 8e0480e209f..85b0ef6e7bd 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-5.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-5.html @@ -2,9 +2,9 @@ - + E-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-6.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-6.html index 28ac25d11b6..16c9d369b4e 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-6.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-6.html @@ -2,9 +2,9 @@ - + F-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-7.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-7.html index 880a1e66321..83339226057 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-7.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-7.html @@ -2,9 +2,9 @@ - + G-Index - + @@ -87,6 +87,14 @@
          Returns the binary value of the message, if available, otherwise null.
          +
          getCenterLat() - Method in interface com.tractrac.model.lib.api.spatial.IExtent
          +
          +
          Gets the latitude of the center
          +
          +
          getCenterLon() - Method in interface com.tractrac.model.lib.api.spatial.IExtent
          +
          +
          Gets the longitude of the center
          +
          getColor() - Method in interface com.tractrac.model.lib.api.event.ICompetitor
          Returns the color associated with competitor, if any
          @@ -153,10 +161,20 @@
          An event has a name and a database name.
          +
          getDataSource() - Method in interface com.tractrac.model.lib.api.event.IRace
          +
          +
          Gets the datasource used to retrieve data for the race
          +
          getDefaultRoute() - Method in interface com.tractrac.model.lib.api.event.IRace
          Gets the default route
          +
          getDefaultTimeOut() - Method in interface com.tractrac.model.lib.api.event.IEventFactory
          +
          +
          Gets the number of milliseconds of the default timeout that has this + IEventFactory that is used to download the different + resources
          +
          getDescription() - Method in interface com.tractrac.model.lib.api.attachment.IAttachmentKey
          Gets a free text that describes the attachment.
          @@ -220,6 +238,18 @@
          It returns the expected date when the race starts.
          +
          getExtent() - Method in interface com.tractrac.model.lib.api.event.IRace
          +
          +
          Gets the extent where the race is going to be celebrated
          +
          +
          getExtent() - Method in interface com.tractrac.model.lib.api.route.IRoute
          +
          +
          Gets the extent of the route
          +
          +
          getExtent() - Method in interface com.tractrac.model.lib.api.route.ISegment
          +
          +
          Gets the segment's extent
          +
          getFirstName() - Method in interface com.tractrac.model.lib.api.event.ICompetitor
          Deprecated.
          @@ -289,6 +319,14 @@
          Returns the longitude coordinate of the position.
          +
          getLRLat() - Method in interface com.tractrac.model.lib.api.spatial.IExtent
          +
          +
          Gets the latitude of the lower right corner
          +
          +
          getLRLon() - Method in interface com.tractrac.model.lib.api.spatial.IExtent
          +
          +
          Gets the longitude of the lower right corner
          +
          getM() - Method in interface com.tractrac.model.lib.api.spatial.ICoordinate
          The value of the m coordinate
          @@ -520,7 +558,8 @@
          getStatusTime() - Method in interface com.tractrac.model.lib.api.event.IRaceCompetitor
          -
          When the status is one of: ABANDONED, RETIRED or DISQUALIFIED it contains when the +
          + When the status is one of: ABANDONED, RETIRED or DISQUALIFIED it contains when the competitor has changed to this state.
          getStatusType() - Method in interface com.tractrac.subscription.lib.api.event.ILiveDataEvent
          @@ -578,6 +617,14 @@
          Gets the type of the stored data message.
          +
          getULLat() - Method in interface com.tractrac.model.lib.api.spatial.IExtent
          +
          +
          Gets the latitude of the upper left corner
          +
          +
          getULLon() - Method in interface com.tractrac.model.lib.api.spatial.IExtent
          +
          +
          Gets the longitude of the upper left corner
          +
          getUuid() - Method in enum com.tractrac.model.lib.api.event.EventType
           
          getValue() - Method in enum com.tractrac.model.lib.api.event.RaceCompetitorStatusType
          @@ -588,12 +635,29 @@
           
          getVisibility() - Method in interface com.tractrac.model.lib.api.event.IRace
          -
          Gets the visibility of the race that can be: +
          According to the event manager, the visibility of the race can be: Hidden: the race is not visible Offline: the race is visible but it is not accessible - Online: the race is visible and accessible (the replay status has - been merged with this status) + Online: the race is visible and accessible + + + If we also consider the race tracking time, the race can be: + + Replay: the race was celebrated in the past + Live: the race is in an online status ath this moment + Coming up: the race will be celebrated in the future + + + Combining these two dimensions, the possible values for the RaceVisibilityType + enum are: + + + Hidden: if the race has the HIDDEN value in the event manager + Offline: if the race has the OFFLINE value in the event manager + Replay: if the race has the ONLINE value in the event manager and it is over + Live: if the race has the ONLINE value in the event manager and it is online + Coming up: if the race has the ONLINE value in the event manager and it is coming up
          getX() - Method in interface com.tractrac.model.lib.api.spatial.ICoordinate
          diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-8.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-8.html index 9d9c818eced..0374e3bcaf1 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-8.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-8.html @@ -2,9 +2,9 @@ - + H-Index - + diff --git a/java/com.tractrac.clientmodule/javadoc/index-files/index-9.html b/java/com.tractrac.clientmodule/javadoc/index-files/index-9.html index bafdb028614..ccfc401ef80 100755 --- a/java/com.tractrac.clientmodule/javadoc/index-files/index-9.html +++ b/java/com.tractrac.clientmodule/javadoc/index-files/index-9.html @@ -2,9 +2,9 @@ - + I-Index - + @@ -183,6 +183,10 @@
          Class that handles subscription to data for one event.
          +
          IExtent - Interface in com.tractrac.model.lib.api.spatial
          +
          +
          A simple extent
          +
          IGeoCoordinate - Interface in com.tractrac.model.lib.api.spatial
          @@ -412,6 +416,10 @@ All the listeners that are used for the consumer application in order to receive events from the server side have to implemented this interface.
          +
          isValid() - Method in interface com.tractrac.model.lib.api.spatial.IExtent
          +
          +
          If the extent is valid or not
          +
          ITeam - Interface in com.tractrac.model.lib.api.event
          diff --git a/java/com.tractrac.clientmodule/javadoc/index.html b/java/com.tractrac.clientmodule/javadoc/index.html index 3b7d8daa7b6..6609d90c50d 100755 --- a/java/com.tractrac.clientmodule/javadoc/index.html +++ b/java/com.tractrac.clientmodule/javadoc/index.html @@ -2,14 +2,15 @@ - + Generated Documentation (Untitled) diff --git a/java/com.tractrac.clientmodule/javadoc/overview-summary.html b/java/com.tractrac.clientmodule/javadoc/overview-summary.html index 03ee2d20972..33bbff9c800 100755 --- a/java/com.tractrac.clientmodule/javadoc/overview-summary.html +++ b/java/com.tractrac.clientmodule/javadoc/overview-summary.html @@ -2,9 +2,9 @@ - + Overview - + diff --git a/java/com.tractrac.clientmodule/javadoc/overview-tree.html b/java/com.tractrac.clientmodule/javadoc/overview-tree.html index cf649ed17e6..e5ca2e38c1d 100755 --- a/java/com.tractrac.clientmodule/javadoc/overview-tree.html +++ b/java/com.tractrac.clientmodule/javadoc/overview-tree.html @@ -2,9 +2,9 @@ - + Class Hierarchy - + @@ -206,6 +206,7 @@
        • com.tractrac.model.lib.api.data.IControlPassings
        • com.tractrac.model.lib.api.spatial.ICoordinate
        • com.tractrac.model.lib.api.spatial.ICoordinateSequence
          • +
        • com.tractrac.model.lib.api.spatial.IExtent
        • com.tractrac.model.lib.api.spatial.IGeoCoordinate
          • com.tractrac.model.lib.api.data.IPosition (also extends com.tractrac.model.lib.api.attachment.IAttachable, com.tractrac.util.lib.api.serialize.ISerializable, com.tractrac.model.lib.api.data.ITimeData) @@ -332,6 +333,7 @@
            • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
                +
              • com.tractrac.model.lib.api.event.DataSource
              • com.tractrac.model.lib.api.event.RaceCompetitorStatusType
              • com.tractrac.subscription.lib.api.event.ILiveDataEvent.StatusType
              • com.tractrac.model.lib.api.event.RaceVisibilityType
                • diff --git a/java/com.tractrac.clientmodule/javadoc/serialized-form.html b/java/com.tractrac.clientmodule/javadoc/serialized-form.html index 475c59885f8..6ae011098a7 100755 --- a/java/com.tractrac.clientmodule/javadoc/serialized-form.html +++ b/java/com.tractrac.clientmodule/javadoc/serialized-form.html @@ -2,9 +2,9 @@ - + Serialized Form - + diff --git a/java/com.tractrac.clientmodule/lib/TracAPI-src.jar b/java/com.tractrac.clientmodule/lib/TracAPI-src.jar index d60fd40f09a..f75d54b60b1 100755 Binary files a/java/com.tractrac.clientmodule/lib/TracAPI-src.jar and b/java/com.tractrac.clientmodule/lib/TracAPI-src.jar differ diff --git a/java/com.tractrac.clientmodule/lib/TracAPI.jar b/java/com.tractrac.clientmodule/lib/TracAPI.jar index 6f063b5e5bc..6c00372f0fd 100755 Binary files a/java/com.tractrac.clientmodule/lib/TracAPI.jar and b/java/com.tractrac.clientmodule/lib/TracAPI.jar differ diff --git a/java/com.tractrac.clientmodule/pom.xml b/java/com.tractrac.clientmodule/pom.xml index 2c32e380f15..2ab727b9bce 100755 --- a/java/com.tractrac.clientmodule/pom.xml +++ b/java/com.tractrac.clientmodule/pom.xml @@ -8,6 +8,6 @@ 1.0.0-SNAPSHOT com.tractrac.clientmodule - 3.4.1 + 3.6.0 eclipse-plugin diff --git a/java/com.tractrac.clientmodule/src/com/tractrac/subscription/app/tracapi/Main.java b/java/com.tractrac.clientmodule/src/com/tractrac/subscription/app/tracapi/Main.java index 5527ef81e3f..f159e3452f9 100644 --- a/java/com.tractrac.clientmodule/src/com/tractrac/subscription/app/tracapi/Main.java +++ b/java/com.tractrac.clientmodule/src/com/tractrac/subscription/app/tracapi/Main.java @@ -13,6 +13,8 @@ import com.tractrac.subscription.lib.api.IRaceSubscriber; import com.tractrac.subscription.lib.api.ISubscriberFactory; import com.tractrac.subscription.lib.api.SubscriberInitializationException; import com.tractrac.subscription.lib.api.SubscriptionLocator; +import com.tractrac.util.lib.api.exceptions.TimeOutException; + import java.io.FileNotFoundException; import java.io.IOException; import java.net.MalformedURLException; @@ -32,7 +34,7 @@ public class Main { */ public static void main(String[] args) throws URISyntaxException, MalformedURLException, FileNotFoundException, IOException, - SubscriberInitializationException, CreateModelException { + SubscriberInitializationException, CreateModelException, TimeOutException { URI paramURI = parseArguments(args);