♻️ [feat/rework-scania] #78 #99 refactoring and add telemetry model h…

…elper
JAGFx · Feb 26, 2022 · d8b6c55 · d8b6c55
1 parent 5595ee4
commit d8b6c55
Show file tree

Hide file tree

Showing 46 changed files with 808 additions and 527 deletions.
diff --git a/lib/config/config.json b/lib/config/config.json
@@ -1,6 +1,6 @@
 {
 	"general_refresh_rate" :   100,
-	"general_skin_on_load" :   "Scania",
+	"general_skin_on_load" :   "JAGFx",
 	"general_h-shift-layout" : "h-shifter",
 	"general_skin_locale" :    "en-EN",
 	"general_job_remaining" :  "due_date",

diff --git a/lib/sdk/scs_sdk_plugin_parsed_data.json b/lib/sdk/scs_sdk_plugin_parsed_data.json
@@ -557,12 +557,12 @@
 			}
 		},
 		"speed" :         {
-			"value" : 0.0009727554861456156,
+			"value" : 36.1111,
 			"kph" :   50,
 			"mph" :   50
 		},
 		"cruiseControl" : {
-			"value" :   90,
+			"value" :   25,
 			"enabled" : true,
 			"kph" :     90,
 			"mph" :     12
@@ -1158,7 +1158,7 @@
 		"distance" :     780480.9375,
 		"time" :         39707175.78125,
 		"speedLimit" :   {
-			"value" : 110,
+			"value" : 30.5556,
 			"kph" :   110,
 			"mph" :   110
 		}

diff --git a/src/components/dashboards/DafXFDashboard.vue b/src/components/dashboards/DafXFDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <Cadran
@@ -69,17 +69,12 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -112,9 +107,7 @@
         />
         <div class="trailer-mass wrapper-area">
           <span>
-            {{
-              $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 1)
-            }}
+            {{ unit_weight(telemetry.job.cargo.mass, true, false).toFixed(1) }}
             <span class="ton">{{
               unit_weight(telemetry.job.cargo.mass, false)
             }}</span>
@@ -135,7 +128,7 @@
         <div class="game-time wrapper-area">
           <span>{{
             $dateTimeLocalized(
-              $gameTime(),
+              telemetry2.gameTime,
               DATE_FORMAT_SHORT,
               TIME_FORMAT_SHORT
             )

diff --git a/src/components/dashboards/Dashboard.vue b/src/components/dashboards/Dashboard.vue
@@ -6,6 +6,7 @@
 
 <script>
 import TelemetryMixin from '@/mixins/TelemetryMixin';
+import { scale } from '@/utils/telemetry/_common.utils';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -33,7 +34,7 @@ export default {
       return this.currentSkin;
     },
     updateScale() {
-      this.currentScale = this.$scale(this.currentSkin);
+      this.currentScale = scale(this.currentSkin);
     }
   }
 };

diff --git a/src/components/dashboards/DefaultDashboard.vue b/src/components/dashboards/DefaultDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <div class="truck-speedRounded-unit wrapper-area">
@@ -72,19 +72,14 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <div class="truck-cruiseControlSpeedRounded wrapper-area">
           <span>{{ telemetry.truck.cruiseControl.kph }}</span>
         </div>
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -116,7 +111,7 @@
           class="trailer-attached"
         />
         <div class="trailer-mass">
