Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 0 additions & 30 deletions app/location/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,35 +92,5 @@ def serialize(self, timelines = False):
key: value.serialize() for (key, value) in self.timelines.items()
}})

# Return the serialized location.
return serialized

class CSBSLocation(Location):
"""
A CSBS (county) location.
"""
def __init__(self, id, state, county, coordinates, last_updated, confirmed, deaths):
super().__init__(
id, 'US', county, coordinates, last_updated, confirmed, deaths, recovered=0
)

self.state = state
self.county = county

def serialize(self, timelines=False):
"""
Serializes the location into a dict.

:returns: The serialized location.
:rtype: dict
"""
serialized = super().serialize()

# Update with new fields.
serialized.update({
'state': self.state,
'county': self.county,
})

# Return the serialized location.
return serialized
37 changes: 37 additions & 0 deletions app/location/csbs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
from . import Location

class CSBSLocation(Location):
"""
A CSBS (county) location.
"""
def __init__(self, id, state, county, coordinates, last_updated, confirmed, deaths):
super().__init__(
# General info.
id, 'US', state, coordinates, last_updated,

# Statistics.
confirmed=confirmed,
deaths=deaths,
recovered=0
)

self.state = state
self.county = county

def serialize(self, timelines=False):
"""
Serializes the location into a dict.

:returns: The serialized location.
:rtype: dict
"""
serialized = super().serialize()

# Update with new fields.
serialized.update({
'state': self.state,
'county': self.county,
})

# Return the serialized location.
return serialized
2 changes: 1 addition & 1 deletion app/services/location/csbs.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from . import LocationService
from ...location import CSBSLocation
from ...coordinates import Coordinates
from ...location.csbs import CSBSLocation

class CSBSLocationService(LocationService):
"""
Expand Down