Merge pull request #249 from RivianTrackr/claude/update-rivian-roamer-schema-iAP9F

Fix vehicle_breakdown parsing — feed uses array-of-arrays format

Author: RivianTrackr

admin/views/tire-edit.php

@@ -409,7 +409,12 @@
                                 <div style="margin-top:10px;">
                                     <span style="font-size:12px;font-weight:600;color:#86868b;text-transform:uppercase;">Vehicle Breakdown</span>
                                     <div style="display:flex;gap:12px;flex-wrap:wrap;margin-top:4px;">
-                                        <?php foreach ( $r_bd as $drivetrain => $count ) : ?>
+                                        <?php foreach ( $r_bd as $entry ) :
+                                            // Feed format: array of [name, count] pairs.
+                                            if ( ! is_array( $entry ) || count( $entry ) < 2 ) continue;
+                                            $drivetrain = $entry[0];
+                                            $count      = $entry[1];
+                                        ?>
                                             <span style="font-size:13px;padding:2px 8px;background:rgba(59,130,246,0.1);border-radius:4px;color:#3b82f6;">
                                                 <?php echo esc_html( $drivetrain ); ?>: <?php echo intval( $count ); ?>
                                             </span>

frontend/js/modules/cards.js

@@ -428,12 +428,13 @@ export function createSingleCard(row) {
           extraParts.push(veh.toLocaleString() + ' vehicle' + (veh !== 1 ? 's' : ''));
         }
         // Show vehicle breakdown by drivetrain if available.
+        // Feed format is array of [name, count] pairs, e.g. [["Gen 1 R1T Dual",1],["Gen 2 R1T Tri",3]]
         if (roamerVehicleBreakdown) {
           try {
             const bd = typeof roamerVehicleBreakdown === 'string' ? JSON.parse(roamerVehicleBreakdown) : roamerVehicleBreakdown;
-            if (bd && typeof bd === 'object' && Object.keys(bd).length > 0) {
-              const bdParts = Object.entries(bd).map(([name, count]) => count + ' ' + name);
-              extraParts.push(bdParts.join(', '));
+            if (Array.isArray(bd) && bd.length > 0) {
+              const bdParts = bd.map(entry => Array.isArray(entry) ? entry[1] + ' ' + entry[0] : '');
+              extraParts.push(bdParts.filter(Boolean).join(', '));
             }
           } catch (e) { /* ignore parse errors */ }
         }

frontend/js/rivian-tires.min.js

@@ -1053,11 +1053,13 @@ public function roamer_assign() {
                     $total_km_all   += $km;
                     $total_vehicles += intval( $roamer_map[ $rid ]['vehicle_count'] ?? 0 );
 
-                    // Merge vehicle breakdowns.
+                    // Merge vehicle breakdowns (feed format: array of [name, count] pairs).
                     $bd = json_decode( $roamer_map[ $rid ]['vehicle_breakdown'] ?? '', true );
                     if ( is_array( $bd ) ) {
-                        foreach ( $bd as $key => $count ) {
-                            $merged_breakdown[ $key ] = ( $merged_breakdown[ $key ] ?? 0 ) + intval( $count );
+                        foreach ( $bd as $entry ) {
+                            if ( is_array( $entry ) && count( $entry ) >= 2 ) {
+                                $merged_breakdown[ $entry[0] ] = ( $merged_breakdown[ $entry[0] ] ?? 0 ) + intval( $entry[1] );
+                            }
                         }
                     }
                 }
@@ -1071,7 +1073,7 @@ public function roamer_assign() {
                 'roamer_efficiency'         => round( $avg_eff, 2 ),
                 'roamer_total_km'           => $total_km_all,
                 'roamer_vehicle_count'      => $total_vehicles,
-                'roamer_vehicle_breakdown'  => ! empty( $merged_breakdown ) ? wp_json_encode( $merged_breakdown ) : '',
+                'roamer_vehicle_breakdown'  => ! empty( $merged_breakdown ) ? wp_json_encode( array_map( function ( $name, $count ) { return array( $name, $count ); }, array_keys( $merged_breakdown ), $merged_breakdown ) ) : '',
                 'roamer_synced_at'          => current_time( 'mysql' ),
             ) );
         }