@mxpicture/tesla-superchargers-mate 0.1.59 → 0.1.60

package/db/schema.sql

@@ -18,8 +18,6 @@ CREATE TYPE public.pic_ref_type AS ENUM ('drive', 'charge', 'idle');
 --
 
 
--- Dumped from database version 18.4 (Debian 18.4-1.pgdg13+1)
--- Dumped by pg_dump version 18.4
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -1004,10 +1002,19 @@ DECLARE
   -- pic_energy_ledger_v's cfg used the same constant for a car that had never
   -- charged.
   _base_price CONSTANT NUMERIC := 0.40;
-  -- Rated range REBOUNDS after a drive (observed: +16.72 km within 1.3 min).
-  -- An idle gain below this is that artefact; a gain above it is energy that
-  -- really arrived and TeslaMate never logged. Same threshold the retired
-  -- pic_energy_ledger_v used for its rebound_km.
+  -- Rated range rebounds a little after a drive. An idle gain below this is
+  -- that artefact; a gain above it is energy that really arrived and TeslaMate
+  -- never logged. Same threshold the retired pic_energy_ledger_v used for its
+  -- rebound_km.
+  --
+  -- The +16.72 km within 1.3 min this constant was once justified by was NOT a
+  -- rebound: it was cp 18's pre-charge gap, which pic_refs_prep_v now adopts
+  -- into the charge, and measuring the rest of production put the true
+  -- post-drive rebound at 1.29 km or less. So the threshold is uncalibrated
+  -- between roughly 1.3 km and 20 km -- production holds no observation in
+  -- that band. It still earns its keep at the top of the range, where it
+  -- catches the 218.76 km home session TeslaMate slept through, and lowering
+  -- it would only start guessing in the empty middle.
   _rebound_km CONSTANT NUMERIC := 20.0;
 BEGIN
   -- Same lock as pic_build_refs_car: this procedure rewrites cost and
@@ -1624,8 +1631,6 @@ $function$
 --
 
 
--- Dumped from database version 18.4 (Debian 18.4-1.pgdg13+1)
--- Dumped by pg_dump version 18.4
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -2547,29 +2552,38 @@ CREATE VIEW public.pic_refs_prep_v AS
             chain.next_id,
             chain.end_date,
             chain.end_range_km,
-            chain.sec_to_next
+            chain.sec_to_next,
+            ((chain.next_type = 'charge'::public.pic_ref_type) AND (chain.end_range_km > chain.start_range_km) AND (chain.sec_to_next <= (600)::numeric)) AS adopted
            FROM chain
-          WHERE (chain.sec_to_next > (60)::numeric)
+          WHERE (chain.sec_to_next > (0)::numeric)
+        ), adoption AS (
+         SELECT idle.car_id,
+            idle.next_id,
+            idle.start_date,
+            idle.start_range_km
+           FROM idle
+          WHERE idle.adopted
         ), collection AS (
-         SELECT pic_refs_base_v.t AS ref_type,
-            pic_refs_base_v.id AS ref_id,
-            pic_refs_base_v.car_id,
-            pic_refs_base_v.start_date,
-            pic_refs_base_v.end_date,
-            pic_refs_base_v.start_range_km,
-            pic_refs_base_v.end_range_km,
+         SELECT b.t AS ref_type,
+            b.id AS ref_id,
+            b.car_id,
+            COALESCE(a.start_date, b.start_date) AS start_date,
+            b.end_date,
+            COALESCE(a.start_range_km, b.start_range_km) AS start_range_km,
+            b.end_range_km,
             NULL::public.pic_ref_type AS prev_type,
             NULL::integer AS prev_id,
             NULL::public.pic_ref_type AS next_type,
             NULL::integer AS next_id,
-            pic_refs_base_v.start_position_id,
-            pic_refs_base_v.end_position_id,
-            pic_refs_base_v.start_address_id,
-            pic_refs_base_v.end_address_id,
-            pic_refs_base_v.start_geofence_id,
-            pic_refs_base_v.end_geofence_id,
-            pic_refs_base_v.real_km
-           FROM public.pic_refs_base_v
+            b.start_position_id,
+            b.end_position_id,
+            b.start_address_id,
+            b.end_address_id,
+            b.start_geofence_id,
+            b.end_geofence_id,
+            b.real_km
+           FROM (public.pic_refs_base_v b
+             LEFT JOIN adoption a ON (((a.car_id = b.car_id) AND (a.next_id = b.id) AND (b.t = 'charge'::public.pic_ref_type))))
         UNION ALL
          SELECT 'idle'::public.pic_ref_type AS ref_type,
             NULL::integer AS ref_id,
@@ -2590,6 +2604,7 @@ CREATE VIEW public.pic_refs_prep_v AS
             idle.at_geofence_id AS end_geofence_id,
             NULL::numeric AS real_km
            FROM idle
+          WHERE ((NOT idle.adopted) AND (idle.sec_to_next > (60)::numeric))
         )
  SELECT c.ref_type,
     c.ref_id,
