@bytebrand/export-cars 1.26.22 → 1.26.24

package/package.json

@@ -1,63 +1,63 @@
-{
-  "name": "@bytebrand/export-cars",
-  "version": "1.26.22",
-  "description": "",
-  "author": "bytebrand",
-  "license": "UNLICENSED",
-  "scripts": {
-    "prebuild": "rimraf dist",
-    "build": "nest build",
-    "prepublishOnly": "npm run build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "lint": "eslint -c .eslintrc.js --ext .ts src/",
-    "start:dev": "nest start --watch",
-    "test": "ts-node --transpile-only test/google-feed-envkv.test.ts"
-  },
-  "dependencies": {
-    "@bytebrand/autode-request": "^1.19.2",
-    "@bytebrand/car-basic-data-scope": "^9.11.24",
-    "@bytebrand/car-description": "^1.17.20",
-    "@bytebrand/car-schema": "^3.14.15",
-    "@bytebrand/chunkable": "^5.19.8",
-    "@bytebrand/cronicle-helper": "^1.21.8",
-    "@bytebrand/fe-financing": "^5.14.19",
-    "@bytebrand/i18n-dictionaries": "^1.5.0",
-    "@bytebrand/import-helper": "^0.45.0",
-    "@bytebrand/schema-tools": "^3.18.8",
-    "@bytebrand/zipper": "^2.2.0",
-    "@nestjs/cache-manager": "^2.1.0",
-    "@nestjs/common": "^10.2.7",
-    "@nestjs/core": "^10.2.7",
-    "axios": "^1.5.1",
-    "bottleneck": "^2.19.5",
-    "cache-manager": "^5.2.4",
-    "csv-write-stream": "^2.0.0",
-    "google-spreadsheet": "^3.3.0",
-    "lodash": "^4.17.21",
-    "moment": "^2.29.4",
-    "nest-commander": "~3.15.0",
-    "reflect-metadata": "^0.1.13",
-    "vin-generator": "^1.0.1"
-  },
-  "devDependencies": {
-    "@nestjs/cli": "^10.1.18",
-    "@types/google-spreadsheet": "^3.3.0",
-    "@types/inquirer": "^8.2.4",
-    "@types/lodash": "^4.14.186",
-    "@types/node": "^16.18.58",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
-    "eslint": "^8.0.1",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "gts": "^3.1.1",
-    "prettier": "^2.3.2",
-    "ts-node": "^10.0.0",
-    "tsconfig-paths": "4.1.0",
-    "typescript": "^5.2.2"
-  },
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "gitHead": "e827f35865032821bf3a081f03a026d3d3f8a540"
-}
+{
+  "name": "@bytebrand/export-cars",
+  "version": "1.26.24",
+  "description": "",
+  "author": "bytebrand",
+  "license": "UNLICENSED",
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "nest build",
+    "prepublishOnly": "npm run build",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "lint": "eslint -c .eslintrc.js --ext .ts src/",
+    "start:dev": "nest start --watch",
+    "test": "ts-node --transpile-only test/google-feed-envkv.test.ts"
+  },
+  "dependencies": {
+    "@bytebrand/autode-request": "^1.19.2",
+    "@bytebrand/car-basic-data-scope": "^9.11.24",
+    "@bytebrand/car-description": "^1.17.20",
+    "@bytebrand/car-schema": "^3.14.15",
+    "@bytebrand/chunkable": "^5.19.8",
+    "@bytebrand/cronicle-helper": "^1.21.8",
+    "@bytebrand/fe-financing": "^5.14.19",
+    "@bytebrand/i18n-dictionaries": "^1.5.0",
+    "@bytebrand/import-helper": "^0.45.0",
+    "@bytebrand/schema-tools": "^3.18.8",
+    "@bytebrand/zipper": "^2.2.0",
+    "@nestjs/cache-manager": "^2.1.0",
+    "@nestjs/common": "^10.2.7",
+    "@nestjs/core": "^10.2.7",
+    "axios": "^1.5.1",
+    "bottleneck": "^2.19.5",
+    "cache-manager": "^5.2.4",
+    "csv-write-stream": "^2.0.0",
+    "google-spreadsheet": "^3.3.0",
+    "lodash": "^4.17.21",
+    "moment": "^2.29.4",
+    "nest-commander": "~3.15.0",
+    "reflect-metadata": "^0.1.13",
+    "vin-generator": "^1.0.1"
+  },
+  "devDependencies": {
+    "@nestjs/cli": "^10.1.18",
+    "@types/google-spreadsheet": "^3.3.0",
+    "@types/inquirer": "^8.2.4",
+    "@types/lodash": "^4.14.186",
+    "@types/node": "^16.18.58",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
+    "eslint": "^8.0.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "gts": "^3.1.1",
+    "prettier": "^2.3.2",
+    "ts-node": "^10.0.0",
+    "tsconfig-paths": "4.1.0",
+    "typescript": "^5.2.2"
+  },
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "gitHead": "e827f35865032821bf3a081f03a026d3d3f8a540"
+}

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

