@bytebrand/export-cars 1.26.24 → 1.26.25

package/package.json

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

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

@@ -51,41 +51,51 @@ export function googleElectricRange(car: DataSchemes.Car): string | undefined {
 // electricity and CO2, and the fuel consumption with a DISCHARGED battery separately. In CBD those
 // are wltpWeightedCombined, wltpWeightedPowerCombined, wltpCo2 (weighted for a plug-in) and
 // wltpCombined (discharged for a plug-in); the legacy consumptionCombined / co2 are only a fallback.
+//
+// engineData.hybridPlugin alone does not prove a plug-in: since ADV-124 every hybrid carries it, and
+// the weighted fields of hybrids without an electric range are enrichment-sheet templates
+// (prod 07.10: 4,178 of 5,576 flagged cars, e.g. 2.3 l + 21.5 kWh + 195 g). Only a hybrid with an
+// electric range counts as a confirmed plug-in; the others keep the values sent before.
+const isConfirmedPlugIn = (car: DataSchemes.Car): boolean => isPlugIn(car) && !!googleElectricRange(car);
 
 // Missing or 0 is omitted instead of sending "0l/100km". BEVs carry no fuel consumption
 // (CBD mirrors kWh into consumptionCombined for them).
 export function googleFuelConsumption(car: DataSchemes.Car): string | undefined {
   if (isBev(car)) return undefined;
-  const value = isPlugIn(car)
+  const value = isConfirmedPlugIn(car)
     ? positive(get(car, 'consumption.wltpWeightedCombined')) ?? positive(get(car, 'consumption.consumptionCombined'))
     : positive(get(car, 'consumption.consumptionCombined'));
   return value ? `${value}l/100km` : undefined;
 }
 
-// Plug-in only. No fallback: the legacy combined value is (close to) the weighted one, sending it
-// here would repeat the weighted figure as the discharged one.
+// Confirmed plug-in: wltpCombined, no fallback (the legacy combined value is close to the weighted
+// one, sending it here would repeat the weighted figure). Unconfirmed plug-in: the stored combined
+// value, as before.
 export function googleFuelConsumptionDischarged(car: DataSchemes.Car): string | undefined {
   if (!isPlugIn(car)) return undefined;
-  const value = positive(get(car, 'consumption.wltpCombined'));
+  const value = isConfirmedPlugIn(car)
+    ? positive(get(car, 'consumption.wltpCombined'))
+    : positive(get(car, 'consumption.consumptionCombined')) ?? positive(get(car, 'consumption.wltpCombined'));
   return value ? `${value}l/100km` : undefined;
 }
 
-// BEV: combined consumption. Plug-in: weighted combined. Nothing for other cars.
+// BEV: combined consumption. Confirmed plug-in: weighted combined. Unconfirmed plug-in: the stored
+// electric value, as before. Nothing for other cars.
 export function googleEnergyConsumption(car: DataSchemes.Car): string | undefined {
   let value: number | undefined;
-  if (isBev(car)) {
-    value = positive(get(car, 'consumption.wltpPowerCombined')) ?? positive(get(car, 'consumption.consumptionPowerCombined'));
-  } else if (isPlugIn(car)) {
+  if (isConfirmedPlugIn(car)) {
     value = positive(get(car, 'consumption.wltpWeightedPowerCombined'));
+  } else if (isBev(car) || isPlugIn(car)) {
+    value = positive(get(car, 'consumption.wltpPowerCombined')) ?? positive(get(car, 'consumption.consumptionPowerCombined'));
   }
   return value ? `${value}kWh/100km` : undefined;
 }
 
-// A BEV emits 0 g/km by definition; a plug-in sends the weighted WLTP CO2; for every other car the
-// stored value. A missing or 0 value is omitted.
+// A BEV emits 0 g/km by definition; a confirmed plug-in sends the weighted WLTP CO2; every other car
+// 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 = isPlugIn(car)
+  const value = isConfirmedPlugIn(car)
     ? positive(get(car, 'environmentEmissions.wltpCo2')) ?? positive(get(car, 'environmentEmissions.co2'))
     : positive(get(car, 'environmentEmissions.co2'));
   return value ? `${value}g/km` : undefined;

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

@@ -66,6 +66,7 @@ const cases: Array<[string, () => void]> = [
   ['plug-in: weighted fuel, discharged fuel, weighted electricity and weighted CO2', () => {
     const phev = car('selector_fuel_hybridElectricalPetrol', {
       hybridPlugin: true,
+      battery: { wltpTotalRange: 62 },
       consumption: { consumptionCombined: 1.4, wltpCombined: 6.3, wltpWeightedCombined: 1.2, wltpPowerCombined: 19.3, wltpWeightedPowerCombined: 17.3 },
       environmentEmissions: { co2: 121, wltpCo2: 28 },
     });
@@ -77,6 +78,7 @@ const cases: Array<[string, () => void]> = [
   ['plug-in without weighted values falls back to the legacy combined ones, never the pure-electric value', () => {
     const phev = car('selector_fuel_hybridElectricalPetrol', {
       hybridPlugin: true,
+      battery: { wltpRange: 59 },
       consumption: { consumptionCombined: 1.4, wltpPowerCombined: 19.3 },
       environmentEmissions: { co2: 32 },
     });
@@ -95,6 +97,17 @@ const cases: Array<[string, () => void]> = [
     assert.equal(googleEnergyConsumption(hev), undefined);
     assert.equal(googleCo2(hev), '116g/km');
   }],
+  ['a plug-in flag without an electric range keeps the stored values (ADV-124 flags every hybrid)', () => {
+    const flagged = car('selector_fuel_hybridElectricalPetrol', {
+      hybridPlugin: true,
+      consumption: { consumptionCombined: 5.1, wltpCombined: 5.3, wltpWeightedCombined: 2.3, wltpPowerCombined: 21.5, wltpWeightedPowerCombined: 21.5 },
+      environmentEmissions: { co2: 116, wltpCo2: 116, wltpCo2Discharged: 195 },
+    });
+    assert.equal(googleFuelConsumption(flagged), '5.1l/100km');
+    assert.equal(googleFuelConsumptionDischarged(flagged), '5.1l/100km');
+    assert.equal(googleEnergyConsumption(flagged), '21.5kWh/100km');
+    assert.equal(googleCo2(flagged), '116g/km');
+  }],
   ['BEV energy consumption is the combined value', () => {
     assert.equal(googleEnergyConsumption(car('selector_fuel_electrical', { consumption: { wltpPowerCombined: 16.5 } })), '16.5kWh/100km');
     assert.equal(googleEnergyConsumption(car('selector_fuel_electrical', { consumption: { consumptionPowerCombined: 18 } })), '18kWh/100km');