Include country-level points in admin 1 disease extent generation

For example:

1. The centroid of the USA happens to be in Kansas
2. When counting the number of points in Kansas, any country-level points for the USA should be excluded
3. But if there are no points in Kansas, any country-level points for the USA should be included

2 was already implemented, but 3 was not.