From ae726eda26382bb7c62f88e8d24c19769899b6de Mon Sep 17 00:00:00 2001
From: Sahib Bhai <lunarwolf01@gmail.com>
Date: Mon, 2 Sep 2024 16:27:46 -0700
Subject: [PATCH] Refactor code to rename 'Br/Ba' column to
 'bedrooms_bathrooms'

---
 assets/datasets/buy.parquet | Bin 2060649 -> 2060758 bytes
 assets/javascript/popup.js  |   2 +-
 buy_dataframe.py            |   5 ++++-
 pages/buy_page.py           |   2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/assets/datasets/buy.parquet b/assets/datasets/buy.parquet
index f67ebb3c6164b7aacb32663c59fd46155d89f582..b978d74f66c8a3bcead0b43d67179ad327cccf3b 100644
GIT binary patch
delta 2641
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
P8O`r)x#yl%-edSL=!U7`

delta 2483
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

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}
                                 <tr>
                                     <th style="text-align:left;padding:8px;border-bottom:1px solid #ddd;">Bedrooms/Bathrooms</th>
-                                    <td style="padding:8px;border-bottom:1px solid #ddd;">${data.bedrooms}/${data.bathrooms}</td>
+                                    <td style="padding:8px;border-bottom:1px solid #ddd;">${data.bedrooms_bathrooms}</td>
                                 </tr>
                                 <tr>
                                     <th style="text-align:left;padding:8px;border-bottom:1px solid #ddd;">Year Built</th>
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,