diff --git a/changelog.d/1789-multi-part-fleet-models.md b/changelog.d/1789-multi-part-fleet-models.md new file mode 100644 index 0000000000..e99f3e4efc --- /dev/null +++ b/changelog.d/1789-multi-part-fleet-models.md @@ -0,0 +1,5 @@ +- Ship the fleet models with named parts: rotors, propellers, landing gear and + doors on every aircraft, helicopter, vessel, ground vehicle and transit + model, so renderers that draw model part state can spin, pose or highlight + them. Stowed gear and closed doors are built hidden, so models look as + before without it (samehkhamis, #1789). diff --git a/changelog.d/1790-vessels-toggle-without-feed.md b/changelog.d/1790-vessels-toggle-without-feed.md new file mode 100644 index 0000000000..a92d08d73c --- /dev/null +++ b/changelog.d/1790-vessels-toggle-without-feed.md @@ -0,0 +1,3 @@ +- Let AIS vessels turn on and off again when their feed fails; the live + position load no longer passes the poll's answer to `enable()` + (samehkhamis, #1790). diff --git a/public/models/fleet/aircraft/a320.glb b/public/models/fleet/aircraft/a320.glb index 017d8ed2c3..eee9e70cf0 100644 Binary files a/public/models/fleet/aircraft/a320.glb and b/public/models/fleet/aircraft/a320.glb differ diff --git a/public/models/fleet/aircraft/a333.glb b/public/models/fleet/aircraft/a333.glb index 7daeb83199..999736f1c4 100644 Binary files a/public/models/fleet/aircraft/a333.glb and b/public/models/fleet/aircraft/a333.glb differ diff --git a/public/models/fleet/aircraft/a343.glb b/public/models/fleet/aircraft/a343.glb index a850cea4a9..609833b78b 100644 Binary files a/public/models/fleet/aircraft/a343.glb and b/public/models/fleet/aircraft/a343.glb differ diff --git a/public/models/fleet/aircraft/a359.glb b/public/models/fleet/aircraft/a359.glb index 745681b277..9526bab46e 100644 Binary files a/public/models/fleet/aircraft/a359.glb and b/public/models/fleet/aircraft/a359.glb differ diff --git a/public/models/fleet/aircraft/a388.glb b/public/models/fleet/aircraft/a388.glb index 58e04f2d00..276f203242 100644 Binary files a/public/models/fleet/aircraft/a388.glb and b/public/models/fleet/aircraft/a388.glb differ diff --git a/public/models/fleet/aircraft/at72.glb b/public/models/fleet/aircraft/at72.glb index bbe129d7ed..94f387ddbe 100644 Binary files a/public/models/fleet/aircraft/at72.glb and b/public/models/fleet/aircraft/at72.glb differ diff --git a/public/models/fleet/aircraft/b738.glb b/public/models/fleet/aircraft/b738.glb index 6e4a94a383..2b5552c66b 100644 Binary files a/public/models/fleet/aircraft/b738.glb and b/public/models/fleet/aircraft/b738.glb differ diff --git a/public/models/fleet/aircraft/b744.glb b/public/models/fleet/aircraft/b744.glb index f5f9e421d8..2ee5b6dc8c 100644 Binary files a/public/models/fleet/aircraft/b744.glb and b/public/models/fleet/aircraft/b744.glb differ diff --git a/public/models/fleet/aircraft/b763.glb b/public/models/fleet/aircraft/b763.glb index 34c59a9125..32391ad99a 100644 Binary files a/public/models/fleet/aircraft/b763.glb and b/public/models/fleet/aircraft/b763.glb differ diff --git a/public/models/fleet/aircraft/b77w.glb b/public/models/fleet/aircraft/b77w.glb index a190513002..a0c299d99c 100644 Binary files a/public/models/fleet/aircraft/b77w.glb and b/public/models/fleet/aircraft/b77w.glb differ diff --git a/public/models/fleet/aircraft/b789.glb b/public/models/fleet/aircraft/b789.glb index 5474a55a4a..62b5b4d1a9 100644 Binary files a/public/models/fleet/aircraft/b789.glb and b/public/models/fleet/aircraft/b789.glb differ diff --git a/public/models/fleet/aircraft/bcs3.glb b/public/models/fleet/aircraft/bcs3.glb index 422ebe7008..d3844f24c9 100644 Binary files a/public/models/fleet/aircraft/bcs3.glb and b/public/models/fleet/aircraft/bcs3.glb differ diff --git a/public/models/fleet/aircraft/be20.glb b/public/models/fleet/aircraft/be20.glb index d1a2c4dfda..d1e66b60fe 100644 Binary files a/public/models/fleet/aircraft/be20.glb and b/public/models/fleet/aircraft/be20.glb differ diff --git a/public/models/fleet/aircraft/c17.glb b/public/models/fleet/aircraft/c17.glb index 19c51a523b..a344c055eb 100644 Binary files a/public/models/fleet/aircraft/c17.glb and b/public/models/fleet/aircraft/c17.glb differ diff --git a/public/models/fleet/aircraft/c172.glb b/public/models/fleet/aircraft/c172.glb index 9a5b7d73f9..8a730ca4d4 100644 Binary files a/public/models/fleet/aircraft/c172.glb and b/public/models/fleet/aircraft/c172.glb differ diff --git a/public/models/fleet/aircraft/c30j.glb b/public/models/fleet/aircraft/c30j.glb index b5d4a7122b..a2cca1d708 100644 Binary files a/public/models/fleet/aircraft/c30j.glb and b/public/models/fleet/aircraft/c30j.glb differ diff --git a/public/models/fleet/aircraft/c56x.glb b/public/models/fleet/aircraft/c56x.glb index 2185dfe795..6944e3098e 100644 Binary files a/public/models/fleet/aircraft/c56x.glb and b/public/models/fleet/aircraft/c56x.glb differ diff --git a/public/models/fleet/aircraft/cl35.glb b/public/models/fleet/aircraft/cl35.glb index f2df5f86b9..001e51382a 100644 Binary files a/public/models/fleet/aircraft/cl35.glb and b/public/models/fleet/aircraft/cl35.glb differ diff --git a/public/models/fleet/aircraft/crj9.glb b/public/models/fleet/aircraft/crj9.glb index 24e6448b66..3f8f27acc9 100644 Binary files a/public/models/fleet/aircraft/crj9.glb and b/public/models/fleet/aircraft/crj9.glb differ diff --git a/public/models/fleet/aircraft/dh8d.glb b/public/models/fleet/aircraft/dh8d.glb index f763fec213..ea252476a2 100644 Binary files a/public/models/fleet/aircraft/dh8d.glb and b/public/models/fleet/aircraft/dh8d.glb differ diff --git a/public/models/fleet/aircraft/e175.glb b/public/models/fleet/aircraft/e175.glb index acdc5230ea..21fc3c0970 100644 Binary files a/public/models/fleet/aircraft/e175.glb and b/public/models/fleet/aircraft/e175.glb differ diff --git a/public/models/fleet/aircraft/e55p.glb b/public/models/fleet/aircraft/e55p.glb index b130d2a9ea..7ebae479ff 100644 Binary files a/public/models/fleet/aircraft/e55p.glb and b/public/models/fleet/aircraft/e55p.glb differ diff --git a/public/models/fleet/aircraft/generic_plane.glb b/public/models/fleet/aircraft/generic_plane.glb index a126c8b267..561300adff 100644 Binary files a/public/models/fleet/aircraft/generic_plane.glb and b/public/models/fleet/aircraft/generic_plane.glb differ diff --git a/public/models/fleet/aircraft/glf4.glb b/public/models/fleet/aircraft/glf4.glb index 31ddd2c74e..e5f78158a3 100644 Binary files a/public/models/fleet/aircraft/glf4.glb and b/public/models/fleet/aircraft/glf4.glb differ diff --git a/public/models/fleet/aircraft/glider.glb b/public/models/fleet/aircraft/glider.glb index 60b722726a..b46314ef82 100644 Binary files a/public/models/fleet/aircraft/glider.glb and b/public/models/fleet/aircraft/glider.glb differ diff --git a/public/models/fleet/aircraft/k35r.glb b/public/models/fleet/aircraft/k35r.glb index 7a7cfbe735..f5b89ddbd3 100644 Binary files a/public/models/fleet/aircraft/k35r.glb and b/public/models/fleet/aircraft/k35r.glb differ diff --git a/public/models/fleet/aircraft/md11.glb b/public/models/fleet/aircraft/md11.glb index 885a816243..c1b7ed8f7d 100644 Binary files a/public/models/fleet/aircraft/md11.glb and b/public/models/fleet/aircraft/md11.glb differ diff --git a/public/models/fleet/aircraft/mq9.glb b/public/models/fleet/aircraft/mq9.glb index 737912fc3d..7bd3443c0b 100644 Binary files a/public/models/fleet/aircraft/mq9.glb and b/public/models/fleet/aircraft/mq9.glb differ diff --git a/public/models/fleet/aircraft/p28a.glb b/public/models/fleet/aircraft/p28a.glb index ca47aec1a6..15bd153570 100644 Binary files a/public/models/fleet/aircraft/p28a.glb and b/public/models/fleet/aircraft/p28a.glb differ diff --git a/public/models/fleet/aircraft/pc12.glb b/public/models/fleet/aircraft/pc12.glb index 2b2666a0a2..98180f2a6a 100644 Binary files a/public/models/fleet/aircraft/pc12.glb and b/public/models/fleet/aircraft/pc12.glb differ diff --git a/public/models/fleet/aircraft/sr22.glb b/public/models/fleet/aircraft/sr22.glb index 7c2d66fe6f..3414470c44 100644 Binary files a/public/models/fleet/aircraft/sr22.glb and b/public/models/fleet/aircraft/sr22.glb differ diff --git a/public/models/fleet/aircraft/t38.glb b/public/models/fleet/aircraft/t38.glb index b9c8cd9ee4..b7060e17c8 100644 Binary files a/public/models/fleet/aircraft/t38.glb and b/public/models/fleet/aircraft/t38.glb differ diff --git a/public/models/fleet/aircraft/tex2.glb b/public/models/fleet/aircraft/tex2.glb index 8a3ec3e00a..68c71060d9 100644 Binary files a/public/models/fleet/aircraft/tex2.glb and b/public/models/fleet/aircraft/tex2.glb differ diff --git a/public/models/fleet/aircraft/ultralight.glb b/public/models/fleet/aircraft/ultralight.glb index 965d9cdddd..6bb450ce95 100644 Binary files a/public/models/fleet/aircraft/ultralight.glb and b/public/models/fleet/aircraft/ultralight.glb differ diff --git a/public/models/fleet/aircraft/v22.glb b/public/models/fleet/aircraft/v22.glb index 01021ca2d8..1c2dd0514e 100644 Binary files a/public/models/fleet/aircraft/v22.glb and b/public/models/fleet/aircraft/v22.glb differ diff --git a/public/models/fleet/catalog.json b/public/models/fleet/catalog.json index 91fbc5acdb..c1619de0a9 100644 --- a/public/models/fleet/catalog.json +++ b/public/models/fleet/catalog.json @@ -16,7 +16,8 @@ "beam": 13.253, "clearance": 1.575, "tris": 1464, - "icon": "heli" + "icon": "heli", + "parts": 6 }, "a320": { "category": "aircraft", @@ -34,8 +35,9 @@ "length": 37.57, "beam": 35.611, "clearance": 3.063, - "tris": 2338, - "icon": "jet" + "tris": 2538, + "icon": "jet", + "parts": 16 }, "a333": { "category": "aircraft", @@ -53,8 +55,9 @@ "length": 63.69, "beam": 59.684, "clearance": 4.251, - "tris": 2338, - "icon": "widebody" + "tris": 2538, + "icon": "widebody", + "parts": 16 }, "a343": { "category": "aircraft", @@ -72,8 +75,9 @@ "length": 63.69, "beam": 59.684, "clearance": 3.343, - "tris": 2638, - "icon": "quad" + "tris": 2838, + "icon": "quad", + "parts": 20 }, "a359": { "category": "aircraft", @@ -91,8 +95,9 @@ "length": 66.8, "beam": 64.212, "clearance": 4.83, - "tris": 2338, - "icon": "widebody" + "tris": 2538, + "icon": "widebody", + "parts": 16 }, "a388": { "category": "aircraft", @@ -110,8 +115,9 @@ "length": 73.887, "beam": 78.582, "clearance": 4.827, - "tris": 2658, - "icon": "quad" + "tris": 2858, + "icon": "quad", + "parts": 20 }, "articulated_bus": { "category": "transit", @@ -130,7 +136,8 @@ "beam": 2.675, "clearance": 0.0, "tris": 604, - "icon": "bus" + "icon": "bus", + "parts": 5 }, "as50": { "category": "helicopters", @@ -149,7 +156,8 @@ "beam": 9.418, "clearance": 1.365, "tris": 1488, - "icon": "heli" + "icon": "heli", + "parts": 4 }, "at72": { "category": "aircraft", @@ -167,8 +175,9 @@ "length": 27.17, "beam": 26.509, "clearance": 1.402, - "tris": 2300, - "icon": "turboprop" + "tris": 2500, + "icon": "turboprop", + "parts": 16 }, "b06": { "category": "helicopters", @@ -187,7 +196,8 @@ "beam": 2.057, "clearance": 1.265, "tris": 1476, - "icon": "heli" + "icon": "heli", + "parts": 4 }, "b407": { "category": "helicopters", @@ -206,7 +216,8 @@ "beam": 10.67, "clearance": 1.315, "tris": 1500, - "icon": "heli" + "icon": "heli", + "parts": 4 }, "b738": { "category": "aircraft", @@ -224,8 +235,9 @@ "length": 39.47, "beam": 35.603, "clearance": 2.528, - "tris": 2350, - "icon": "jet" + "tris": 2550, + "icon": "jet", + "parts": 16 }, "b744": { "category": "aircraft", @@ -243,8 +255,9 @@ "length": 71.139, "beam": 63.554, "clearance": 3.786, - "tris": 2910, - "icon": "quad" + "tris": 3110, + "icon": "quad", + "parts": 20 }, "b763": { "category": "aircraft", @@ -262,8 +275,9 @@ "length": 54.9, "beam": 47.385, "clearance": 3.852, - "tris": 2338, - "icon": "widebody" + "tris": 2538, + "icon": "widebody", + "parts": 16 }, "b77w": { "category": "aircraft", @@ -281,8 +295,9 @@ "length": 73.9, "beam": 63.504, "clearance": 5.444, - "tris": 2186, - "icon": "widebody" + "tris": 2386, + "icon": "widebody", + "parts": 16 }, "b789": { "category": "aircraft", @@ -300,8 +315,9 @@ "length": 62.8, "beam": 58.898, "clearance": 4.769, - "tris": 2186, - "icon": "widebody" + "tris": 2386, + "icon": "widebody", + "parts": 16 }, "balloon": { "category": "other", @@ -320,7 +336,8 @@ "beam": 16.999, "clearance": 5.95, "tris": 504, - "icon": "balloon" + "icon": "balloon", + "parts": 2 }, "barrel_yellow": { "category": "buoys", @@ -339,7 +356,8 @@ "beam": 1.0, "clearance": 0.3, "tris": 80, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "bcs3": { "category": "aircraft", @@ -357,8 +375,9 @@ "length": 38.7, "beam": 34.879, "clearance": 3.196, - "tris": 2338, - "icon": "jet" + "tris": 2538, + "icon": "jet", + "parts": 16 }, "be20": { "category": "aircraft", @@ -376,8 +395,9 @@ "length": 13.832, "beam": 16.278, "clearance": 0.871, - "tris": 2386, - "icon": "turboprop" + "tris": 2586, + "icon": "turboprop", + "parts": 16 }, "blimp": { "category": "other", @@ -396,7 +416,8 @@ "beam": 16.855, "clearance": 10.6, "tris": 1044, - "icon": "balloon" + "icon": "balloon", + "parts": 2 }, "bulk_carrier": { "category": "ships", @@ -415,7 +436,8 @@ "beam": 32.0, "clearance": 10.88, "tris": 3121, - "icon": "ship" + "icon": "ship", + "parts": 7 }, "buoy_cardinal_east": { "category": "buoys", @@ -434,7 +456,8 @@ "beam": 3.12, "clearance": 3.2, "tris": 654, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "buoy_cardinal_north": { "category": "buoys", @@ -453,7 +476,8 @@ "beam": 3.12, "clearance": 3.2, "tris": 606, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "buoy_cardinal_south": { "category": "buoys", @@ -472,7 +496,8 @@ "beam": 3.12, "clearance": 3.2, "tris": 606, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "buoy_cardinal_west": { "category": "buoys", @@ -491,7 +516,8 @@ "beam": 3.12, "clearance": 3.2, "tris": 654, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "buoy_isolated_danger": { "category": "buoys", @@ -510,7 +536,8 @@ "beam": 3.12, "clearance": 3.2, "tris": 986, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "buoy_lateral_port": { "category": "buoys", @@ -529,7 +556,8 @@ "beam": 3.12, "clearance": 3.2, "tris": 558, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "buoy_lateral_starboard": { "category": "buoys", @@ -548,7 +576,8 @@ "beam": 3.12, "clearance": 3.2, "tris": 528, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "buoy_safe_water": { "category": "buoys", @@ -567,7 +596,8 @@ "beam": 3.12, "clearance": 3.2, "tris": 694, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "buoy_special": { "category": "buoys", @@ -586,7 +616,8 @@ "beam": 3.12, "clearance": 3.2, "tris": 514, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "c17": { "category": "aircraft", @@ -604,8 +635,9 @@ "length": 55.419, "beam": 51.377, "clearance": 3.467, - "tris": 2768, - "icon": "widebody" + "tris": 2968, + "icon": "widebody", + "parts": 20 }, "c172": { "category": "aircraft", @@ -624,7 +656,8 @@ "beam": 10.78, "clearance": 1.49, "tris": 2162, - "icon": "light" + "icon": "light", + "parts": 9 }, "c30j": { "category": "aircraft", @@ -642,8 +675,9 @@ "length": 29.896, "beam": 39.602, "clearance": 2.328, - "tris": 2800, - "icon": "turboprop" + "tris": 3000, + "icon": "turboprop", + "parts": 20 }, "c56x": { "category": "aircraft", @@ -661,8 +695,9 @@ "length": 15.923, "beam": 16.827, "clearance": 0.911, - "tris": 2198, - "icon": "rear_jet" + "tris": 2398, + "icon": "rear_jet", + "parts": 16 }, "cable_tram": { "category": "transit", @@ -681,7 +716,8 @@ "beam": 2.89, "clearance": 0.0, "tris": 384, - "icon": "tram" + "icon": "tram", + "parts": 5 }, "can_red": { "category": "buoys", @@ -700,7 +736,8 @@ "beam": 1.6, "clearance": 0.6, "tris": 228, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "can_red_cylinder": { "category": "buoys", @@ -719,7 +756,8 @@ "beam": 1.6, "clearance": 0.6, "tris": 308, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "car": { "category": "other", @@ -738,7 +776,8 @@ "beam": 2.15, "clearance": 0.0, "tris": 736, - "icon": "vehicle" + "icon": "vehicle", + "parts": 3 }, "car_carrier": { "category": "ships", @@ -757,7 +796,8 @@ "beam": 34.315, "clearance": 8.96, "tris": 3949, - "icon": "ship" + "icon": "ship", + "parts": 3 }, "city_bus": { "category": "transit", @@ -776,7 +816,8 @@ "beam": 2.675, "clearance": 0.0, "tris": 432, - "icon": "bus" + "icon": "bus", + "parts": 4 }, "cl35": { "category": "aircraft", @@ -794,8 +835,9 @@ "length": 22.73, "beam": 20.892, "clearance": 1.189, - "tris": 2434, - "icon": "rear_jet" + "tris": 2634, + "icon": "rear_jet", + "parts": 16 }, "coach": { "category": "transit", @@ -814,7 +856,8 @@ "beam": 2.675, "clearance": 0.0, "tris": 474, - "icon": "bus" + "icon": "bus", + "parts": 5 }, "commuter_emu": { "category": "transit", @@ -833,7 +876,8 @@ "beam": 3.06, "clearance": 0.0, "tris": 1570, - "icon": "rail" + "icon": "rail", + "parts": 20 }, "conical_green": { "category": "buoys", @@ -852,7 +896,8 @@ "beam": 1.7, "clearance": 0.6, "tris": 172, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "conical_green_cone": { "category": "buoys", @@ -871,7 +916,8 @@ "beam": 1.7, "clearance": 0.6, "tris": 222, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "container_ship": { "category": "ships", @@ -890,7 +936,8 @@ "beam": 48.0, "clearance": 13.92, "tris": 14337, - "icon": "ship" + "icon": "ship", + "parts": 3 }, "crj9": { "category": "aircraft", @@ -908,8 +955,9 @@ "length": 36.496, "beam": 24.694, "clearance": 1.339, - "tris": 2334, - "icon": "rear_jet" + "tris": 2534, + "icon": "rear_jet", + "parts": 16 }, "cruise_ship": { "category": "ships", @@ -928,7 +976,8 @@ "beam": 45.0, "clearance": 8.4, "tris": 3759, - "icon": "passenger" + "icon": "passenger", + "parts": 3 }, "dh8d": { "category": "aircraft", @@ -946,8 +995,9 @@ "length": 32.8, "beam": 27.832, "clearance": 1.339, - "tris": 2364, - "icon": "turboprop" + "tris": 2564, + "icon": "turboprop", + "parts": 16 }, "double_decker": { "category": "transit", @@ -966,7 +1016,8 @@ "beam": 2.675, "clearance": 0.0, "tris": 442, - "icon": "bus" + "icon": "bus", + "parts": 4 }, "dredger": { "category": "ships", @@ -985,7 +1036,8 @@ "beam": 21.06, "clearance": 7.0, "tris": 2597, - "icon": "ship" + "icon": "ship", + "parts": 3 }, "e175": { "category": "aircraft", @@ -1003,8 +1055,9 @@ "length": 31.68, "beam": 25.835, "clearance": 2.427, - "tris": 2338, - "icon": "jet" + "tris": 2538, + "icon": "jet", + "parts": 16 }, "e55p": { "category": "aircraft", @@ -1022,8 +1075,9 @@ "length": 16.172, "beam": 16.084, "clearance": 0.896, - "tris": 2414, - "icon": "rear_jet" + "tris": 2614, + "icon": "rear_jet", + "parts": 16 }, "ec35": { "category": "helicopters", @@ -1042,7 +1096,8 @@ "beam": 10.2, "clearance": 1.365, "tris": 1420, - "icon": "heli" + "icon": "heli", + "parts": 4 }, "ec45": { "category": "helicopters", @@ -1061,7 +1116,8 @@ "beam": 11.0, "clearance": 1.54, "tris": 1420, - "icon": "heli" + "icon": "heli", + "parts": 4 }, "fast_ferry": { "category": "ships", @@ -1080,7 +1136,8 @@ "beam": 11.12, "clearance": 1.32, "tris": 4754, - "icon": "passenger" + "icon": "passenger", + "parts": 2 }, "feeder": { "category": "ships", @@ -1099,7 +1156,8 @@ "beam": 23.0, "clearance": 6.67, "tris": 3519, - "icon": "ship" + "icon": "ship", + "parts": 3 }, "ferry": { "category": "ships", @@ -1118,7 +1176,8 @@ "beam": 25.8, "clearance": 5.28, "tris": 3157, - "icon": "passenger" + "icon": "passenger", + "parts": 4 }, "fire_truck": { "category": "other", @@ -1137,7 +1196,8 @@ "beam": 3.014, "clearance": 0.0, "tris": 1016, - "icon": "vehicle" + "icon": "vehicle", + "parts": 5 }, "fishing_boat": { "category": "ships", @@ -1156,7 +1216,8 @@ "beam": 4.0, "clearance": 1.2, "tris": 2839, - "icon": "boat" + "icon": "boat", + "parts": 2 }, "funicular": { "category": "transit", @@ -1175,7 +1236,8 @@ "beam": 2.69, "clearance": 0.0, "tris": 308, - "icon": "rail" + "icon": "rail", + "parts": 3 }, "general_cargo": { "category": "ships", @@ -1194,7 +1256,8 @@ "beam": 14.0, "clearance": 5.32, "tris": 2797, - "icon": "ship" + "icon": "ship", + "parts": 5 }, "generic_heli": { "category": "helicopters", @@ -1213,7 +1276,8 @@ "beam": 11.0, "clearance": 1.365, "tris": 1272, - "icon": "heli" + "icon": "heli", + "parts": 4 }, "generic_plane": { "category": "aircraft", @@ -1231,8 +1295,9 @@ "length": 36.0, "beam": 33.32, "clearance": 2.906, - "tris": 2166, - "icon": "jet" + "tris": 2366, + "icon": "jet", + "parts": 16 }, "generic_vessel": { "category": "ships", @@ -1251,7 +1316,8 @@ "beam": 9.0, "clearance": 2.7, "tris": 2389, - "icon": "ship" + "icon": "ship", + "parts": 2 }, "glf4": { "category": "aircraft", @@ -1269,8 +1335,9 @@ "length": 29.19, "beam": 23.58, "clearance": 1.189, - "tris": 2474, - "icon": "rear_jet" + "tris": 2674, + "icon": "rear_jet", + "parts": 16 }, "glider": { "category": "aircraft", @@ -1289,7 +1356,8 @@ "beam": 14.793, "clearance": 0.398, "tris": 2314, - "icon": "light" + "icon": "light", + "parts": 5 }, "gondola": { "category": "transit", @@ -1308,7 +1376,8 @@ "beam": 1.876, "clearance": 0.0, "tris": 282, - "icon": "unknown" + "icon": "unknown", + "parts": 1 }, "h47": { "category": "helicopters", @@ -1327,7 +1396,8 @@ "beam": 17.254, "clearance": 2.588, "tris": 1430, - "icon": "heli_tandem" + "icon": "heli_tandem", + "parts": 7 }, "h60": { "category": "helicopters", @@ -1346,7 +1416,8 @@ "beam": 16.36, "clearance": 1.765, "tris": 1560, - "icon": "heli" + "icon": "heli", + "parts": 6 }, "h64": { "category": "helicopters", @@ -1365,7 +1436,8 @@ "beam": 14.63, "clearance": 1.475, "tris": 2040, - "icon": "heli" + "icon": "heli", + "parts": 7 }, "high_speed": { "category": "transit", @@ -1384,7 +1456,8 @@ "beam": 3.11, "clearance": 0.0, "tris": 2844, - "icon": "rail" + "icon": "rail", + "parts": 36 }, "inland_cargo": { "category": "ships", @@ -1403,7 +1476,8 @@ "beam": 11.45, "clearance": 3.0, "tris": 3277, - "icon": "ship" + "icon": "ship", + "parts": 3 }, "inland_tanker": { "category": "ships", @@ -1422,7 +1496,8 @@ "beam": 11.45, "clearance": 3.2, "tris": 2709, - "icon": "tanker" + "icon": "tanker", + "parts": 2 }, "intercity": { "category": "transit", @@ -1441,7 +1516,8 @@ "beam": 3.09, "clearance": 0.0, "tris": 3168, - "icon": "rail" + "icon": "rail", + "parts": 32 }, "k35r": { "category": "aircraft", @@ -1459,8 +1535,9 @@ "length": 48.951, "beam": 39.082, "clearance": 2.478, - "tris": 2626, - "icon": "jet" + "tris": 2826, + "icon": "jet", + "parts": 20 }, "light_rail": { "category": "transit", @@ -1479,7 +1556,8 @@ "beam": 2.81, "clearance": 0.0, "tris": 760, - "icon": "tram" + "icon": "tram", + "parts": 10 }, "lng_carrier": { "category": "ships", @@ -1498,7 +1576,8 @@ "beam": 46.0, "clearance": 11.5, "tris": 2951, - "icon": "tanker" + "icon": "tanker", + "parts": 3 }, "md11": { "category": "aircraft", @@ -1516,8 +1595,9 @@ "length": 64.145, "beam": 51.48, "clearance": 4.162, - "tris": 2476, - "icon": "widebody" + "tris": 2676, + "icon": "widebody", + "parts": 18 }, "metro": { "category": "transit", @@ -1536,7 +1616,8 @@ "beam": 3.06, "clearance": 0.0, "tris": 2226, - "icon": "subway" + "icon": "subway", + "parts": 27 }, "monorail": { "category": "transit", @@ -1555,7 +1636,8 @@ "beam": 3.06, "clearance": 0.0, "tris": 814, - "icon": "subway" + "icon": "subway", + "parts": 3 }, "motor_yacht": { "category": "ships", @@ -1574,7 +1656,8 @@ "beam": 4.6, "clearance": 1.15, "tris": 2477, - "icon": "boat" + "icon": "boat", + "parts": 2 }, "mq9": { "category": "aircraft", @@ -1592,8 +1675,9 @@ "length": 11.35, "beam": 19.6, "clearance": 1.616, - "tris": 1936, - "icon": "light" + "tris": 2136, + "icon": "light", + "parts": 13 }, "p28a": { "category": "aircraft", @@ -1612,7 +1696,8 @@ "beam": 10.457, "clearance": 1.341, "tris": 2136, - "icon": "light" + "icon": "light", + "parts": 9 }, "patrol": { "category": "ships", @@ -1631,7 +1716,8 @@ "beam": 9.0, "clearance": 2.7, "tris": 2587, - "icon": "ship" + "icon": "ship", + "parts": 4 }, "pc12": { "category": "aircraft", @@ -1649,8 +1735,9 @@ "length": 14.92, "beam": 16.106, "clearance": 1.435, - "tris": 2292, - "icon": "turboprop" + "tris": 2492, + "icon": "turboprop", + "parts": 13 }, "pile_green_cone": { "category": "buoys", @@ -1669,7 +1756,8 @@ "beam": 0.7, "clearance": 1.5, "tris": 138, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "pile_red_cylinder": { "category": "buoys", @@ -1688,7 +1776,8 @@ "beam": 0.7, "clearance": 1.5, "tris": 168, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "pilot_boat": { "category": "ships", @@ -1707,7 +1796,8 @@ "beam": 5.76, "clearance": 1.3, "tris": 2985, - "icon": "boat" + "icon": "boat", + "parts": 3 }, "product_tanker": { "category": "ships", @@ -1726,7 +1816,8 @@ "beam": 19.0, "clearance": 6.46, "tris": 2995, - "icon": "tanker" + "icon": "tanker", + "parts": 4 }, "psv": { "category": "ships", @@ -1745,7 +1836,8 @@ "beam": 19.0, "clearance": 6.27, "tris": 3059, - "icon": "ship" + "icon": "ship", + "parts": 3 }, "pushback": { "category": "other", @@ -1764,7 +1856,8 @@ "beam": 2.795, "clearance": 0.0, "tris": 490, - "icon": "vehicle" + "icon": "vehicle", + "parts": 3 }, "r44": { "category": "helicopters", @@ -1783,7 +1876,8 @@ "beam": 1.488, "clearance": 1.14, "tris": 1172, - "icon": "heli" + "icon": "heli", + "parts": 4 }, "radio_mast": { "category": "other", @@ -1802,7 +1896,8 @@ "beam": 1.63, "clearance": 0.0, "tris": 940, - "icon": "vehicle" + "icon": "vehicle", + "parts": 1 }, "regional_dmu": { "category": "transit", @@ -1821,7 +1916,8 @@ "beam": 3.06, "clearance": 0.0, "tris": 770, - "icon": "rail" + "icon": "rail", + "parts": 9 }, "river_cruise": { "category": "ships", @@ -1840,7 +1936,8 @@ "beam": 11.4, "clearance": 1.8, "tris": 2675, - "icon": "passenger" + "icon": "passenger", + "parts": 2 }, "s76": { "category": "helicopters", @@ -1859,7 +1956,8 @@ "beam": 13.41, "clearance": 1.525, "tris": 1356, - "icon": "heli" + "icon": "heli", + "parts": 6 }, "sailboat": { "category": "ships", @@ -1878,7 +1976,8 @@ "beam": 4.1, "clearance": 2.695, "tris": 2421, - "icon": "sail" + "icon": "sail", + "parts": 1 }, "spar_lateral_port": { "category": "buoys", @@ -1897,7 +1996,8 @@ "beam": 0.94, "clearance": 1.5, "tris": 290, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "spar_lateral_starboard": { "category": "buoys", @@ -1916,7 +2016,8 @@ "beam": 0.94, "clearance": 1.5, "tris": 262, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "speedboat": { "category": "ships", @@ -1935,7 +2036,8 @@ "beam": 2.6, "clearance": 0.55, "tris": 2369, - "icon": "boat" + "icon": "boat", + "parts": 1 }, "spherical_green": { "category": "buoys", @@ -1954,7 +2056,8 @@ "beam": 1.477, "clearance": 0.4, "tris": 344, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "spherical_yellow": { "category": "buoys", @@ -1973,7 +2076,8 @@ "beam": 1.477, "clearance": 0.4, "tris": 344, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "spherical_yellow_x": { "category": "buoys", @@ -1992,7 +2096,8 @@ "beam": 1.477, "clearance": 0.4, "tris": 380, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "sr22": { "category": "aircraft", @@ -2011,7 +2116,8 @@ "beam": 11.446, "clearance": 1.325, "tris": 2428, - "icon": "light" + "icon": "light", + "parts": 9 }, "stake_green_cone": { "category": "buoys", @@ -2030,7 +2136,8 @@ "beam": 0.396, "clearance": 1.5, "tris": 78, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "stake_red_cylinder": { "category": "buoys", @@ -2049,7 +2156,8 @@ "beam": 0.308, "clearance": 1.5, "tris": 108, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "stake_yellow_x": { "category": "buoys", @@ -2068,7 +2176,8 @@ "beam": 0.463, "clearance": 1.5, "tris": 64, - "icon": "buoy" + "icon": "buoy", + "parts": 1 }, "superyacht": { "category": "ships", @@ -2087,7 +2196,8 @@ "beam": 10.5, "clearance": 3.15, "tris": 2689, - "icon": "passenger" + "icon": "passenger", + "parts": 2 }, "t38": { "category": "aircraft", @@ -2105,8 +2215,9 @@ "length": 14.144, "beam": 7.546, "clearance": 0.746, - "tris": 2246, - "icon": "fighter" + "tris": 2446, + "icon": "fighter", + "parts": 14 }, "tanker": { "category": "ships", @@ -2125,7 +2236,8 @@ "beam": 44.0, "clearance": 14.96, "tris": 3393, - "icon": "tanker" + "icon": "tanker", + "parts": 4 }, "tex2": { "category": "aircraft", @@ -2143,8 +2255,9 @@ "length": 10.586, "beam": 9.986, "clearance": 1.293, - "tris": 2380, - "icon": "turboprop" + "tris": 2580, + "icon": "turboprop", + "parts": 13 }, "tour_boat": { "category": "ships", @@ -2163,7 +2276,8 @@ "beam": 6.0, "clearance": 1.68, "tris": 2449, - "icon": "boat" + "icon": "boat", + "parts": 2 }, "tower": { "category": "other", @@ -2182,7 +2296,8 @@ "beam": 2.27, "clearance": 0.016, "tris": 568, - "icon": "vehicle" + "icon": "vehicle", + "parts": 1 }, "tram": { "category": "transit", @@ -2201,7 +2316,8 @@ "beam": 2.56, "clearance": 0.0, "tris": 1004, - "icon": "tram" + "icon": "tram", + "parts": 10 }, "trawler": { "category": "ships", @@ -2220,7 +2336,8 @@ "beam": 12.676, "clearance": 2.8, "tris": 3121, - "icon": "ship" + "icon": "ship", + "parts": 5 }, "trolleybus": { "category": "transit", @@ -2239,7 +2356,8 @@ "beam": 2.675, "clearance": 0.0, "tris": 458, - "icon": "bus" + "icon": "bus", + "parts": 5 }, "tug": { "category": "ships", @@ -2258,7 +2376,8 @@ "beam": 10.7, "clearance": 3.7, "tris": 3661, - "icon": "ship" + "icon": "ship", + "parts": 2 }, "ultralight": { "category": "aircraft", @@ -2277,7 +2396,8 @@ "beam": 10.486, "clearance": 1.217, "tris": 2068, - "icon": "light" + "icon": "light", + "parts": 9 }, "v22": { "category": "aircraft", @@ -2295,8 +2415,9 @@ "length": 17.48, "beam": 23.294, "clearance": 1.468, - "tris": 2250, - "icon": "turboprop" + "tris": 2450, + "icon": "turboprop", + "parts": 16 }, "van": { "category": "other", @@ -2315,6 +2436,7 @@ "beam": 2.44, "clearance": 0.0, "tris": 736, - "icon": "vehicle" + "icon": "vehicle", + "parts": 3 } -} +} \ No newline at end of file diff --git a/public/models/fleet/helicopters/a139.glb b/public/models/fleet/helicopters/a139.glb index f61975dfb6..2ecebc5b5c 100644 Binary files a/public/models/fleet/helicopters/a139.glb and b/public/models/fleet/helicopters/a139.glb differ diff --git a/public/models/fleet/helicopters/as50.glb b/public/models/fleet/helicopters/as50.glb index 597d916e91..3374b36ca9 100644 Binary files a/public/models/fleet/helicopters/as50.glb and b/public/models/fleet/helicopters/as50.glb differ diff --git a/public/models/fleet/helicopters/b06.glb b/public/models/fleet/helicopters/b06.glb index 25baa7fa49..727a0131c3 100644 Binary files a/public/models/fleet/helicopters/b06.glb and b/public/models/fleet/helicopters/b06.glb differ diff --git a/public/models/fleet/helicopters/b407.glb b/public/models/fleet/helicopters/b407.glb index 09d67e67e1..f4c3f11569 100644 Binary files a/public/models/fleet/helicopters/b407.glb and b/public/models/fleet/helicopters/b407.glb differ diff --git a/public/models/fleet/helicopters/ec35.glb b/public/models/fleet/helicopters/ec35.glb index c52f3d156e..b5d900153c 100644 Binary files a/public/models/fleet/helicopters/ec35.glb and b/public/models/fleet/helicopters/ec35.glb differ diff --git a/public/models/fleet/helicopters/ec45.glb b/public/models/fleet/helicopters/ec45.glb index b9e5cb27ef..a1ca97fe34 100644 Binary files a/public/models/fleet/helicopters/ec45.glb and b/public/models/fleet/helicopters/ec45.glb differ diff --git a/public/models/fleet/helicopters/generic_heli.glb b/public/models/fleet/helicopters/generic_heli.glb index bc8f1a239c..bdae965817 100644 Binary files a/public/models/fleet/helicopters/generic_heli.glb and b/public/models/fleet/helicopters/generic_heli.glb differ diff --git a/public/models/fleet/helicopters/h47.glb b/public/models/fleet/helicopters/h47.glb index bb2f714261..ab5b6eda19 100644 Binary files a/public/models/fleet/helicopters/h47.glb and b/public/models/fleet/helicopters/h47.glb differ diff --git a/public/models/fleet/helicopters/h60.glb b/public/models/fleet/helicopters/h60.glb index 45f79180de..e612e1a1f8 100644 Binary files a/public/models/fleet/helicopters/h60.glb and b/public/models/fleet/helicopters/h60.glb differ diff --git a/public/models/fleet/helicopters/h64.glb b/public/models/fleet/helicopters/h64.glb index 3a44d8e50b..fe7b995e73 100644 Binary files a/public/models/fleet/helicopters/h64.glb and b/public/models/fleet/helicopters/h64.glb differ diff --git a/public/models/fleet/helicopters/r44.glb b/public/models/fleet/helicopters/r44.glb index 845727936a..74385abfec 100644 Binary files a/public/models/fleet/helicopters/r44.glb and b/public/models/fleet/helicopters/r44.glb differ diff --git a/public/models/fleet/helicopters/s76.glb b/public/models/fleet/helicopters/s76.glb index a773aba73f..3e7f4cb49b 100644 Binary files a/public/models/fleet/helicopters/s76.glb and b/public/models/fleet/helicopters/s76.glb differ diff --git a/public/models/fleet/other/balloon.glb b/public/models/fleet/other/balloon.glb index 016ad0719b..70be67087c 100644 Binary files a/public/models/fleet/other/balloon.glb and b/public/models/fleet/other/balloon.glb differ diff --git a/public/models/fleet/other/blimp.glb b/public/models/fleet/other/blimp.glb index 3aba8e86ba..348b8d7ab9 100644 Binary files a/public/models/fleet/other/blimp.glb and b/public/models/fleet/other/blimp.glb differ diff --git a/public/models/fleet/other/car.glb b/public/models/fleet/other/car.glb index 80f50d967c..fe8a713fe5 100644 Binary files a/public/models/fleet/other/car.glb and b/public/models/fleet/other/car.glb differ diff --git a/public/models/fleet/other/fire_truck.glb b/public/models/fleet/other/fire_truck.glb index 47cb6d2459..69a78e76eb 100644 Binary files a/public/models/fleet/other/fire_truck.glb and b/public/models/fleet/other/fire_truck.glb differ diff --git a/public/models/fleet/other/pushback.glb b/public/models/fleet/other/pushback.glb index 565ce426c2..d439e36636 100644 Binary files a/public/models/fleet/other/pushback.glb and b/public/models/fleet/other/pushback.glb differ diff --git a/public/models/fleet/other/van.glb b/public/models/fleet/other/van.glb index 0b79e1db6f..500e1f88a4 100644 Binary files a/public/models/fleet/other/van.glb and b/public/models/fleet/other/van.glb differ diff --git a/public/models/fleet/ships/bulk_carrier.glb b/public/models/fleet/ships/bulk_carrier.glb index 3fe73d3bfb..fe06c31702 100644 Binary files a/public/models/fleet/ships/bulk_carrier.glb and b/public/models/fleet/ships/bulk_carrier.glb differ diff --git a/public/models/fleet/ships/car_carrier.glb b/public/models/fleet/ships/car_carrier.glb index 04ad3e7790..007266bbb2 100644 Binary files a/public/models/fleet/ships/car_carrier.glb and b/public/models/fleet/ships/car_carrier.glb differ diff --git a/public/models/fleet/ships/container_ship.glb b/public/models/fleet/ships/container_ship.glb index f8686176b2..f2be465223 100644 Binary files a/public/models/fleet/ships/container_ship.glb and b/public/models/fleet/ships/container_ship.glb differ diff --git a/public/models/fleet/ships/cruise_ship.glb b/public/models/fleet/ships/cruise_ship.glb index d2dcfd88e8..d15f8ae88a 100644 Binary files a/public/models/fleet/ships/cruise_ship.glb and b/public/models/fleet/ships/cruise_ship.glb differ diff --git a/public/models/fleet/ships/dredger.glb b/public/models/fleet/ships/dredger.glb index 4d9ab52647..aaaf8cc8d8 100644 Binary files a/public/models/fleet/ships/dredger.glb and b/public/models/fleet/ships/dredger.glb differ diff --git a/public/models/fleet/ships/fast_ferry.glb b/public/models/fleet/ships/fast_ferry.glb index 65b008200c..784dadda04 100644 Binary files a/public/models/fleet/ships/fast_ferry.glb and b/public/models/fleet/ships/fast_ferry.glb differ diff --git a/public/models/fleet/ships/feeder.glb b/public/models/fleet/ships/feeder.glb index 1c40203bf6..ba2b5a71c6 100644 Binary files a/public/models/fleet/ships/feeder.glb and b/public/models/fleet/ships/feeder.glb differ diff --git a/public/models/fleet/ships/ferry.glb b/public/models/fleet/ships/ferry.glb index fcaa48abcc..dc2f988916 100644 Binary files a/public/models/fleet/ships/ferry.glb and b/public/models/fleet/ships/ferry.glb differ diff --git a/public/models/fleet/ships/fishing_boat.glb b/public/models/fleet/ships/fishing_boat.glb index 084f5dd3b6..a69d1f9abf 100644 Binary files a/public/models/fleet/ships/fishing_boat.glb and b/public/models/fleet/ships/fishing_boat.glb differ diff --git a/public/models/fleet/ships/general_cargo.glb b/public/models/fleet/ships/general_cargo.glb index 0cd1cd4cd4..91a560f7e9 100644 Binary files a/public/models/fleet/ships/general_cargo.glb and b/public/models/fleet/ships/general_cargo.glb differ diff --git a/public/models/fleet/ships/generic_vessel.glb b/public/models/fleet/ships/generic_vessel.glb index e8c7485445..3540207d5a 100644 Binary files a/public/models/fleet/ships/generic_vessel.glb and b/public/models/fleet/ships/generic_vessel.glb differ diff --git a/public/models/fleet/ships/inland_cargo.glb b/public/models/fleet/ships/inland_cargo.glb index 9f9facc4ab..f626be0c3a 100644 Binary files a/public/models/fleet/ships/inland_cargo.glb and b/public/models/fleet/ships/inland_cargo.glb differ diff --git a/public/models/fleet/ships/inland_tanker.glb b/public/models/fleet/ships/inland_tanker.glb index db46c2476b..540ad33325 100644 Binary files a/public/models/fleet/ships/inland_tanker.glb and b/public/models/fleet/ships/inland_tanker.glb differ diff --git a/public/models/fleet/ships/lng_carrier.glb b/public/models/fleet/ships/lng_carrier.glb index d06330645d..f26c06d5a8 100644 Binary files a/public/models/fleet/ships/lng_carrier.glb and b/public/models/fleet/ships/lng_carrier.glb differ diff --git a/public/models/fleet/ships/motor_yacht.glb b/public/models/fleet/ships/motor_yacht.glb index d7283750a0..34b290e392 100644 Binary files a/public/models/fleet/ships/motor_yacht.glb and b/public/models/fleet/ships/motor_yacht.glb differ diff --git a/public/models/fleet/ships/patrol.glb b/public/models/fleet/ships/patrol.glb index 6b3352e111..cc412b42a2 100644 Binary files a/public/models/fleet/ships/patrol.glb and b/public/models/fleet/ships/patrol.glb differ diff --git a/public/models/fleet/ships/pilot_boat.glb b/public/models/fleet/ships/pilot_boat.glb index f4197ab0fb..2abe1d1fdc 100644 Binary files a/public/models/fleet/ships/pilot_boat.glb and b/public/models/fleet/ships/pilot_boat.glb differ diff --git a/public/models/fleet/ships/product_tanker.glb b/public/models/fleet/ships/product_tanker.glb index 6e31083d35..01ce99903e 100644 Binary files a/public/models/fleet/ships/product_tanker.glb and b/public/models/fleet/ships/product_tanker.glb differ diff --git a/public/models/fleet/ships/psv.glb b/public/models/fleet/ships/psv.glb index d943978ec2..0653b7cb5c 100644 Binary files a/public/models/fleet/ships/psv.glb and b/public/models/fleet/ships/psv.glb differ diff --git a/public/models/fleet/ships/river_cruise.glb b/public/models/fleet/ships/river_cruise.glb index 2da8589f0a..f28724cee3 100644 Binary files a/public/models/fleet/ships/river_cruise.glb and b/public/models/fleet/ships/river_cruise.glb differ diff --git a/public/models/fleet/ships/superyacht.glb b/public/models/fleet/ships/superyacht.glb index 012e69dd38..eefad54825 100644 Binary files a/public/models/fleet/ships/superyacht.glb and b/public/models/fleet/ships/superyacht.glb differ diff --git a/public/models/fleet/ships/tanker.glb b/public/models/fleet/ships/tanker.glb index 68de5a0013..4dac158e5d 100644 Binary files a/public/models/fleet/ships/tanker.glb and b/public/models/fleet/ships/tanker.glb differ diff --git a/public/models/fleet/ships/tour_boat.glb b/public/models/fleet/ships/tour_boat.glb index 22ee9cb430..a1665a93c1 100644 Binary files a/public/models/fleet/ships/tour_boat.glb and b/public/models/fleet/ships/tour_boat.glb differ diff --git a/public/models/fleet/ships/trawler.glb b/public/models/fleet/ships/trawler.glb index bb8651f2cb..7377e8e798 100644 Binary files a/public/models/fleet/ships/trawler.glb and b/public/models/fleet/ships/trawler.glb differ diff --git a/public/models/fleet/ships/tug.glb b/public/models/fleet/ships/tug.glb index f20e72b6b4..e9f2f78fd8 100644 Binary files a/public/models/fleet/ships/tug.glb and b/public/models/fleet/ships/tug.glb differ diff --git a/public/models/fleet/transit/articulated_bus.glb b/public/models/fleet/transit/articulated_bus.glb index 4b10d2ef07..877b3f58ec 100644 Binary files a/public/models/fleet/transit/articulated_bus.glb and b/public/models/fleet/transit/articulated_bus.glb differ diff --git a/public/models/fleet/transit/cable_tram.glb b/public/models/fleet/transit/cable_tram.glb index 10b12a3eec..01d68a1bd3 100644 Binary files a/public/models/fleet/transit/cable_tram.glb and b/public/models/fleet/transit/cable_tram.glb differ diff --git a/public/models/fleet/transit/city_bus.glb b/public/models/fleet/transit/city_bus.glb index 4e2b1dc8a9..74ef791488 100644 Binary files a/public/models/fleet/transit/city_bus.glb and b/public/models/fleet/transit/city_bus.glb differ diff --git a/public/models/fleet/transit/coach.glb b/public/models/fleet/transit/coach.glb index 00e23f7f5d..f8f8800a1b 100644 Binary files a/public/models/fleet/transit/coach.glb and b/public/models/fleet/transit/coach.glb differ diff --git a/public/models/fleet/transit/commuter_emu.glb b/public/models/fleet/transit/commuter_emu.glb index e53f0a1bee..ad42a377d9 100644 Binary files a/public/models/fleet/transit/commuter_emu.glb and b/public/models/fleet/transit/commuter_emu.glb differ diff --git a/public/models/fleet/transit/double_decker.glb b/public/models/fleet/transit/double_decker.glb index 416bd2cbcf..bcbfd1d5fc 100644 Binary files a/public/models/fleet/transit/double_decker.glb and b/public/models/fleet/transit/double_decker.glb differ diff --git a/public/models/fleet/transit/funicular.glb b/public/models/fleet/transit/funicular.glb index 4b14d66225..2727d62fc3 100644 Binary files a/public/models/fleet/transit/funicular.glb and b/public/models/fleet/transit/funicular.glb differ diff --git a/public/models/fleet/transit/high_speed.glb b/public/models/fleet/transit/high_speed.glb index c3f09d0948..c056e218bd 100644 Binary files a/public/models/fleet/transit/high_speed.glb and b/public/models/fleet/transit/high_speed.glb differ diff --git a/public/models/fleet/transit/intercity.glb b/public/models/fleet/transit/intercity.glb index 2845594ec9..b963384c24 100644 Binary files a/public/models/fleet/transit/intercity.glb and b/public/models/fleet/transit/intercity.glb differ diff --git a/public/models/fleet/transit/light_rail.glb b/public/models/fleet/transit/light_rail.glb index 22f80d1970..9d3709fac1 100644 Binary files a/public/models/fleet/transit/light_rail.glb and b/public/models/fleet/transit/light_rail.glb differ diff --git a/public/models/fleet/transit/metro.glb b/public/models/fleet/transit/metro.glb index 6154049b95..d7f57b4765 100644 Binary files a/public/models/fleet/transit/metro.glb and b/public/models/fleet/transit/metro.glb differ diff --git a/public/models/fleet/transit/monorail.glb b/public/models/fleet/transit/monorail.glb index a8dab0f07f..21ac0752a9 100644 Binary files a/public/models/fleet/transit/monorail.glb and b/public/models/fleet/transit/monorail.glb differ diff --git a/public/models/fleet/transit/regional_dmu.glb b/public/models/fleet/transit/regional_dmu.glb index 1a091e2d60..7224cd1687 100644 Binary files a/public/models/fleet/transit/regional_dmu.glb and b/public/models/fleet/transit/regional_dmu.glb differ diff --git a/public/models/fleet/transit/tram.glb b/public/models/fleet/transit/tram.glb index 514cff4360..09015873ba 100644 Binary files a/public/models/fleet/transit/tram.glb and b/public/models/fleet/transit/tram.glb differ diff --git a/public/models/fleet/transit/trolleybus.glb b/public/models/fleet/transit/trolleybus.glb index a7691b71e7..31d5b9d1ec 100644 Binary files a/public/models/fleet/transit/trolleybus.glb and b/public/models/fleet/transit/trolleybus.glb differ diff --git a/public/models/fleet/types.json b/public/models/fleet/types.json index 2b2388bb19..258fe1b0d0 100644 --- a/public/models/fleet/types.json +++ b/public/models/fleet/types.json @@ -2033,5 +2033,199 @@ "monorail": 6.0, "gondola": 20.0 } + }, + "rockets": { + "configurations": { + "Falcon 9": [ + "falcon9", + 70.0 + ], + "Falcon 9 Block 5": [ + "falcon9", + 70.0 + ], + "Falcon 9 v1.2": [ + "falcon9", + 70.0 + ], + "Falcon Heavy": [ + "falcon_heavy", + 70.0 + ], + "Starship": [ + "starship", + 123.3 + ], + "Starship V2": [ + "starship", + 123.3 + ], + "Starship V3": [ + "starship", + 124.4 + ], + "Electron": [ + "electron", + 18.0 + ], + "New Glenn": [ + "new_glenn", + 98.0 + ], + "Ariane 62": [ + "ariane62", + 56.0 + ], + "Ariane 64": [ + "ariane64", + 62.0 + ], + "Soyuz 2.1a": [ + "soyuz", + 46.3 + ], + "Soyuz 2.1b": [ + "soyuz", + 46.3 + ], + "Soyuz-2.1a": [ + "soyuz", + 46.3 + ], + "Soyuz-2.1b": [ + "soyuz", + 46.3 + ], + "Soyuz-FG": [ + "soyuz", + 46.3 + ], + "Soyuz ST-B": [ + "soyuz", + 46.3 + ], + "Soyuz 2.1v": [ + "generic_medium", + 44.0 + ], + "Long March 5": [ + "long_march5", + 57.0 + ], + "Long March 5B": [ + "long_march5", + 53.7 + ], + "Space Launch System (SLS)": [ + "sls", + 98.1 + ], + "SLS Block 1": [ + "sls", + 98.1 + ], + "SLS Block 1B": [ + "sls", + 111.3 + ], + "H3": [ + "h3", + 57.0 + ], + "H3-22": [ + "h3", + 57.0 + ], + "H3-24": [ + "h3", + 57.0 + ], + "H3-30": [ + "h3", + 57.0 + ], + "Vulcan": [ + "vulcan", + 61.6 + ], + "Vulcan VC0S": [ + "vulcan", + 61.6 + ], + "Vulcan VC2S": [ + "vulcan", + 61.6 + ], + "Vulcan VC4L": [ + "vulcan", + 67.3 + ], + "Vulcan VC6L": [ + "vulcan", + 67.3 + ] + }, + "families": { + "Falcon": [ + "falcon9", + 70.0 + ], + "Starship": [ + "starship", + 123.3 + ], + "Electron": [ + "electron", + 18.0 + ], + "New Glenn": [ + "new_glenn", + 98.0 + ], + "Ariane": [ + "ariane62", + 56.0 + ], + "Soyuz": [ + "soyuz", + 46.3 + ], + "Long March 5": [ + "long_march5", + 57.0 + ], + "SLS": [ + "sls", + 98.1 + ], + "H3": [ + "h3", + 57.0 + ], + "Vulcan": [ + "vulcan", + 61.6 + ] + }, + "classes": [ + { + "max_leo_kg": 2000, + "model": "generic_small", + "height": 20.0 + }, + { + "max_leo_kg": 20000, + "model": "generic_medium", + "height": 50.0 + }, + { + "model": "generic_heavy", + "height": 70.0 + } + ], + "default_rocket": [ + "generic_medium", + 50.0 + ] } } \ No newline at end of file diff --git a/src/data/aisLiveVessels.test.mjs b/src/data/aisLiveVessels.test.mjs index 1b091ec4f7..0f94b7b86f 100644 --- a/src/data/aisLiveVessels.test.mjs +++ b/src/data/aisLiveVessels.test.mjs @@ -1461,6 +1461,36 @@ test('enable owns one grace timer and disable/re-enable starts a new session', a } }); +test('the layer turns on and off when its feed fails', async () => { + const harness = installWireHarness(undefined, { enabled: false }); + const priorFetch = globalThis.fetch; + const priorWarn = console.warn; + const clock = makeFakeAisRuntime(); + _setAisRuntimeForTest(clock.runtime); + globalThis.fetch = async () => ({ + ok: false, + status: 503, + json: async () => ({ + status: 'missing-key', + error: 'AISSTREAM_API_KEY is not set', + }), + }); + console.warn = () => {}; + try { + // Turning it on succeeds; the failure is shown on the layer. + assert.notEqual(await aisLiveVesselsLayer.enable(harness.viewer), false); + const feed = _getVesselFeedStateForTest(); + assert.equal(feed.status, 'unavailable'); + assert.equal(feed.error, 'AISSTREAM_API_KEY not set'); + assert.notEqual(aisLiveVesselsLayer.disable(), false); + } finally { + globalThis.fetch = priorFetch; + console.warn = priorWarn; + harness.cleanup(); + _setAisRuntimeForTest(); + } +}); + test('vessel trail lifecycle: deselect clears the selected-vessel trail', () => { const harness = installWireHarness(undefined); try { diff --git a/src/layers/vessels/ingestion.js b/src/layers/vessels/ingestion.js index 79eb347675..ebc898d656 100644 --- a/src/layers/vessels/ingestion.js +++ b/src/layers/vessels/ingestion.js @@ -32,7 +32,22 @@ export function createIngestion({ // may still be set while it loads (see resumeLive). let liveLoad = null; - async function loadLivePositions(viewer, { handover = false } = {}) { + /** + * Poll the live vessels (or take the live poll already out). Resolves + * when it is done, with nothing: a feed that fails is shown on the layer, + * and turning the layer on still succeeds. + * @param {object} viewer + * @returns {Promise} + */ + async function loadLivePositions(viewer) { + await pollLive(viewer); + } + + /** + * The live poll: resolves what loadPositions answers (false when it could + * not be had), or that of the live poll already out. + */ + async function pollLive(viewer, { handover = false } = {}) { // Following the world clock, the layer shows the snapshots loadAt applies. if (followsClock()) return false; // Back at live, a snapshot at a time still loading no longer applies: @@ -63,7 +78,7 @@ export function createIngestion({ * @returns {Promise} */ async function resumeLive(viewer) { - const applied = await loadLivePositions(viewer || readViewer(), { + const applied = await pollLive(viewer || readViewer(), { handover: true, }); return applied === true;