Merge upstream main into feat/iss-3d-model

Translation files: kept both sides' new keys.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
Itallo BrandãoandClaude Opus 5.5 committed 2026-11-15 22:41:59 -03:00
commit 349b3a04ec
407 files changed
+23411 -2582

No files matched your search

+6
View File
@@ -20,6 +20,12 @@ How the layers use them:
type's published length (a vessel to its reported AIS length and beam), so
every model is drawn life size. Ground objects, balloons and obstacles in
the `other` category are drawn at the size they are built.
- An aid to navigation (a vessel record whose type names a buoy, beacon, IALA
mark, RACON or light, or whose MMSI is an aid station's `99MIDxxxx`) is
drawn as the `buoys` model of its mark (cardinal north, east, south or west,
port or starboard hand, safe water, isolated danger, special mark), a red
can when its type names no mark, at its built size and with no heading
(`vesselModelSpec`, `aidToNavigationModel`).
- An aircraft model's origin is its axis; it stands that model's scaled
clearance above the ground. A ship's origin is its waterline, and a transit
or rail vehicle's the road or rail top (a monorail or gondola is raised by
+54 -35
View File
@@ -726,18 +726,18 @@
"file": "other/car.glb",
"min": [
-2.31,
-0.906,
0.019
-1.075,
0.018
],
"max": [
2.3,
0.906,
1.948
2.31,
1.075,
1.84
],
"length": 4.61,
"beam": 1.812,
"length": 4.62,
"beam": 2.15,
"clearance": 0.0,
"tris": 206,
"tris": 736,
"icon": "vehicle"
},
"car_carrier": {
@@ -1124,19 +1124,19 @@
"category": "other",
"file": "other/fire_truck.glb",
"min": [
-5.51,
-1.5,
0.027
-6.408,
-1.507,
0.029
],
"max": [
5.5,
1.5,
4.08
5.51,
1.507,
3.64
],
"length": 11.01,
"beam": 3.0,
"length": 11.918,
"beam": 3.014,
"clearance": 0.0,
"tris": 314,
"tris": 1016,
"icon": "vehicle"
},
"fishing_boat": {
@@ -1751,19 +1751,19 @@
"category": "other",
"file": "other/pushback.glb",
"min": [
-3.0,
-1.45,
0.024
-3.45,
-1.398,
0.025
],
"max": [
3.0,
1.45,
2.1
3.05,
1.398,
2.14
],
"length": 6.0,
"beam": 2.9,
"length": 6.5,
"beam": 2.795,
"clearance": 0.0,
"tris": 176,
"tris": 490,
"icon": "vehicle"
},
"r44": {
@@ -1785,6 +1785,25 @@
"tris": 1172,
"icon": "heli"
},
"radio_mast": {
"category": "other",
"file": "other/radio_mast.glb",
"min": [
-0.7,
-0.815,
0.0
],
"max": [
1.2,
0.815,
11.8
],
"length": 1.9,
"beam": 1.63,
"clearance": 0.0,
"tris": 940,
"icon": "vehicle"
},
"regional_dmu": {
"category": "transit",
"file": "transit/regional_dmu.glb",
@@ -2284,18 +2303,18 @@
"file": "other/van.glb",
"min": [
-2.76,
-1.0,
0.019
-1.22,
0.018
],
"max": [
2.75,
1.0,
2.438
2.76,
1.22,
2.56
],
"length": 5.51,
"beam": 2.0,
"length": 5.52,
"beam": 2.44,
"clearance": 0.0,
"tris": 206,
"tris": 736,
"icon": "vehicle"
}
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+36
View File
@@ -983,6 +983,14 @@
"SHIP": [
"blimp",
75.0
],
"ZVEH": [
"car",
4.61
],
"GRND": [
"radio_mast",
1.9
]
},
"helicopters": {
@@ -1143,6 +1151,34 @@
5.0
]
},
"aircraft_callsign": {
"ZVEH": [
{
"prefixes": [
"FIRE"
],
"model": "fire_truck",
"length": 11.01
},
{
"prefixes": [
"PUSH",
"TUG"
],
"model": "pushback",
"length": 6.0
},
{
"prefixes": [
"DEICER",
"SQUID",
"SQB"
],
"model": "van",
"length": 5.51
}
]
},
"vessels": [
{
"types": [