Skip to content

Make Population a Property of Location Object #188

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
ExpDev07 merged 15 commits into from
Mar 26, 2020
Merged

Make Population a Property of Location Object #188

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
90c0fd8
adds .DS_Store to .gitignore for OSX devs
Turreted Mar 25, 2020
14101de
adds country_in_database function to countrycodes
Turreted Mar 25, 2020
4325aaa
adds population as property of the location object
Turreted Mar 25, 2020
36963da
change population property to country_population
Turreted Mar 25, 2020
47a2fba
Move countrypopulation to utils
Turreted Mar 25, 2020
a0f8169
Avoid plagiarism
Turreted Mar 25, 2020
4de23fa
Allow for country_population to be added to all locations as long as …
ExpDev07 Mar 25, 2020
2e0034e
^
ExpDev07 Mar 25, 2020
8add335
Merge remote-tracking branch 'upstream/master'
Mar 25, 2020
73f02fb
change datasource + refactoring + add to documentation
Mar 26, 2020
6c29742
remove comment
ExpDev07 Mar 26, 2020
80daa5a
fix tests
Mar 26, 2020
dfbce99
now fixed tests
Mar 26, 2020
7a03f77
now tests work :P
Mar 26, 2020
6d664f5
now tests work
Mar 26, 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
Prev Previous commit
Next Next commit
change population property to country_population
  • Loading branch information
@Turreted
Turreted committed Mar 25, 2020
commit 36963dab5242aa0eb365cf07dddacc438d6415a5
5 changes: 2 additions & 3 deletions app/location/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from ..coordinates import Coordinates
from ..utils import countrycodes
from ..services.population import countrypopulation
from ..utils.population import countrypopulation

class Location:
"""
Expand All @@ -23,7 +23,7 @@ def __init__(self, id, country, province, coordinates, last_updated, confirmed,
self.recovered = recovered

@property
def population(self):
def country_population(self):
"""
Gets the population of this location.
"""
Expand All @@ -32,7 +32,6 @@ def population(self):
if self.province:
return None
else:
print(countrypopulation.get_population_dict()[self.country_code])
return countrypopulation.get_population_dict()[self.country_code]

@property
Expand Down