Skip to content

Extend geocode utility to actually support the state to state mappings #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 26, 2020
Merged

Extend geocode utility to actually support the state to state mappings #310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7ff30ac
Extend geocode utility to actually support the mappings:
dshemetov Oct 13, 2020
3d8c331
Add column renaming line in state conversion
dshemetov Oct 14, 2020
3b6d139
Geocode updates:
dshemetov Oct 14, 2020
8a1112d
Refactor to Geomapper function
chinandrew Oct 14, 2020
d6f43ae
Change na behavior to be consistent with previous implementation
chinandrew Oct 15, 2020
d8c491a
Remove unused variable
chinandrew Oct 15, 2020
893aafc
Update comment on column assignment
chinandrew Oct 16, 2020
0befb53
Merge pull request #311 from cmu-delphi/geo_refactor_cdccovidnet
krivard Oct 19, 2020
e1f96f9
Fix date_col docstring, add None option to date_col, add test for tha…
dshemetov Oct 19, 2020
5859982
Remove duplicated test
dshemetov Oct 19, 2020
84422b6
Remove static file
chinandrew Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion _delphi_utils_python/delphi_utils/geomap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,9 @@ def add_geocode(
)

# state codes are all stored in one table
if new_code in state_codes:
if from_code in state_codes and new_code in state_codes:
crosswalk = self._load_crosswalk(from_code="state", to_code="state")
elif new_code in state_codes:
crosswalk = self._load_crosswalk(from_code=from_code, to_code="state")
crosswalk = crosswalk.rename(
columns={from_code: from_col, new_code: new_col}
Expand Down
5 changes: 5 additions & 0 deletions _delphi_utils_python/tests/test_geomap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,11 @@ def test_add_geocode(self):
new_data2 = gmpr.add_geocode(new_data, "state_code", "hhs_region_number")
assert new_data2["hhs_region_number"].unique().size == 2

# state_name -> state_id
new_data = gmpr.add_geocode(self.zip_data, "zip", "state_name")
new_data2 = gmpr.add_geocode(new_data, "state_name", "state_id")
assert new_data2.shape == (12, 6)
Copy link
Contributor

@chinandrew chinandrew Oct 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should there also be an assert statement for new_data?

Copy link
Contributor Author

@dshemetov dshemetov Oct 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, new_data is just the test data for state_name to state_id, but it starts in zip form


# fips -> nation
new_data = gmpr.replace_geocode(self.fips_data_5, "fips", "nation")
assert new_data.equals(
Expand Down