-          {{ $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 1)
+          {{ unit_weight(telemetry.job.cargo.mass, true, false).toFixed(1)
           }}<span class="ton">{{
             unit_weight(telemetry.job.cargo.mass, false)
           }}</span>
@@ -131,7 +126,7 @@
             <td>
               <span class="game-time">{{
                 $dateTimeLocalized(
-                  $gameTime(),
+                  telemetry2.gameTime,
                   DATE_FORMAT_LONG,
                   TIME_FORMAT_SHORT
                 )
@@ -170,9 +165,7 @@
             <th>{{ $t('Deadline in') }}:</th>
             <td>
               <span class="job-remainingTime">{{
-                $jobRemainingTimeDelivery(
-                  telemetry.job.expectedDeliveryTimestamp.value
-                )
+                telemetry2.job.remainingDeliveryTime
               }}</span>
               <span class="_jobIncome">
                 (<span class="job-income">{{

diff --git a/src/components/dashboards/ManTGXDashboard.vue b/src/components/dashboards/ManTGXDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <Cadran
@@ -91,17 +91,12 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -131,7 +126,7 @@
         <!--				<div :class="{'yes': trailer.attached}" class="trailer-attached"></div>-->
         <div class="trailer-mass wrapper-area">
           <span
-            >{{ $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 0)
+            >{{ unit_weight(telemetry.job.cargo.mass, true, false).toFixed(0)
             }}<span class="ton">{{
               unit_weight(telemetry.job.cargo.mass, false)
             }}</span></span
@@ -157,7 +152,7 @@
         <div class="game-time wrapper-area">
           <span>{{
             $dateTimeLocalized(
-              $gameTime(),
+              telemetry2.gameTime,
               DATE_FORMAT_SHORT,
               TIME_FORMAT_SHORT
             )

diff --git a/src/components/dashboards/MercedesAtegoDashboard.vue b/src/components/dashboards/MercedesAtegoDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <Cadran
@@ -78,17 +78,12 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -141,7 +136,7 @@
         <div class="game-time wrapper-area">
           <span>{{
             $dateTimeLocalized(
-              $gameTime(),
+              telemetry2.gameTime,
               DATE_FORMAT_SHORT,
               TIME_FORMAT_SHORT
             )

diff --git a/src/components/dashboards/RdInfoDashboard.vue b/src/components/dashboards/RdInfoDashboard.vue
@@ -117,14 +117,11 @@
         </div>
         <div class="truck-fuelAverageConsumption">
           {{
-            $toFixed(
-              unit_consumption(
-                telemetry.truck.fuel.avgConsumption,
-                true,
-                false
-              ),
-              1
-            )
+            unit_consumption(
+              telemetry.truck.fuel.avgConsumption,
+              true,
+              false
+            ).toFixed(1)
           }}
         </div>
         <div class="_fuelAvg">
@@ -169,19 +166,14 @@
         />
         <div class="navigation-speedLimit">
           {{
-            $toFixed(
-              unit_speed(telemetry.navigation.speedLimit, true, false),
-              0
-            )
+            unit_speed(telemetry.navigation.speedLimit, true, false).toFixed(0)
           }}
         </div>
 
         <!--				<div class="truck-odometer wrapper-area"><span>{{ $toFixed(unit_length( telemetry.truck.odometer, 'km', true, false ),  0 ) }}</span></div>-->
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-displayedGear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <!--				<div :class="{ 'yes': telemetry.truck.lights.blinker.left.active}" class="truck-blinkerLeftOn"></div>-->

diff --git a/src/components/dashboards/TestDashboard.vue b/src/components/dashboards/TestDashboard.vue
@@ -2,7 +2,7 @@
   <Dashboard class="test wrapper">
     <div class="speed">
       <span class="value">{{
-        $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+        unit_speed(telemetry.truck.speed, true, false).toFixed(0)
       }}</span>
       <small class="unit">{{ unit_speed(telemetry.truck.speed, false) }}</small>
     </div>

diff --git a/src/components/dashboards/VolvoFHDashboard.vue b/src/components/dashboards/VolvoFHDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
+            unit_speed(telemetry.truck.speed, true, false).toFixed(0)
           }}</span>
         </div>
         <Cadran
@@ -74,17 +74,12 @@
         }"></Cadran>-->
         <div class="truck-odometer wrapper-area">
           <span>{{
-            $toFixed(
-              unit_length(telemetry.truck.odometer, 'km', true, false),
-              0
-            )
+            unit_length(telemetry.truck.odometer, 'km', true, false).toFixed(0)
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-gear wrapper-area">
-          <span>{{
-            $trukGear(telemetry.truck.transmission, telemetry.truck.brand)
-          }}</span>
+          <span>{{ telemetry2.truck.gearDisplayed }}</span>
         </div>
         <!-- indicators -->
         <div
@@ -117,7 +112,7 @@
         />
         <div class="trailer-mass wrapper-area">
           <span
-            >{{ $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 1)
+            >{{ unit_weight(telemetry.job.cargo.mass, true, false).toFixed(1)
             }}<span class="ton">{{
               unit_weight(telemetry.job.cargo.mass, false)
             }}</span></span
@@ -129,7 +124,7 @@
         <div class="game-time wrapper-area">
           <span>{{
             $dateTimeLocalized(
-              $gameTime(),
+              telemetry2.gameTime,
               DATE_FORMAT_SHORT,
               TIME_FORMAT_SHORT
             )

diff --git a/src/components/dashboards/jagfx/JagfxSymbolArea.vue b/src/components/dashboards/jagfx/JagfxSymbolArea.vue
@@ -4,7 +4,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_parkingBrake')"
       :class="{
-        red: $parent.telemetry.truck.brakes.parking.enabled,
+        red: $parent.telemetry2.symbols.parkingBrakeIsEnabled,
         left: sideLeft(),
         right: sideRight()
       }"
@@ -19,7 +19,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_retarder')"
       :class="{
-        green: $parent.telemetry.truck.brakes.retarder.level > 0,
+        green: $parent.telemetry2.symbols.retarderIsActive,
         left: sideLeft(),
         right: sideRight()
       }"
@@ -34,7 +34,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_beacon')"
       :class="{
-        green: $parent.telemetry.truck.lights.beacon.enabled,
+        green: $parent.telemetry2.symbols.beaconIsEnabled,
         left: sideLeft(),
         right: sideRight()
       }"
@@ -49,10 +49,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_beamHigh')"
       :class="{
-        blue:
-          $parent.telemetry.truck.lights.beamHigh.enabled &&
-          $parent.telemetry.truck.lights.beamLow.enabled &&
-          $parent.telemetry.truck.engine.enabled,
+        blue: $parent.telemetry2.symbols.mainBeamIsEnabled,
         left: sideLeft(),
         right: sideRight()
       }"
@@ -67,9 +64,7 @@
     <div
       v-if="elementIsEnabled('jagfx_elements_mid_top_beamLow')"
       :class="{
-        green:
-          $parent.telemetry.truck.lights.beamLow.enabled &&
-          $parent.telemetry.truck.engine.enabled,
+        green: $parent.telemetry2.symbols.lowBeamIsEnabled,
         left: sideLeft(),
         right: sideRight()
       }"