@@ -2649,6 +2664,14 @@ CREATE VIEW public.pic_refs_v AS
     r.kwh_per_real_1km,
     r.cost_per_real_100km,
     r.cost_per_kwh,
+    (r.cost + COALESCE(i.cost, 0.0)) AS gross_cost,
+    (r.hours + COALESCE(i.hours, 0.0)) AS gross_hours,
+    (r.mean_draw_kw + COALESCE(i.mean_draw_kw, 0.0)) AS gross_mean_draw_kw,
+    (r.dropped_km + COALESCE(i.dropped_km, 0.0)) AS gross_dropped_km,
+    (r.dropped_kwh + COALESCE(i.dropped_kwh, 0.0)) AS gross_dropped_kwh,
+    (r.kwh_per_real_1km + COALESCE(i.kwh_per_real_1km, 0.0)) AS gross_kwh_per_real_1km,
+    (r.cost_per_real_100km + COALESCE(i.cost_per_real_100km, 0.0)) AS gross_cost_per_real_100km,
+    (r.cost_per_kwh + COALESCE(i.cost_per_kwh, 0.0)) AS gross_cost_per_kwh,
     sm.seed_address_id AS start_seed_address_id,
     em.seed_address_id AS end_seed_address_id,
     sm.cluster_id AS start_cluster_id,
@@ -2669,7 +2692,8 @@ CREATE VIEW public.pic_refs_v AS
         END AS end_address_type,
     COALESCE(sg.name, (sa.address)::character varying, (sa_fallback.address)::character varying) AS start_address,
     COALESCE(eg.name, (ea.address)::character varying, (ea_fallback.address)::character varying) AS end_address
-   FROM ((((((((public.pic_refs r
+   FROM (((((((((public.pic_refs r
+     LEFT JOIN public.pic_refs i ON (((i.ref_type = 'idle'::public.pic_ref_type) AND (r.ref_type = 'drive'::public.pic_ref_type) AND (i.next_type = r.ref_type) AND (i.next_id = r.ref_id))))
      LEFT JOIN public.pic_cluster_map_v sm ON ((sm.address_id = r.start_address_id)))
      LEFT JOIN public.pic_cluster_map_v em ON ((em.address_id = r.end_address_id)))
      LEFT JOIN public.pic_addresses_v sa ON ((sa.id = sm.seed_address_id)))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mxpicture/tesla-superchargers-mate",
-  "version": "0.1.59",
+  "version": "0.1.60",
   "description": "TeslaMate integration",
   "type": "module",
   "author": "MXPicture",
@@ -50,7 +50,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mxpicture/tesla-superchargers-generated": "^0.1.59",
+    "@mxpicture/tesla-superchargers-generated": "^0.1.60",
     "dbmate": "2.35.1",
     "postgres": "^3.4.9",
     "short-uuid": "^6.0.3",

package/sql/views.sql

@@ -1036,6 +1036,14 @@ FROM
 CREATE OR REPLACE VIEW pic_refs_v AS
 SELECT
   r.*,
+  r.cost + COALESCE(i.cost, 0.0) AS gross_cost,
+  r.hours + COALESCE(i.hours, 0.0) AS gross_hours,
+  r.mean_draw_kw + COALESCE(i.mean_draw_kw, 0.0) AS gross_mean_draw_kw,
+  r.dropped_km + COALESCE(i.dropped_km, 0.0) AS gross_dropped_km,
+  r.dropped_kwh + COALESCE(i.dropped_kwh, 0.0) AS gross_dropped_kwh,
+  r.kwh_per_real_1km + COALESCE(i.kwh_per_real_1km, 0.0) AS gross_kwh_per_real_1km,
+  r.cost_per_real_100km + COALESCE(i.cost_per_real_100km, 0.0) AS gross_cost_per_real_100km,
+  r.cost_per_kwh + COALESCE(i.cost_per_kwh, 0.0) AS gross_cost_per_kwh,
   sm.seed_address_id AS start_seed_address_id,
   em.seed_address_id AS end_seed_address_id,
   sm.cluster_id AS start_cluster_id,
@@ -1058,6 +1066,10 @@ SELECT
   COALESCE(eg.name, ea.address, ea_fallback.address) AS end_address
 FROM
   pic_refs r
+  LEFT JOIN pic_refs i ON i.ref_type = 'idle'::pic_ref_type
+  AND r.ref_type = 'drive'::pic_ref_type
+  AND i.next_type = r.ref_type
+  AND i.next_id = r.ref_id
   LEFT JOIN pic_cluster_map_v sm ON sm.address_id = r.start_address_id
   LEFT JOIN pic_cluster_map_v em ON em.address_id = r.end_address_id
   LEFT JOIN pic_addresses_v sa ON sa.id = sm.seed_address_id