feat(ev-charging): readable source names and payment methods in detail

Resolve source ids to their manifest display names via the existing
createManifestAttribution store (e.g. "ocm" -> "OpenChargeMap") instead of
showing raw ids, and render payment methods as deduped, brand-cased text
("mastercard, visa" -> "Mastercard, Visa"). The mapper takes an optional
source-name resolver so it stays standalone; the provider supplies the
manifest-backed one.

Author: Medformatik

integrations/ev-charging/providers/__tests__/provider.test.ts

@@ -199,7 +199,7 @@ describe("evChargingProvider.getDetail", () => {
     expect(mocks.sourceA.fetchDetail).toHaveBeenCalledWith("source-a:123");
     expect(mocks.sourceA.search).toHaveBeenCalledOnce();
     expect(mocks.sourceB.search).toHaveBeenCalledOnce();
-    expect(mapStationToDetail).toHaveBeenCalledWith(merged);
+    expect(mapStationToDetail).toHaveBeenCalledWith(merged, expect.any(Function));
     expect(result?.sources).toEqual(["source-a", "source-b"]);
   });
 

integrations/ev-charging/providers/__tests__/station-mapper.test.ts

@@ -95,4 +95,32 @@ describe("ev-charging station mapper", () => {
       values: { count: 2, types: "CCS", power: 50 },
     });
   });
+
+  it("resolves source ids to display names via the provided resolver", () => {
+    const names: Record<string, string> = { ocm: "OpenChargeMap", osm: "OpenStreetMap" };
+    const detail = mapStationToDetail(
+      makeStation({ sources: ["ocm", "osm"] }),
+      (id) => names[id] ?? id,
+    );
+    const sourceSection = detail.sections.find(
+      (s) => isI18nToken(s.title) && s.title.$t === "shared.section.source",
+    );
+    const sourcesRow = sourceSection?.rows?.find(
+      ([label]) => isI18nToken(label) && label.$t === "shared.row.sources",
+    );
+    expect(sourcesRow?.[1]).toBe("OpenChargeMap, OpenStreetMap");
+  });
+
+  it("renders payment methods as readable, brand-cased, deduped text", () => {
+    const detail = mapStationToDetail(
+      makeStation({ paymentMethods: ["mastercard", "visa", "apple_pay", "mastercard"] }),
+    );
+    const usageSection = detail.sections.find(
+      (s) => isI18nToken(s.title) && s.title.$t === "section.usage",
+    );
+    const paymentRow = usageSection?.rows?.find(
+      ([label]) => isI18nToken(label) && label.$t === "row.payment",
+    );
+    expect(paymentRow?.[1]).toBe("Mastercard, Visa, Apple Pay");
+  });
 });

integrations/ev-charging/providers/provider.ts

@@ -25,6 +25,10 @@ import { mapStationToDetail, mapStationToResult } from "./station-mapper.js";
 const attribution = createManifestAttribution();
 export const setManifestDataSources = attribution.set;
 
+// Resolve a source id to its human-readable name from the manifest's
+// dataSources (e.g. "ocm" → "OpenChargeMap"), falling back to the raw id.
+const resolveSourceName = (id: string): string => attribution.bySource(id)?.name ?? id;
+
 // PoiReader-backed sources whose cold-start state should flip
 // `freshness.isStale=true` on the wrapped result. Hardcoded (rather than
 // derived from `declarePoiSources()`) to avoid a circular import with
@@ -113,14 +117,21 @@ class EvChargingProvider implements MobilityDataSourceProvider {
 
   async getDetail(itemId: string): Promise<MobilityResult<DataSourceDetail | null>> {
     const cached = this.stationCache.get(itemId);
-    if (cached) return wrapStatic(mapStationToDetail(cached), attributionsForStation(cached));
+    if (cached)
+      return wrapStatic(
+        mapStationToDetail(cached, resolveSourceName),
+        attributionsForStation(cached),
+      );
 
     const primary = await this.fetchByPrefix(itemId);
     if (!primary) return wrapStatic(null, []);
 
     const enriched = await this.enrichStation(primary);
     this.cacheStation(enriched);
-    return wrapStatic(mapStationToDetail(enriched), attributionsForStation(enriched));
+    return wrapStatic(
+      mapStationToDetail(enriched, resolveSourceName),
+      attributionsForStation(enriched),
+    );
   }
 
   private async fetchByPrefix(itemId: string): Promise<EvChargingStation | null> {

integrations/ev-charging/providers/station-mapper.ts

@@ -96,6 +96,33 @@ function formatPower(value: number | undefined): string {
   return value ? `${value} kW` : "-";
 }
 
+// Brand spellings that title-casing alone gets wrong.
+const PAYMENT_BRAND_CASING: Record<string, string> = {
+  paypal: "PayPal",
+  applepay: "Apple Pay",
+  "apple pay": "Apple Pay",
+  googlepay: "Google Pay",
+  "google pay": "Google Pay",
+  nfc: "NFC",
+};
+
+// Payment methods arrive as lowercase tokens (from OSM `payment:*` tags or
+// provider feeds), e.g. "mastercard", "debit cards", "apple_pay". Render them
+// as readable text: brand-cased where known, otherwise title-cased per word.
+function formatPaymentMethods(methods: string[]): string {
+  const seen = new Set<string>();
+  const formatted: string[] = [];
+  for (const raw of methods) {
+    const normalized = raw.trim().toLowerCase().replace(/_/g, " ");
+    if (!normalized || seen.has(normalized)) continue;
+    seen.add(normalized);
+    formatted.push(
+      PAYMENT_BRAND_CASING[normalized] ?? normalized.replace(/\b\w/g, (char) => char.toUpperCase()),
+    );
+  }
+  return formatted.join(", ");
+}
+
 function formatTimestamp(value: string | undefined): string | undefined {
   if (!value) return undefined;
   const time = Date.parse(value);
@@ -120,7 +147,12 @@ function connectorRows(
     ]);
 }
 
-export function mapStationToDetail(station: EvChargingStation): DataSourceDetail {
+export function mapStationToDetail(
+  station: EvChargingStation,
+  // Resolve a source id to its display name (from the integration manifest's
+  // dataSources). Defaults to the id itself so the mapper stays standalone.
+  resolveSourceName: (id: string) => string = (id) => id,
+): DataSourceDetail {
   const sections: DataSourceDetailSection[] = [];
 
   if (station.connectors.length > 0) {
@@ -143,7 +175,7 @@ export function mapStationToDetail(station: EvChargingStation): DataSourceDetail
   if (station.usageType) usageRows.push([sharedT.row.access, station.usageType]);
   if (station.usageCost) usageRows.push([token("row.cost"), station.usageCost]);
   if (station.paymentMethods?.length) {
-    usageRows.push([token("row.payment"), station.paymentMethods.join(", ")]);
+    usageRows.push([token("row.payment"), formatPaymentMethods(station.paymentMethods)]);
   }
   if (station.membershipRequired !== undefined) {
     usageRows.push([
@@ -180,7 +212,7 @@ export function mapStationToDetail(station: EvChargingStation): DataSourceDetail
   }
 
   const sourceRows: [I18nToken, Translatable][] = [];
-  sourceRows.push([sharedT.row.sources, station.sources.join(", ")]);
+  sourceRows.push([sharedT.row.sources, station.sources.map(resolveSourceName).join(", ")]);
   const updated = formatTimestamp(station.updatedAt);
   if (updated) sourceRows.push([sharedT.row.lastUpdated, updated]);
   if (station.sourceUrl) sourceRows.push([sharedT.row.sourceUrl, station.sourceUrl]);