added boat classes J/92, J/92S, and X-332

This commit is contained in:
Axel Uhl committed 2020-08-17 01:23:43 +02:00
1 parent 636641185f
commit b219dd7603
8 files changed
+27 -7

No files matched your search

@@ -68,6 +68,8 @@ public enum BoatClassMasterdata {
J70 ("J/70", true, 6.93, 2.25, BoatHullType.MONOHULL, true, "J70", "J-70"),
J80 ("J/80", true, 8.0, 2.51, BoatHullType.MONOHULL, true, "J80", "J-80"),
J88 ("J/88", true, 8.9, 1.89, BoatHullType.MONOHULL, true, "J88", "J-88"),
J92 ("J/92", true, 9.14, 3.05, BoatHullType.MONOHULL, true, "J92", "J-92"),
J92S ("J/92S", true, 9.14, 3.05, BoatHullType.MONOHULL, true, "J92S", "J-92S"),
J105 ("J/105", true, 10.52, 3.35, BoatHullType.MONOHULL, true, "J105", "J-105"),
J111 ("J/111", true, 11.1, 3.29, BoatHullType.MONOHULL, true, "J111", "J-111"),
JK_20 ("20qm Jollenkreuzer", true, 7.75, 2.50, BoatHullType.MONOHULL, true, "JK 20", "JK20", "20er"),
@@ -136,6 +138,7 @@ public enum BoatClassMasterdata {
VX_ONE ("VX ONE", true, 5.79, 2.19, BoatHullType.MONOHULL, true, "VX-ONE"),
WAYFARER ("Wayfarer", true, 4.82, 1.85, BoatHullType.MONOHULL, false),
WETA ("Weta", true, 4.4, 3.5, BoatHullType.TRIMARAN, true, "Weta Trimaran"),
X_332 ("X-332", true, 10.06, 3.30, BoatHullType.MONOHULL, true, "X332"),
X_99 ("X-99", true, 9.96, 2.95, BoatHullType.MONOHULL, true, "X99"),
// multi-class "boat classes"; to be replaced at some later point in time by something like a RegattaClass
@@ -82,6 +82,8 @@ public class BoatClassImageResolver {
boatClassIconsMap.put(BoatClassMasterdata.J70.getDisplayName(), imageResources.J70Icon());
boatClassIconsMap.put(BoatClassMasterdata.J80.getDisplayName(), imageResources.J80Icon());
boatClassIconsMap.put(BoatClassMasterdata.J88.getDisplayName(), imageResources.J88Icon());
boatClassIconsMap.put(BoatClassMasterdata.J92.getDisplayName(), imageResources.J92Icon());
boatClassIconsMap.put(BoatClassMasterdata.J92S.getDisplayName(), imageResources.J92SIcon());
boatClassIconsMap.put(BoatClassMasterdata.J105.getDisplayName(), imageResources.J105Icon());
boatClassIconsMap.put(BoatClassMasterdata.J111.getDisplayName(), imageResources.J111Icon());
boatClassIconsMap.put(BoatClassMasterdata.JK_20.getDisplayName(), imageResources.JK20Icon());
@@ -148,6 +150,7 @@ public class BoatClassImageResolver {
boatClassIconsMap.put(BoatClassMasterdata.VX_ONE.getDisplayName(), imageResources.VXOneIcon());
boatClassIconsMap.put(BoatClassMasterdata.WAYFARER.getDisplayName(), imageResources.WayfarerIcon());
boatClassIconsMap.put(BoatClassMasterdata.WETA.getDisplayName(), imageResources.WetaIcon());
boatClassIconsMap.put(BoatClassMasterdata.X_332.getDisplayName(), imageResources.X332Icon());
boatClassIconsMap.put(BoatClassMasterdata.X_99.getDisplayName(), imageResources.X99Icon());
boatClassIconsMap.put(BoatClassMasterdata.RUNNING.getDisplayName(), imageResources.RunningIcon());
}
@@ -216,6 +216,14 @@ public interface BoatClassImageResources extends ClientBundle {
@ImageOptions(preventInlining = true)
ImageResource J88Icon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/J92.png")
@ImageOptions(preventInlining = true)
ImageResource J92Icon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/J92S.png")
@ImageOptions(preventInlining = true)
ImageResource J92SIcon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/J105.png")
@ImageOptions(preventInlining = true)
ImageResource J105Icon();
@@ -380,10 +388,6 @@ public interface BoatClassImageResources extends ClientBundle {
@ImageOptions(preventInlining = true)
ImageResource TornadoIcon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/X_99.png")
@ImageOptions(preventInlining = true)
ImageResource X99Icon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/DYAS.png")
@ImageOptions(preventInlining = true)
ImageResource DyasIcon();
@@ -532,4 +536,12 @@ public interface BoatClassImageResources extends ClientBundle {
@ImageOptions(preventInlining = true)
ImageResource VariantaIcon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/X_99.png")
@ImageOptions(preventInlining = true)
ImageResource X99Icon();
@Source("com/sap/sailing/gwt/ui/client/images/boatclass/X_332.png")
@ImageOptions(preventInlining = true)
ImageResource X332Icon();
}
@@ -42,12 +42,13 @@ public class BoatClassVectorGraphicsResolver {
BoatClassMasterdata.NACRA_17_FOIL, BoatClassMasterdata.F_16, BoatClassMasterdata.F_18,
BoatClassMasterdata.HOBIE_WILD_CAT, BoatClassMasterdata.HOBIE_16, BoatClassMasterdata.HOBIE_TIGER,
BoatClassMasterdata.A_CAT, BoatClassMasterdata.TORNADO, BoatClassMasterdata.FLYING_PHANTOM);
BoatClassVectorGraphics keelBoatWithGennaker = new KeelBoatWithGennakerVectorGraphics(BoatClassMasterdata.FIRST_CLASS_7_5,BoatClassMasterdata.J70,
BoatClassMasterdata.B_ONE, BoatClassMasterdata.J80, BoatClassMasterdata.LASER_SB3, BoatClassMasterdata.LONGTZE,
BoatClassVectorGraphics keelBoatWithGennaker = new KeelBoatWithGennakerVectorGraphics(BoatClassMasterdata.FIRST_CLASS_7_5,
BoatClassMasterdata.J70, BoatClassMasterdata.J80, BoatClassMasterdata.J92, BoatClassMasterdata.J92S,
BoatClassMasterdata.B_ONE, BoatClassMasterdata.LASER_SB3, BoatClassMasterdata.LONGTZE,
BoatClassMasterdata.RS_FEVA, BoatClassMasterdata.RS_TERA, BoatClassMasterdata.RS100, BoatClassMasterdata.TP52,
BoatClassMasterdata.CLUB_SWAN_50, BoatClassMasterdata.BAVARIA_CRUISER_41S, BoatClassMasterdata.BAVARIA_CRUISER_45,
BoatClassMasterdata.BAVARIA_CRUISER_46, BoatClassMasterdata.SPAEKHUGGER, BoatClassMasterdata.SCAN_KAP_99,
BoatClassMasterdata.BB10M, BoatClassMasterdata.WAYFARER);
BoatClassMasterdata.BB10M, BoatClassMasterdata.WAYFARER, BoatClassMasterdata.X_332);
BoatClassVectorGraphics dinghyWithSpinnaker = new DinghyWithSpinnakerVectorGraphics(BoatClassMasterdata._420,
BoatClassMasterdata._470, BoatClassMasterdata._5O5, BoatClassMasterdata.CADET, BoatClassMasterdata.FLYING_DUTCHMAN,
BoatClassMasterdata.FOLKBOAT, BoatClassMasterdata.DYAS, BoatClassMasterdata.DRAGON_INT,
Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

@@ -28,6 +28,7 @@
<li>Fixed a problem with "None" implied wind source selection for ORC PCS races.
It caused a serialization error of the race log, e.g., when requested by the
Race Manager App.</li>
<li>Added boat classes X-332, J/92, and J/92S.</li>
</ul>
<h2 class="articleSubheadline">July 2020</h2>
<ul class="bulletList">