Renames aggregations AggregateAgent to CityAgent

Author: SirCipher

example_apps/aggregations/src/area.rs

@@ -122,7 +122,7 @@ impl AreaLifecycle {
 impl AreaLifecycle {
     #[on_start]
     pub fn on_start(&self, context: HandlerContext<AreaAgent>) -> impl EventHandler<AreaAgent> {
-        context.send_command(None, "/aggregate", "register", self.area.to_string())
+        context.send_command(None, "/city", "register", self.area.to_string())
     }
 
     #[on_command(registrations)]

example_apps/aggregations/src/aggregate.rs renamed to example_apps/aggregations/src/city.rs

@@ -24,38 +24,38 @@ use swimos::{
 
 #[derive(AgentLaneModel)]
 #[projections]
-pub struct AggregateAgent {
+pub struct CityAgent {
     aggregated: JoinValueLane<String, f64>,
     average_speed: ValueLane<f64>,
     register: CommandLane<String>,
 }
 
 #[derive(Clone, Default)]
-pub struct AggregateLifecycle;
+pub struct CityLifecycle;
 
-#[lifecycle(AggregateAgent)]
-impl AggregateLifecycle {
+#[lifecycle(CityAgent)]
+impl CityLifecycle {
     #[on_update(aggregated)]
     fn aggregated(
         &self,
-        context: HandlerContext<AggregateAgent>,
+        context: HandlerContext<CityAgent>,
         averages: &HashMap<String, f64>,
         _key: String,
         _prev: Option<f64>,
         _new_value: &f64,
-    ) -> impl EventHandler<AggregateAgent> {
+    ) -> impl EventHandler<CityAgent> {
         let average = averages.values().sum::<f64>() / averages.len() as f64;
-        context.set_value(AggregateAgent::AVERAGE_SPEED, average)
+        context.set_value(CityAgent::AVERAGE_SPEED, average)
     }
 
     #[on_command(register)]
     pub fn register(
         &self,
-        context: HandlerContext<AggregateAgent>,
+        context: HandlerContext<CityAgent>,
         area_id: &String,
-    ) -> impl EventHandler<AggregateAgent> {
+    ) -> impl EventHandler<CityAgent> {
         context.add_downlink(
-            AggregateAgent::AGGREGATED,
+            CityAgent::AGGREGATED,
             area_id.clone(),
             None,
             format!("/area/{}", area_id).as_str(),

example_apps/aggregations/src/main.rs

@@ -18,10 +18,10 @@ use std::time::Duration;
 
 use crate::area::Area;
 use crate::{
-    aggregate::{AggregateAgent, AggregateLifecycle},
     area::{AreaAgent, AreaLifecycle},
     car::CarAgent,
     car::CarLifecycle,
+    city::{CityAgent, CityLifecycle},
 };
 use example_util::{example_logging, manage_handle};
 use swimos::route::RouteUri;
@@ -31,9 +31,9 @@ use swimos::{
     server::{Server, ServerBuilder},
 };
 
-mod aggregate;
 mod area;
 mod car;
+mod city;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -46,12 +46,11 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
             AreaLifecycle::new(name).into_lifecycle(),
         )
     };
-    let aggregate_agent =
-        AgentModel::new(AggregateAgent::default, AggregateLifecycle.into_lifecycle());
+    let aggregate_agent = AgentModel::new(CityAgent::default, CityLifecycle.into_lifecycle());
 
     let mut builder = ServerBuilder::with_plane_name("Example Plane")
         .add_route(RoutePattern::parse_str("/cars/:car_id")?, car_agent)
-        .add_route(RoutePattern::parse_str("/aggregate")?, aggregate_agent)
+        .add_route(RoutePattern::parse_str("/city")?, aggregate_agent)
         .update_config(|config| {
             config.agent_runtime.inactive_timeout = Duration::from_secs(5 * 60);
         });