Skip to content

Propagate geomapper changes into JHU #297

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.

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 76 commits into from
Oct 7, 2020
Merged

Propagate geomapper changes into JHU #297

merged 76 commits into from
Oct 7, 2020

Conversation

krivard
Copy link
Contributor

@krivard krivard commented Oct 7, 2020

#217 merged into main because delphi_utils doesn't have an associated deployment branch. This PR applies those changes to JHU automation.

vishakha1812 and others added 30 commits September 10, 2020 01:24
Propagate NYC and pylint hotfix for JHU
…ty issue template. Edited existing templates to make more relevant.
* README
* data processing script
* demo/tutorial notebooks

Changes include:

* updated data sources
* Added state->HHS region mappings
* new HRR weights
* new JHU UID mappings by hand
* 2019 population from US Census Bureau
* Puerto Rico population from 2010
* Shortcut crosswalks

Removed unused code
* Removed old sources, since we now pull from the internet
* Renamed cross files, since they are tables
* Added new mapping tables
* Updated population figures
* Added HHS mapping
* added the functions zip_to_state_code, zip_to_state_id (and the convert_* versions), zip_to_msa and convert_zip_to_msa
* added two functions add_geocode and replace_geocode meant to consolidate the logic in the utility and reduce the code size by a factor of 5. These functions work along side with the rest of the deprecated functions and are meant to replace e.g. zip_to_msa(df, ...) with replace_geocode(df, "zip", "msa", ...).
* renamed functions that referred to fips or county interchangeably to consistently use fips, e.g. zip_to_county to zip_to_fips
* enforced the string type on all geocodes, with zero padding as necessary
* renamed instances of stcode to state_code for clarity
* removed non-JHU UID functions for JHU conversion
* updated tests to match

Bugfixes:

* Removed .0000, 9xxx in output mappings - fixes most of #254
* Puerto Rico deaths should now be reported - fixes #179
* Generally fixes #215
Merged quidel_covidtest and quidel_flutest
* fix linter issues in both geo_data_proc and geomap
* make private _load_crosswalk
* add deprecation warnings
* add and update docstrings
* update and fix tests

Other updates:
* made global variable for HHS source file
* add Puerto Rico megaFIPS 72000 and its population
* update static files
Small code consistency change

Co-authored-by: chinandrew <[email protected]>
krivard and others added 27 commits September 29, 2020 17:17
* Correct README information about JHU fixes
* Remove JHU NYC county splitting
* Add Dmitry to authorship comments in geo_data_proc and geomap
implement claims-only hospitalization indicator
* Change 'national' -> 'nation' for consistency with #207
* Enforce FIPS and ZIP from_code when going to 'nation' level
* if 'bucket_name' param is empty, do not archive
* typo fix to comment in geo_data_proc
* keep the JHU entries for the counties that Kansas City contributes to (were deleted previously, leading to missing counts)
* fix bug that deleted the Puerto Rico Unassigned and Out of State JHU UIDs
* delete the New York County splitting that was previously necessary
* add New York County UIDs back to the crosswalk
Further refactoring for the geo coding utility
@krivard krivard requested a review from korlaxxalrok October 7, 2020 18:27
Copy link
Contributor

@korlaxxalrok korlaxxalrok left a comment

Choose a reason for hiding this comment

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

Tests pass in Jenkins (though we are ignoring linting because of that weird issue) so looks good to me 👍 :shipit:

@krivard krivard merged commit 650c12e into deploy-jhu Oct 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants