Merge pull request #48 from lta-rs/traffic_flow_41

feat: (#41) new traffic flow api
lta-rs · Mar 5, 2024 · 65c79b1 · 65c79b1
2 parents a2d41bf + 1591fbd
commit 65c79b1
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 12 deletions.
diff --git a/src/async/mod.rs b/src/async/mod.rs
@@ -25,6 +25,6 @@ pub trait ClientExt: Client {
 
     async fn build_req_with_query<T, T2, F>(&self, url: &str, query: F) -> LTAResult<T2>
     where
-        F: Send + FnOnce(Self::RB) -> Self::RB,
+        F: FnOnce(Self::RB) -> Self::RB,
         for<'de> T: serde::Deserialize<'de> + Into<T2>;
 }
diff --git a/src/async/traffic.rs b/src/async/traffic.rs
@@ -117,9 +117,11 @@ pub trait TrafficRequests<C: Client + ClientExt> {
     where
         S: Into<Option<u32>>,
     {
-        let url = concat_string!(client.base_url(), "/Traffic-Imagesv2");
         client
-            .build_req_with_skip::<TrafficImageResp, _>(url.as_str(), skip.into())
+            .build_req_with_skip::<TrafficImageResp, _>(
+                &concat_string!(client.base_url(), "/Traffic-Imagesv2"),
+                skip.into(),
+            )
             .await
     }
 
@@ -131,9 +133,11 @@ pub trait TrafficRequests<C: Client + ClientExt> {
     where
         S: Into<Option<u32>> + Send,
     {
-        let url = concat_string!(client.base_url(), "/TrafficIncidents");
         client
-            .build_req_with_skip::<TrafficIncidentResp, _>(url.as_str(), skip.into())
+            .build_req_with_skip::<TrafficIncidentResp, _>(
+                &concat_string!(client.base_url(), "/TrafficIncidents"),
+                skip.into(),
+            )
             .await
     }
 
@@ -144,11 +148,13 @@ pub trait TrafficRequests<C: Client + ClientExt> {
     /// **Update freq**: 2 minutes
     async fn get_vms_emas<S>(client: &C, skip: S) -> LTAResult<Vec<Vms>>
     where
-        S: Into<Option<u32>> + Send,
+        S: Into<Option<u32>>,
     {
-        let url = concat_string!(client.base_url(), "/VMS");
         client
-            .build_req_with_skip::<VMSResp, _>(url.as_str(), skip.into())
+            .build_req_with_skip::<VMSResp, _>(
+                &concat_string!(client.base_url(), "/VMS"),
+                skip.into(),
+            )
             .await
     }
 
@@ -164,5 +170,18 @@ pub trait TrafficRequests<C: Client + ClientExt> {
         dist: D,
     ) -> LTAResult<Vec<BikeParking>>
     where
-        D: Into<Option<f64>> + Send;
+        D: Into<Option<f64>>;
+
+    /// Returns hourly average traffic flow, taken from a representative month of
+    /// every quarter during 0700-0900 hours.
+    ///
+    /// **Update freq**: Quaterly
+    async fn get_traffic_flow(client: &C) -> LTAResult<Vec<String>> {
+        client
+            .build_req_with_skip::<TrafficFlowRawResp, _>(
+                &concat_string!(client.base_url(), "/TrafficFlow"),
+                None,
+            )
+            .await
+    }
 }
diff --git a/src/blocking/traffic.rs b/src/blocking/traffic.rs
@@ -136,4 +136,15 @@ pub trait TrafficRequests<C: Client + ClientExt> {
         long: f64,
         dist: impl Into<Option<f64>>,
     ) -> LTAResult<Vec<BikeParking>>;
+
+    /// Returns hourly average traffic flow, taken from a representative month of
+    /// every quarter during 0700-0900 hours.
+    ///
+    /// **Update freq**: Quaterly
+    fn get_traffic_flow(client: &C) -> LTAResult<Vec<String>> {
+        client.build_req_with_skip::<TrafficFlowRawResp, _>(
+            &concat_string!(client.base_url(), "/TrafficFlow"),
+            None,
+        )
+    }
 }
diff --git a/src/reqwest_async/mod.rs b/src/reqwest_async/mod.rs
@@ -30,7 +30,7 @@ impl ClientExt for LTAClient<ReqwestAsync> {
 
     async fn build_req_with_query<T, T2, F>(&self, url: &str, query: F) -> LTAResult<T2>
     where
-        F: Send + FnOnce(Self::RB) -> Self::RB,
+        F: FnOnce(Self::RB) -> Self::RB,
         for<'de> T: serde::Deserialize<'de> + Into<T2>,
     {
         let rb = self.req_builder(url);
@@ -198,6 +198,15 @@ mod tests {
         Ok(())
     }
 
+    #[tokio::test]
+    async fn get_traffic_flow() -> LTAResult<()> {
+        let client = get_client();
+        let data = Traffic::get_traffic_flow(&client).await?;
+        println!("{:?}", &data);
+        assert_eq!(data.len(), 1);
+        Ok(())
+    }
+
     #[ignore]
     #[tokio::test]
     async fn get_train_service_alerts() -> LTAResult<()> {

diff --git a/src/reqwest_blocking/mod.rs b/src/reqwest_blocking/mod.rs
@@ -81,8 +81,6 @@ mod tests {
     use lta_models::geo::geospatial_whole_island::GeospatialLayerId;
     use lta_models::prelude::*;
     use std::env;
-    use std::fs::File;
-    use std::io::prelude::*;
 
     macro_rules! gen_test {
         ($f: expr) => {{
@@ -214,6 +212,15 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn get_traffic_flow() -> LTAResult<()> {
+        let client = get_client();
+        let data = Traffic::get_traffic_flow(&client)?;
+        println!("{:?}", &data);
+        assert_eq!(data.len(), 1);
+        Ok(())
+    }
+
     #[test]
     fn get_crowd_density_rt() -> LTAResult<()> {
         let client = get_client();

diff --git a/src/ureq_blocking/mod.rs b/src/ureq_blocking/mod.rs
@@ -216,6 +216,15 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn get_traffic_flow() -> LTAResult<()> {
+        let client = get_client();
+        let data = Traffic::get_traffic_flow(&client)?;
+        println!("{:?}", &data);
+        assert_eq!(data.len(), 1);
+        Ok(())
+    }
+
     #[test]
     fn get_crowd_density_rt() -> LTAResult<()> {
         let client = get_client();