fix gis examples by passing solaraviz components as keyword argument

Author: wang-boyu

gis/agents_and_networks/app.py

@@ -53,14 +53,14 @@ def parse_args():
     model = AgentsAndNetworks()
     page = SolaraViz(
         model,
-        [
+        name="Agents and Networks",
+        model_params=model_params,
+        components=[
             make_geospace_component(agent_draw, zoom=campus_params[campus]["zoom"]),
             make_plot_clock,
             make_plot_component(["status_home", "status_work", "status_traveling"]),
             make_plot_component(["friendship_home", "friendship_work"]),
         ],
-        name="Agents and Networks",
-        model_params=model_params,
     )
 
     page  # noqa

gis/geo_schelling/app.py

@@ -30,13 +30,13 @@ def schelling_draw(agent):
 model = GeoSchelling()
 page = SolaraViz(
     model,
-    [
+    name="GeoSchelling",
+    model_params=model_params,
+    components=[
         make_geospace_component(schelling_draw, zoom=4),
         make_plot_component(["happy"]),
         make_plot_happiness,
     ],
-    model_params=model_params,
-    name="GeoSchelling",
 )
 
 page  # noqa

gis/geo_schelling_points/app.py

@@ -34,13 +34,13 @@ def schelling_draw(agent):
 model = GeoSchellingPoints()
 page = SolaraViz(
     model,
-    [
+    name="GeoSchellingPoints",
+    model_params=model_params,
+    components=[
         make_geospace_component(schelling_draw, zoom=4),
         make_plot_component(["happy", "unhappy"]),
         make_plot_happiness,
     ],
-    model_params=model_params,
-    name="GeoSchellingPoints",
 )
 
 page  # noqa

gis/geo_sir/app.py

@@ -29,12 +29,12 @@ def infected_draw(agent):
 model = GeoSir()
 page = SolaraViz(
     model,
-    [
+    name="Basic agent-based SIR model",
+    model_params=model_params,
+    components=[
         make_geospace_component(infected_draw, zoom=12),
         make_plot_component(["infected", "susceptible", "recovered", "dead"]),
     ],
-    name="Basic agent-based SIR model",
-    model_params=model_params,
 )
 
 page  # noqa

gis/population/app.py

@@ -32,11 +32,11 @@ def agent_portrayal(agent):
 model = Population()
 page = SolaraViz(
     model,
-    [
+    name="Population Model",
+    components=[
         make_geospace_component(agent_portrayal),
         make_plot_num_agents,
     ],
-    name="Population Model",
 )
 
 page  # noqa

gis/rainfall/app.py

@@ -29,14 +29,14 @@ def cell_portrayal(cell: LakeCell) -> tuple[float, float, float, float]:
 model = Rainfall()
 page = SolaraViz(
     model,
-    [
+    name="Rainfall Model",
+    model_params=model_params,
+    components=[
         make_geospace_component(cell_portrayal, zoom=11),
         make_plot_component(
             ["Total Amount of Water", "Total Contained", "Total Outflow"]
         ),
     ],
-    name="Rainfall Model",
-    model_params=model_params,
 )
 
 page  # noqa

gis/urban_growth/app.py

@@ -33,13 +33,13 @@ def make_plot_urbanized(model):
 model = UrbanGrowth()
 page = SolaraViz(
     model,
-    [
+    name="Urban Growth Model",
+    model_params=model_params,
+    components=[
         make_geospace_component(cell_portrayal, zoom=12.1),
         make_plot_component(["Percentage Urbanized"]),
         make_plot_urbanized,
     ],
-    name="Urban Growth Model",
-    model_params=model_params,
 )
 
 page  # noqa