Fix vehicle names

Author: Fernando-A-Rocha

web/src/pages/reference/ID_Lists/Vehicles.astro

@@ -11,232 +11,6 @@ import { getAssetImagePath } from '@src/utils/general';
 
 import NoteBox from '@src/components/NoteBox.astro';
 
-const testVehicleNames = [
-"Landstalker",
-"Bravura",
-"Buffalo",
-"Linerunner",
-"Perennial",
-"Sentinel",
-"Dumper",
-"Fire Truck",
-"Trashmaster",
-"Stretch",
-"Manana",
-"Infernus",
-"Voodoo",
-"Pony",
-"Mule",
-"Cheetah",
-"Ambulance",
-"Leviathan",
-"Moonbeam",
-"Esperanto",
-"Taxi",
-"Washington",
-"Bobcat",
-"Mr. Whoopee",
-"BF Injection",
-"Hunter",
-"Premier",
-"Enforcer",
-"Securicar",
-"Banshee",
-"Predator",
-"Bus",
-"Rhino",
-"Barracks",
-"Hotknife",
-"Trailer 1",
-"Previon",
-"Coach",
-"Cabbie",
-"Stallion",
-"Rumpo",
-"RC Bandit",
-"Romero",
-"Packer",
-["Monster", "Monster 1"],
-"Admiral",
-"Squalo",
-"Seasparrow",
-"Pizzaboy",
-"Tram",
-"Trailer 2",
-"Turismo",
-"Speeder",
-"Reefer",
-"Tropic",
-"Flatbed",
-"Yankee",
-"Caddy",
-"Solair",
-"Berkley's RC Van",
-"Skimmer",
-"PCJ-600",
-"Faggio",
-"Freeway",
-"RC Baron",
-"RC Raider",
-"Glendale",
-"Oceanic",
-"Sanchez",
-"Sparrow",
-"Patriot",
-"Quadbike",
-"Coastguard",
-"Dinghy",
-"Hermes",
-"Sabre",
-"Rustler",
-"ZR-350",
-"Walton",
-"Regina",
-"Comet",
-"BMX",
-"Burrito",
-"Camper",
-"Marquis",
-"Baggage",
-"Dozer",
-"Maverick",
-"News Chopper",
-"Rancher",
-"FBI Rancher",
-"Virgo",
-"Greenwood",
-"Jetmax",
-"Hotring Racer",
-"Sandking",
-"Blista Compact",
-"Police Maverick",
-"Boxville",
-"Benson",
-"Mesa",
-"RC Goblin",
-"Hotring Racer 3",
-"Hotring Racer 2",
-"Bloodring Banger",
-"Rancher Lure",
-"Super GT",
-"Elegant",
-"Journey",
-"Bike",
-"Mountain Bike",
-"Beagle",
-"Cropduster",
-"Stuntplane",
-"Tanker",
-"Roadtrain",
-"Nebula",
-"Majestic",
-"Buccaneer",
-"Shamal",
-"Hydra",
-"FCR-900",
-"NRG-500",
-"HPV1000",
-"Cement Truck",
-"Towtruck",
-"Fortune",
-"Cadrona",
-"FBI Truck",
-"Willard",
-"Forklift",
-"Tractor",
-"Combine Harvester",
-"Feltzer",
-"Remington",
-"Slamvan",
-"Blade",
-"Freight",
-"Streak",
-"Vortex",
-"Vincent",
-"Bullet",
-"Clover",
-"Sadler",
-"Fire Truck Ladder",
-"Hustler",
-"Intruder",
-"Primo",
-"Cargobob",
-"Tampa",
-"Sunrise",
-"Merit",
-"Utility Van",
-"Nevada",
-"Yosemite",
-"Windsor",
-"Monster 2",
-"Monster 3",
-"Uranus",
-"Jester",
-"Sultan",
-"Stratum",
-"Elegy",
-"Raindance",
-"RC Tiger",
-"Flash",
-"Tahoma",
-"Savanna",
-"Bandito",
-"Freight Train Flatbed",
-"Streak Train Trailer",
-"Kart",
-"Mower",
-"Dune",
-"Sweeper",
-"Broadway",
-"Tornado",
-"AT-400",
-"DFT-30",
-"Huntley",
-"Stafford",
-"BF-400",
-"Newsvan",
-"Tug",
-"Trailer (Tanker Commando)",
-"Emperor",
-"Wayfarer",
-"Euros",
-"Hotdog",
-"Club",
-"Box Freight",
-"Trailer 3",
-"Andromada",
-"Dodo",
-"RC Cam",
-"Launch",
-["Police LS", "Police"],
-"Police SF",
-"Police LV",
-["Police Ranger", "Ranger"],
-"Picador",
-"S.W.A.T.",
-"Alpha",
-"Phoenix",
-"Glendale Damaged",
-["Sadler", "Sadler Damaged"],
-"Baggage Trailer (covered)",
-"Baggage Trailer (Uncovered)",
-"Trailer (Stairs)",
-"Boxville Mission",
-"Farm Trailer",
-"Street Clean Trailer"
-];
-
-function getVehicleNamesById(id: number): string[] | null {
-  if (id < 400 || id > 611) {
-    return null;
-  }
-  const foundNames = testVehicleNames[id - 400];
-  if (Array.isArray(foundNames)) {
-    return foundNames;
-  }
-  return [foundNames];
-}
-
 const vehicles = {
   "Aircraft": {
     "Airplanes": [
@@ -316,7 +90,7 @@ const vehicles = {
     ],
     "4-Door & Luxury cars": [
       { id: 445, name: "Admiral", modelName: "admiral" },
-      { id: 604, name: "Damaged Glendale", modelName: "glenshit" },
+      { id: 604, name: "Glendale Damaged", modelName: "glenshit" },
       { id: 507, name: "Elegant", modelName: "elegant" },
       { id: 585, name: "Emperor", modelName: "emperor" },
       { id: 466, name: "Glendale", modelName: "glendale" },
@@ -354,7 +128,7 @@ const vehicles = {
       { id: 490, name: "FBI Rancher", modelName: "fbiranch" },
       { id: 528, name: "FBI Truck", modelName: "fbitruck" },
       { id: 407, name: "Fire Truck", modelName: "firetruk" },
-      { id: 544, name: "Fire Truck", modelName: "firela" },
+      { id: 544, name: "Fire Truck Ladder", modelName: "firela" },
       { id: 523, name: "HPV1000", modelName: "copbike" },
       { id: 470, name: "Patriot", modelName: "patriot" },
       { id: 596, name: "Police LS", modelName: "copcarla" },
@@ -390,11 +164,11 @@ const vehicles = {
       { id: 459, name: "Berkley's RC Van", modelName: "topfun" },
       { id: 422, name: "Bobcat", modelName: "bobcat" },
       { id: 482, name: "Burrito", modelName: "burrito" },
-      { id: 605, name: "Damaged Sadler", modelName: "sadlshit" },
+      { id: 605, name: "Sadler Damaged", modelName: "sadlshit" },
       { id: 530, name: "Forklift", modelName: "forklift" },
       { id: 418, name: "Moonbeam", modelName: "moonbeam" },
       { id: 572, name: "Mower", modelName: "mower" },
-      { id: 582, name: "News Van", modelName: "newsvan" },
+      { id: 582, name: "Newsvan", modelName: "newsvan" },
       { id: 413, name: "Pony", modelName: "pony" },
       { id: 440, name: "Rumpo", modelName: "rumpo" },
       { id: 543, name: "Sadler", modelName: "sadler" },
@@ -436,8 +210,8 @@ const vehicles = {
       { id: 565, name: "Flash", modelName: "flash" },
       { id: 434, name: "Hotknife", modelName: "hotknife" },
       { id: 494, name: "Hotring Racer", modelName: "hotring" },
-      { id: 502, name: "Hotring Racer 2", modelName: "hotrina" },
-      { id: 503, name: "Hotring Racer 3", modelName: "hotrinb" },
+      { id: 502, name: "Hotring Racer 3", modelName: "hotrina" },
+      { id: 503, name: "Hotring Racer 2", modelName: "hotrinb" },
       { id: 411, name: "Infernus", modelName: "infernus" },
       { id: 559, name: "Jester", modelName: "jester" },
       { id: 561, name: "Stratum", modelName: "stratum" },
@@ -457,21 +231,21 @@ const vehicles = {
       { id: 564, name: "RC Tiger", modelName: "rctiger" },
     ],
     "Trailers": [
-      { id: 606, name: "Baggage Trailer", modelName: "bagboxa" },
-      { id: 607, name: "Baggage Trailer", modelName: "bagboxb" },
+      { id: 606, name: "Baggage Trailer (covered)", modelName: "bagboxa" },
+      { id: 607, name: "Baggage Trailer (Uncovered)", modelName: "bagboxb" },
       { id: 610, name: "Farm Trailer", modelName: "farmtr1" },
-      { id: 584, name: "Petrol trailer", modelName: "petrotr" },
-      { id: 611, name: "Trailer", modelName: "utiltr1" },
-      { id: 608, name: "Trailer", modelName: "tugstair" },
+      { id: 584, name: "Trailer (Tanker Commando)", modelName: "petrotr" },
+      { id: 611, name: "Street Clean Trailer", modelName: "utiltr1" },
+      { id: 608, name: "Trailer (Stairs)", modelName: "tugstair" },
       { id: 435, name: "Trailer 1", modelName: "artict1" },
       { id: 450, name: "Trailer 2", modelName: "artict2" },
       { id: 591, name: "Trailer 3", modelName: "artict3" },
     ],
     "Trains & Railroad cars": [
       { id: 590, name: "Box Freight", modelName: "freibox" },
-      { id: 538, name: "Brown Streak", modelName: "streak" },
-      { id: 570, name: "Brown Streak Carriage", modelName: "streakc" },
-      { id: 569, name: "Flat Freight", modelName: "freiflat" },
+      { id: 538, name: "Streak", modelName: "streak" },
+      { id: 570, name: "Streak Train Trailer", modelName: "streakc" },
+      { id: 569, name: "Freight Train Flatbed", modelName: "freiflat" },
       { id: 537, name: "Freight", modelName: "freight" },
       { id: 449, name: "Tram", modelName: "tram" },
     ],
@@ -572,13 +346,7 @@ const vehicles = {
                       <div class="vehicle-list">
                       {vehiclesList.map(vehicle => (
                           <div class="vehicle-item" id={vehicle.name}>
-                              <div class="vehicle-title">
-                                {vehicle.name}
-                                {/* Check if vehicle name is not in that array */}
-                                {!getVehicleNamesById(vehicle.id).includes(vehicle.name) && (
-                                  <div style="color: red"><strong>CORRECT NAME(S)</strong>: {getVehicleNamesById(vehicle.id)?.join(', ')}</div>
-                                )}
-                              </div>
+                              <div class="vehicle-title">{vehicle.name}</div>
                               <a target="_blank" href={`http://gta.rockstarvision.com/vehicleviewer/#sa/${vehicle.id}`}>
                                   <Image
                                       src={getAssetImagePath(`Vehicles/${vehicle.id}.png`)}