diff --git a/assets/datasets/buy.parquet b/assets/datasets/buy.parquet index f67ebb3c..b978d74f 100644 Binary files a/assets/datasets/buy.parquet and b/assets/datasets/buy.parquet differ diff --git a/assets/javascript/popup.js b/assets/javascript/popup.js index 92b3a9e0..907f2671 100644 --- a/assets/javascript/popup.js +++ b/assets/javascript/popup.js @@ -243,7 +243,7 @@ window.dash_props = Object.assign({}, window.dash_props, { ${spaceRentBlock} Bedrooms/Bathrooms - ${data.bedrooms}/${data.bathrooms} + ${data.bedrooms_bathrooms} Year Built diff --git a/buy_dataframe.py b/buy_dataframe.py index d05bad26..f6a1e3c6 100644 --- a/buy_dataframe.py +++ b/buy_dataframe.py @@ -187,6 +187,9 @@ df['Half Bathrooms'] = (df['Br/Ba'].str.split('/', expand=True)[1]).str.split(',', expand=True)[2] df['Three Quarter Bathrooms'] = (df['Br/Ba'].str.split('/', expand=True)[1]).str.split(',', expand=True)[3] +# Rename the Br/Ba column to bedrooms_bathrooms +df.rename(columns={'Br/Ba': 'bedrooms_bathrooms'}, inplace=True) + # Convert a few columns into int64 # pd.to_numeric will convert into int64 or float64 automatically, which is cool # These columns are assumed to have NO MISSING DATA, so we can cast them as int64 instead of floats (ints can't handle NaNs) @@ -205,7 +208,7 @@ # Convert date_processed into DateTime df['date_processed'] = pd.to_datetime(df['date_processed'], errors='coerce', format='%Y-%m-%d') -cols = ['Full Bathrooms', 'Bedrooms', 'year_built', 'Sqft', 'list_price', 'Total Bathrooms', 'space_rent', 'ppsqft', 'hoa_fee'] +cols = ['Full Bathrooms', 'Bedrooms', 'year_built', 'Sqft', 'list_price', 'Total Bathrooms', 'space_rent', 'ppsqft', 'hoa_fee', 'bedrooms_bathrooms'] # Convert columns to string type for string operations df[cols] = df[cols].astype(str) # Remove commas and other non-numeric characters diff --git a/pages/buy_page.py b/pages/buy_page.py index 214e625c..2971398a 100644 --- a/pages/buy_page.py +++ b/pages/buy_page.py @@ -201,7 +201,7 @@ def update_map( lat=row.Latitude, lon=row.Longitude, data=dict( - #bedrooms_bathrooms=row['Br/Ba'], + bedrooms_bathrooms=row.bedrooms_bathrooms, #full_bathrooms=row['Full Bathrooms'], #half_bathrooms=row['Half Bathrooms'], #popup_html=row.popup_html,