@@ -47,17 +47,46 @@ export function googleElectricRange(car: DataSchemes.Car): string | undefined {
   return range ? `${range}km` : undefined;
 }
 
+// Plug-in hybrids: Google and Pkw-EnVKV (CoC 49.4) want the WEIGHTED combined values for fuel,
+// 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.
+
 // 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 = positive(get(car, 'consumption.consumptionCombined'));
+  const value = isPlugIn(car)
+    ? positive(get(car, 'consumption.wltpWeightedCombined')) ?? positive(get(car, 'consumption.consumptionCombined'))
+    : positive(get(car, 'consumption.consumptionCombined'));
   return value ? `${value}l/100km` : undefined;
 }
 
-// A BEV emits 0 g/km by definition; for every other car a missing or 0 value is omitted.
+// 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.
+export function googleFuelConsumptionDischarged(car: DataSchemes.Car): string | undefined {
+  if (!isPlugIn(car)) return undefined;
+  const value = positive(get(car, 'consumption.wltpCombined'));
+  return value ? `${value}l/100km` : undefined;
+}
+
+// BEV: combined consumption. Plug-in: weighted combined. 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)) {
+    value = positive(get(car, 'consumption.wltpWeightedPowerCombined'));
+  }
+  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.
 export function googleCo2(car: DataSchemes.Car): string | undefined {
   if (isBev(car)) return '0g/km';
-  const value = positive(get(car, 'environmentEmissions.co2'));
+  const value = isPlugIn(car)
+    ? positive(get(car, 'environmentEmissions.wltpCo2')) ?? positive(get(car, 'environmentEmissions.co2'))
+    : positive(get(car, 'environmentEmissions.co2'));
   return value ? `${value}g/km` : undefined;
 }

package/src/transformers/google.transformer.ts

@@ -8,7 +8,14 @@ import { Injectable } from '@nestjs/common';
 import { ConfigService, ImagesService, MappingService, TransformerService, UserService } from '../services';
 import { GoogleXmlItem } from '../interfaces';
 import { isValidVin } from '../utils';
