Hook up the combined metric in the forecast

src/providers/combined.rs

@@ -7,8 +7,8 @@ use chrono::serde::ts_seconds;
 use chrono::{DateTime, Utc};
 use rocket::serde::Serialize;
 
-use super::buienradar::{self, Sample as BuienradarSample};
+pub(crate) use super::buienradar::{self, Sample as BuienradarSample};
-use super::luchtmeetnet::{self, Item as LuchtmeetnetItem};
+pub(crate) use super::luchtmeetnet::{self, Item as LuchtmeetnetItem};
 use crate::maps::MapsHandle;
 use crate::position::Position;
 use crate::Metric;
@@ -25,6 +25,14 @@ pub(crate) struct Item {
     value: f32,
 }
 
+/// Merges pollen samples and AQI items into combined items.
+///
+/// This drops items from either the pollen samples or from the AQI items if they are not stamped
+/// with half an hour of the first item of the latest stating series, thus lining them before they
+/// are combined.
+///
+/// Returns [`None`] if there are no pollen samples, if  there are no AQI items, or if
+/// lining them up fails.
 fn merge(
     pollen_samples: Vec<BuienradarSample>,
     aqi_items: Vec<LuchtmeetnetItem>,
@@ -56,10 +64,9 @@ fn merge(
         })?;
         aqi_items.drain(..idx);
     }
-    // pollen_iter.skip_while(|it| it.time.signed_duration_since(aqi_iter.peek()) .. ?
-    // aqi_iter.skip_while(|it| it.time.signed_duration_since(aqi_iter.peek()) ?
 
-    // Combine
+    // Combine the samples with items by taking the maximum of pollen sample score and AQI item
+    // value.
     let items = pollen_samples
         .into_iter()
         .zip(aqi_items.into_iter())
@@ -99,9 +106,7 @@ pub(crate) async fn get(
         return None;
     };
     let pollen_items = buienradar::get_samples(position, Metric::Pollen, maps_handle).await;
-    dbg!(&pollen_items);
     let aqi_items = luchtmeetnet::get(position, Metric::AQI).await;
-    dbg!(&aqi_items);
 
     merge(pollen_items?, aqi_items?)
 }