@bytebrand/export-cars 1.26.26 → 1.26.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.26.26",
+  "version": "1.26.27",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",

package/src/transformers/google-feed-envkv.ts

@@ -72,9 +72,15 @@ const isConfirmedPlugIn = (car: DataSchemes.Car): boolean => isPlugIn(car) && !!
 // (CBD mirrors kWh into consumptionCombined for them).
 export function googleFuelConsumption(car: DataSchemes.Car): string | undefined {
   if (isBev(car)) return undefined;
-  const value = isConfirmedPlugIn(car)
-    ? positive(get(car, 'consumption.wltpWeightedCombined')) ?? positive(get(car, 'consumption.consumptionCombined'))
-    : positive(get(car, 'consumption.consumptionCombined'));
+  let value: number | undefined;
+  if (isConfirmedPlugIn(car)) {
+    value = positive(get(car, 'consumption.wltpWeightedCombined')) ?? positive(get(car, 'consumption.consumptionCombined'));
+  } else if (isPlugIn(car)) {
+    value = positive(get(car, 'consumption.consumptionCombined')); // unconfirmed plug-in: as before
+  } else {
+    // ICE / HEV: the WLTP combined value the VDP and EnVKV use (EnVKV stage D3), the legacy field as fallback
+    value = positive(get(car, 'consumption.wltpCombined')) ?? positive(get(car, 'consumption.consumptionCombined'));
+  }
   return value ? `${value}l/100km` : undefined;
 }
 
@@ -105,8 +111,10 @@ export function googleEnergyConsumption(car: DataSchemes.Car): string | undefine
 // the stored value. A missing or 0 value is omitted.
 export function googleCo2(car: DataSchemes.Car): string | undefined {
   if (isBev(car)) return '0g/km';
-  const value = isConfirmedPlugIn(car)
-    ? positive(get(car, 'environmentEmissions.wltpCo2')) ?? positive(get(car, 'environmentEmissions.co2'))
-    : positive(get(car, 'environmentEmissions.co2'));
+  // a confirmed plug-in and ICE / HEV send the WLTP value (weighted for the plug-in); an unconfirmed
+  // plug-in keeps the stored legacy value, as before
+  const value = isPlugIn(car) && !isConfirmedPlugIn(car)
+    ? positive(get(car, 'environmentEmissions.co2'))
+    : positive(get(car, 'environmentEmissions.wltpCo2')) ?? positive(get(car, 'environmentEmissions.co2'));
   return value ? `${value}g/km` : undefined;
 }

package/test/google-feed-envkv.test.ts

@@ -87,15 +87,20 @@ const cases: Array<[string, () => void]> = [
     assert.equal(googleEnergyConsumption(phev), undefined);
     assert.equal(googleCo2(phev), '32g/km');
   }],
-  ['non-plug-in hybrids and combustion cars keep the stored values and send no electricity', () => {
+  ['non-plug-in hybrids and combustion cars send the WLTP values (legacy as fallback) and no electricity', () => {
     const hev = car('selector_fuel_hybridElectricalPetrol', {
       consumption: { consumptionCombined: 5.1, wltpCombined: 5.3, wltpWeightedCombined: 2.3, wltpWeightedPowerCombined: 21.5 },
       environmentEmissions: { co2: 116, wltpCo2: 119 },
     });
-    assert.equal(googleFuelConsumption(hev), '5.1l/100km');
+    assert.equal(googleFuelConsumption(hev), '5.3l/100km');
     assert.equal(googleFuelConsumptionDischarged(hev), undefined);
     assert.equal(googleEnergyConsumption(hev), undefined);
-    assert.equal(googleCo2(hev), '116g/km');
+    assert.equal(googleCo2(hev), '119g/km');
+    // D3: Mercedes GLC 200 sent 146.7 g (legacy) while CBD / VDP / EnVKV hold the dealer's WLTP 138 g
+    const glc = car('selector_fuel_diesel', { consumption: { consumptionCombined: 5.6, wltpCombined: 5.2 }, environmentEmissions: { co2: 146.7, wltpCo2: 138 } });
+    assert.equal(googleCo2(glc), '138g/km');
+    assert.equal(googleFuelConsumption(glc), '5.2l/100km');
+    assert.equal(googleCo2(car('selector_fuel_diesel', { environmentEmissions: { co2: 150 } })), '150g/km');
   }],
   ['a plug-in flag without an electric range keeps the stored values (ADV-124 flags every hybrid)', () => {
     const flagged = car('selector_fuel_hybridElectricalPetrol', {