Add detailed trip maps and charge charts

Author: zijian-z

README.md

@@ -108,6 +108,23 @@ sudo docker compose up -d
 
 `WEB_PORT` 默认是 `80`。如果机器前面还有负载均衡或网关，建议让它直接转发到宿主机 `80`，不要额外发布 TeslaMate、API、PostgreSQL 或 MQTT 端口。
 
+### 3. 只更新 dashboard
+
+如果改动只涉及后端 API 或前端页面，不需要重建数据库、TeslaMate 或 MQTT。生产环境拉取新镜像后只重启 `api` 和 `web`：
+
+```bash
+sudo docker compose pull api web
+sudo docker compose up -d --no-deps api web
+```
+
+本地源码验证时同样可以只重建这两个服务：
+
+```bash
+sudo docker compose -f compose.local.yaml up -d --build --no-deps api web
+```
+
+只有修改了 `database` 镜像、恢复脚本、TeslaMate、MQTT 或需要重新导入备份时，才需要处理对应服务或数据库 volume。
+
 ## 导入备份
 
 把备份文件放在 `compose.yaml` 同级目录，数据库 volume 首次创建时会自动导入。优先识别这些文件名：

backend/app/main.py

@@ -636,13 +636,50 @@ def dashboard(
                  and c.efficiency is not null
                 then (((d.start_rated_range_km - d.end_rated_range_km) * c.efficiency) / d.distance * 100)::float8
                 else null
-            end as estimated_kwh_per_100km
+            end as estimated_kwh_per_100km,
+            coalesce(route.route_points, '[]'::jsonb) as route_points
         from public.drives d
         join public.cars c on c.id = d.car_id
         left join public.addresses sa on sa.id = d.start_address_id
         left join public.addresses ea on ea.id = d.end_address_id
         left join public.geofences sg on sg.id = d.start_geofence_id
         left join public.geofences eg on eg.id = d.end_geofence_id
+        left join lateral (
+            select jsonb_agg(
+                jsonb_build_object(
+                    'sampled_at', sampled.date,
+                    'latitude', sampled.latitude::float8,
+                    'longitude', sampled.longitude::float8,
+                    'speed', sampled.speed,
+                    'power', sampled.power,
+                    'battery_level', sampled.battery_level
+                )
+                order by sampled.date
+            ) as route_points
+            from (
+                select date, latitude, longitude, speed, power, battery_level
+                from (
+                    select
+                        p.date,
+                        p.latitude,
+                        p.longitude,
+                        p.speed,
+                        p.power,
+                        p.battery_level,
+                        (row_number() over (order by p.date))::int as rn,
+                        (count(*) over ())::int as total
+                    from public.positions p
+                    where p.drive_id = d.id
+                      and p.latitude is not null
+                      and p.longitude is not null
+                ) ranked
+                where total <= 160
+                   or rn = 1
+                   or rn = total
+                   or ((rn - 1) %% greatest(1, ceil(total / 160.0)::int)) = 0
+                order by date
+            ) sampled
+        ) route on true
         where d.car_id = %s
           and (%s::timestamp is null or d.start_date >= %s::timestamp)
           and d.start_date <= %s::timestamp
@@ -724,7 +761,8 @@ def dashboard(
             ch.latest_charge_at,
             ch.max_power_kw,
             ch.fast_charger,
-            ({active_charge_condition()})::bool as is_active
+            ({active_charge_condition()})::bool as is_active,
+            coalesce(charge_samples.samples, '[]'::jsonb) as samples
         from public.charging_processes cp
         left join public.addresses a on a.id = cp.address_id
         left join public.geofences g on g.id = cp.geofence_id
@@ -745,6 +783,47 @@ def dashboard(
             order by date desc
             limit 1
         ) latest on true
+        left join lateral (
+            select jsonb_agg(
+                jsonb_build_object(
+                    'sampled_at', sampled.date,
+                    'minute', extract(epoch from (sampled.date - cp.start_date)) / 60.0,
+                    'charger_power_kw', sampled.charger_power,
+                    'battery_level', sampled.battery_level,
+                    'charge_energy_added_kwh', sampled.charge_energy_added::float8,
+                    'charger_voltage', sampled.charger_voltage,
+                    'charger_actual_current', sampled.charger_actual_current
+                )
+                order by sampled.date
+            ) as samples
+            from (
+                select
+                    date,
+                    charger_power,
+                    battery_level,
+                    charge_energy_added,
+                    charger_voltage,
+                    charger_actual_current
+                from (
+                    select
+                        c.date,
+                        c.charger_power,
+                        c.battery_level,
+                        c.charge_energy_added,
+                        c.charger_voltage,
+                        c.charger_actual_current,
+                        (row_number() over (order by c.date))::int as rn,
+                        (count(*) over ())::int as total
+                    from public.charges c
+                    where c.charging_process_id = cp.id
+                ) ranked
+                where total <= 160
+                   or rn = 1
+                   or rn = total
+                   or ((rn - 1) %% greatest(1, ceil(total / 160.0)::int)) = 0
+                order by date
+            ) sampled
+        ) charge_samples on true
         left join lateral (
             select date as latest_seen_at
             from public.positions

frontend/package-lock.json

@@ -10,14 +10,17 @@
   },
   "dependencies": {
     "@vitejs/plugin-react": "^4.3.4",
+    "leaflet": "^1.9.4",
     "lucide-react": "^0.468.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-leaflet": "^4.2.1",
     "recharts": "^2.15.0",
     "typescript": "^5.7.2",
-    "vite": "^6.0.7",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "vite": "^6.0.7"
   },
   "devDependencies": {
+    "@types/leaflet": "^1.9.21",
     "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.5"
   }