-import { googleCo2, googleElectricRange, googleEngine, googleFuelConsumption } from './google-feed-envkv';
+import {
+  googleCo2,
+  googleElectricRange,
+  googleEnergyConsumption,
+  googleEngine,
+  googleFuelConsumption,
+  googleFuelConsumptionDischarged,
+} from './google-feed-envkv';
 import {
   META_PUSH_PRIORITY_ALLOWED_VALUES,
   META_PUSH_PRIORITY_STANDARD,
@@ -93,9 +100,9 @@ export class GoogleTransformer {
       capacity: this.getCapacity(car),
       date_first_registered: this.getDateFirstRegistered(car),
       fuel_consumption: googleFuelConsumption(car),
-      energy_consumption: this.getEnergyConsumption(car),
+      energy_consumption: googleEnergyConsumption(car),
       electric_range: googleElectricRange(car),
-      fuel_consumption_discharged_battery: this.getFuelConsumptionDischargedBattery(car),
+      fuel_consumption_discharged_battery: googleFuelConsumptionDischarged(car),
       co2_emissions: googleCo2(car),
       description: this.processText((await this.getDescription(car))),
       identifier_exists: 'yes',
@@ -332,26 +339,8 @@ export class GoogleTransformer {
     return certifications.length ? certifications : undefined;
   }
 
-  private getEnergyConsumption(car: DataSchemes.Car): string | undefined {
-    const fuel = get(car, 'consumption.fuel');
-    const isElectricOrHybrid =
-      ['selector_fuel_electrical', 'selector_fuel_hybridElectricalPetrol', 'selector_fuel_hybridElectricalDiesel'].includes(fuel) ||
-      !!get(car, 'engineData.hybridPlugin');
-    if (!isElectricOrHybrid) {
-      return undefined;
-    }
-    const power = get(car, 'consumption.wltpPowerCombined') || get(car, 'consumption.consumptionPowerCombined');
-    return power ? `${power}kWh/100km` : undefined;
-  }
 
 
-  private getFuelConsumptionDischargedBattery(car: DataSchemes.Car): string | undefined {
-    if (!get(car, 'engineData.hybridPlugin')) {
-      return undefined;
-    }
-    const consumption = get(car, 'consumption.consumptionCombined') || get(car, 'consumption.wltpCombined');
-    return consumption ? `${consumption}l/100km` : undefined;
-  }
 
   private getInstallment(car: DataSchemes.Car) {
     const monthlyInstallment = round(get(car, 'rate.monthlyInstallment', null));

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

@@ -1,6 +1,13 @@
 // Run: npm test (ts-node, no test framework needed)
 import * as assert from 'node:assert/strict';
-import { googleCo2, googleElectricRange, googleEngine, googleFuelConsumption } from '../src/transformers/google-feed-envkv';
+import {
+  googleCo2,
+  googleElectricRange,
+  googleEnergyConsumption,
+  googleEngine,
+  googleFuelConsumption,
+  googleFuelConsumptionDischarged,
+} from '../src/transformers/google-feed-envkv';
 
 const car = (fuel: string, extra: Record<string, unknown> = {}): any => ({
   consumption: { fuel, ...(extra.consumption as object) },
@@ -56,6 +63,42 @@ const cases: Array<[string, () => void]> = [
     assert.equal(googleCo2(car('selector_fuel_petrol', { environmentEmissions: { co2: 0 } })), undefined);
     assert.equal(googleCo2(car('selector_fuel_petrol', { environmentEmissions: { co2: 144 } })), '144g/km');
   }],
+  ['plug-in: weighted fuel, discharged fuel, weighted electricity and weighted CO2', () => {
+    const phev = car('selector_fuel_hybridElectricalPetrol', {
+      hybridPlugin: true,
+      consumption: { consumptionCombined: 1.4, wltpCombined: 6.3, wltpWeightedCombined: 1.2, wltpPowerCombined: 19.3, wltpWeightedPowerCombined: 17.3 },
+      environmentEmissions: { co2: 121, wltpCo2: 28 },
+    });
+    assert.equal(googleFuelConsumption(phev), '1.2l/100km');
+    assert.equal(googleFuelConsumptionDischarged(phev), '6.3l/100km');
+    assert.equal(googleEnergyConsumption(phev), '17.3kWh/100km');
+    assert.equal(googleCo2(phev), '28g/km');
+  }],
+  ['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,
+      consumption: { consumptionCombined: 1.4, wltpPowerCombined: 19.3 },
+      environmentEmissions: { co2: 32 },
+    });
+    assert.equal(googleFuelConsumption(phev), '1.4l/100km');
+    assert.equal(googleFuelConsumptionDischarged(phev), undefined);
+    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', () => {
+    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(googleFuelConsumptionDischarged(hev), undefined);
+    assert.equal(googleEnergyConsumption(hev), undefined);
+    assert.equal(googleCo2(hev), '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');
+  }],
 ];
 
 let failed = 0;