adding SVI layer

app.py

@@ -78,7 +78,7 @@ party = (con
 
 
 # generate altair chart with df
-def create_chart(df, y_column, title, color):
+def create_chart(df, y_column, ylab, title, color):
     # color encoding - color is a list or single value 
     color_encoding = (
         alt.Color('party:N', scale=alt.Scale(domain=["DEMOCRAT", "REPUBLICAN"], range=color))
@@ -87,7 +87,7 @@ def create_chart(df, y_column, title, color):
 
     return alt.Chart(df).mark_line(strokeWidth=3).encode(
         x=alt.X('year:N', title='Year'),
-        y=alt.Y(f'{y_column}:Q', title=title),
+        y=alt.Y(f'{y_column}:Q', title=ylab),
         color=color_encoding  
     ).properties(
         title=title
@@ -158,17 +158,17 @@ paint_extrusion = {
 def get_style_status(jurisdiction):
     if jurisdiction == "State":
         name = "state"
-        label = "states"
+        label = "States"
         paint_type = paint_fill
         layer_type = "fill"
     elif jurisdiction == "County":
         name = "county"
-        label = "counties"
+        label = "Counties"
         paint_type = paint_extrusion
         layer_type = "fill-extrusion"
     else:  # Municipal
         name = "municipal"
-        label = "cities"
+        label = "Cities"
         paint_type = paint_extrusion
         layer_type = "fill-extrusion"
 
@@ -190,13 +190,13 @@ def get_style_status(jurisdiction):
 def get_style_party(jurisdiction):
     if jurisdiction == "State":
         name = "state"
-        label = "states"
+        label = "States"
     elif jurisdiction == "County":
         name = "county"
-        label = "counties"
+        label = "Counties"
     else:  # Municipal
         name = "municipal"
-        label = "cities"
+        label = "Cities"
 
     # Return style dictionary for political party
     return {
@@ -224,27 +224,84 @@ def get_style_party(jurisdiction):
     }
 
 
+sv_pmtiles = "https://data.source.coop/cboettig/social-vulnerability/svi2020_us_county.pmtiles"
+sv_style =  {
+        "layers": [
+            {
+                "id": "SVI",
+                "source": "Social Vulnerability Index",
+                "source-layer": "SVI2020_US_county",
+                "type": "fill",
+                "paint": {
+                    "fill-color": 
+                        ["interpolate", ["linear"], ["get", "RPL_THEMES"],
+                0, "#FFE6EE",
+                1, "#850101"] 
+                        
+                    }
+                }
+        ]
+}
+
+party_pmtiles = "https://huggingface.co/datasets/boettiger-lab/landvote/resolve/main/party_polygons.pmtiles"
+
+recent_election_year = year - year%4 
+party_style =  {
+        "layers": [
+            {
+                "id": "Party",
+                "source": "Political Parties",
+                "source-layer": "county",
+                "type": "fill",
+                "filter": [
+                    "==", ["get", "year"], recent_election_year
+                ],
+                "paint": {
+                    "fill-color": {
+                        "property": "party",
+                        "type": "categorical",
+                        "stops": [
+                            ["DEMOCRAT", COLORS["dem_blue"]],
+                            ["REPUBLICAN", COLORS["rep_red"]]
+                        ]
+                    }
+                }
+            }
+        ]
+    }
+
 m = leafmap.Map(style="positron", center=(-100, 40), zoom=3)
+
 color_choice = st.radio("Color by:", ["Measure Status", "Political Party"])
+social_toggle = st.toggle("Social Vulnerability Index")
+party_toggle = st.toggle("Political Parties")
+
+if social_toggle:
+    m.add_pmtiles(sv_pmtiles, style = sv_style ,visible=True, opacity=0.3, tooltip=True)
+
+if party_toggle:
+    m.add_pmtiles(party_pmtiles, style = party_style ,visible=True, opacity=0.3, tooltip=True)
 
 if color_choice == "Measure Status":
-    m.add_pmtiles(votes_pmtiles, style=get_style_status("State"), visible=True, opacity=0.4, tooltip=True)
+    m.add_pmtiles(votes_pmtiles, style=get_style_status("State"), visible=True, opacity=0.8, tooltip=True)
     m.add_pmtiles(votes_pmtiles, style=get_style_status("County"), visible=True, opacity=1.0, tooltip=True)
     m.add_pmtiles(votes_pmtiles, style=get_style_status("Municipal"), visible=True, opacity=1.0, tooltip=True)
 
 elif color_choice == "Political Party":
-    m.add_pmtiles(votes_pmtiles, style=get_style_party("State"), visible=True, opacity=0.6, tooltip=True)
+    m.add_pmtiles(votes_pmtiles, style=get_style_party("State"), visible=True, opacity=0.8, tooltip=True)
     m.add_pmtiles(votes_pmtiles, style=get_style_party("County"), visible=True, opacity=1.0, tooltip=True)
     m.add_pmtiles(votes_pmtiles, style=get_style_party("Municipal"), visible=True, opacity=1.0, tooltip=True)
 
-#
+
+
 m.add_layer_control()
 m.to_streamlit()
 
 
 # display charts
 df_passes = get_passes(party)
-st.altair_chart(create_chart(df_passes, "percent_passed", "% of Measures Passed", [COLORS["dem_blue"], COLORS["rep_red"]]), use_container_width=True)
+st.altair_chart(create_chart(df_passes, "percent_passed", "Percent Passed","% of Measures Passed", [COLORS["dem_blue"], COLORS["rep_red"]]), use_container_width=True)
 
 df_funding = funding_chart(party)
-st.altair_chart(create_chart(df_funding, "cumulative_funding", "Cumulative Funding (Billions of Dollars)", COLORS["dark_green"]))
+st.altair_chart(create_chart(df_funding, "cumulative_funding", "Billions of Dollars", "Cumulative Funding", COLORS["dark_green"]), use_container_width=True)
+