fix county map

app.py

@@ -38,8 +38,15 @@ alpha_2_map = iso['Alpha-3 code'].to_dict()
 with open('counties.json') as f:
     counties = json.load(f)
 
+ga_cities = pd.read_csv('cities.csv')
 cities = pd.read_csv('uscities.csv')
-cities.set_index('city', inplace=True)
+cities['full_city'] = cities['city'] + ', ' + cities['state_name']
+cities.set_index('full_city', inplace=True)
+ga_cities['Criteria ID'] = ga_cities['Criteria ID'].astype(str)
+ga_cities.set_index('Criteria ID', inplace=True)
+ga_city_map = ga_cities['Name'].to_dict()
+ga_cities['state'] = ga_cities['Canonical Name'].str.split(',').str[1].str.strip()
+ga_state_map = ga_cities['state'].to_dict()
 city_county_map = cities['county_fips'].to_dict()
 city_county_name_map = cities['county_name'].to_dict()
 
@@ -66,14 +73,14 @@ def full_report():
                         Dimension(name="continent"),
                         Dimension(name="country"),
                         Dimension(name="countryId"),
-                        Dimension(name="city")],
+                        Dimension(name="cityId")],
             metrics=[Metric(name="eventValue")],
             #return_property_quota=True,
             date_ranges=[DateRange(start_date="2023-06-30", end_date="today")],
         )
         response = client.run_report(request)
 
-        res = {'day': [], 'jumps': [], 'continent': [], 'country': [], 'iso': [], 'city': []}
+        res = {'day': [], 'jumps': [], 'continent': [], 'country': [], 'iso': [], 'cityId': []}
 
         for row in response.rows:
             event_name = row.dimension_values[1].value
@@ -89,7 +96,7 @@ def full_report():
                 res['continent'].append(continent)
                 res['country'].append(country)
                 res['iso'].append(country_iso)
-                res['city'].append(city)
+                res['cityId'].append(city)
 
         df = pd.DataFrame.from_dict(res)
         cached_report = df.copy(deep=True)
@@ -99,13 +106,16 @@ def full_report():
 
     total_jumps = int(df['jumps'].sum())
     unique_countries = df['country'].nunique()
-    unique_cities = df['city'].nunique()
+    unique_cities = df['cityId'].nunique()
 
     print(f"Total jumps: {total_jumps}, unique countries: {unique_countries}, unique cities: {unique_cities}")
     df['iso'] = df['iso'].map(alpha_2_map)
     df['jumps'] = df['jumps'].astype(int)
+    df['city'] = df['cityId'].map(ga_city_map)
+    df['state'] = df['cityId'].map(ga_state_map)
     df['city'] = df.apply(lambda row: row['city'] if row['country'] != 'Bermuda' else 'Hamilton', axis=1)
-    
+    df['city'] = df['city'] + ', ' + df['state']
+
     country_df = df.groupby(['country', 'iso']).sum().reset_index()
     country_df = country_df.sort_values(by=['jumps'], ascending=False)
     top_10_countries = country_df.iloc[:10]['country'].tolist()
@@ -148,7 +158,7 @@ def full_report():
                                 color="rank", 
                                 hover_name="country", # column to add to hover information
                                 hover_data=["jumps"],
-                                color_continuous_scale ="YlOrRd_r",
+                                color_continuous_scale ="OrRd_r",
                                 projection='natural earth',
                                 template="plotly_dark")
     # remove the legend
@@ -160,8 +170,10 @@ def full_report():
     county_df['count_name'] = county_df['city'].map(city_county_name_map)
     county_df = county_df.groupby(['county', 'count_name']).sum().reset_index()
     county_df['rank'] = county_df['jumps'].rank(ascending=False)
+    county_df['county'] = county_df['county'].astype(int)
+    county_df['county'] = county_df['county'].astype(str).str.zfill(5)  # county codes are two digits for state, three for county
     county_map = px.choropleth(county_df, geojson=counties, locations='county', color='rank',
-                           color_continuous_scale="YlOrRd_r",
+                           color_continuous_scale="OrRd_r",
                            scope="usa",
                            hover_name="count_name",
                             hover_data=["jumps"],