A structural pattern (composition) updated coordinates classes with t…

…wo sub classes

app/coordinates.py

@@ -1,23 +1,47 @@
 """app.coordinates.py"""
 
+class Latitude:
+    """
+    A numeric representation of a latitudinal position north or south of the Earth's equator, to track Coronavirus spread nation to nation latitudinally.
+    """
+    def __init__(self, value: float):
+        self.data = value
+
+    def sum(other: Latitude):
+        self.data += other.data
+
+    def merge(other: Longitude):
+        return Coordinates(self, other)
+
+class Longitude:
+    """
+    A numeric representation of a longitudinal position measuring east to west, to track Coronavirus spread nation to nation longitudinally
+    """
+    def __init__(self, value: float):
+        self.data = value
+
+    def sum(other: Longitude):
+        self.data += other.data
+
+    def merge(other: Latitude):
+        return Coordinates(self, other)
 
 class Coordinates:
     """
     A position on earth using decimal coordinates (latitude and longitude).
     """
 
-    def __init__(self, latitude, longitude):
+    def __init__(self, latitude: Latitude, longitude:Longitude):
         self.latitude = latitude
         self.longitude = longitude
 
     def serialize(self):
         """
         Serializes the coordinates into a dict.
-
         :returns: The serialized coordinates.
         :rtype: dict
         """
-        return {"latitude": self.latitude, "longitude": self.longitude}
+        return {"latitude": self.latitude.data, "longitude": self.longitude.data}
 
     def __str__(self):
-        return "lat: %s, long: %s" % (self.latitude, self.longitude)
+        return "lat: %s, long: %s" % (self.latitude.data, self.longitude.data)

app/services/location/csbs.py

@@ -82,7 +82,7 @@ async def get_locations():
                     state,
                     county,
                     # Coordinates.
-                    Coordinates(item["Latitude"], item["Longitude"]),
+                    Coordinates(Latitude(item["Latitude"]), Longitude(item["Longitude"])),
                     # Last update (parse as ISO).
                     datetime.strptime(last_update, "%Y-%m-%d %H:%M").isoformat() + "Z",
                     # Statistics.

app/services/location/jhu.py

@@ -101,7 +101,7 @@ async def get_category(category):
                     "country_code": countries.country_code(country),
                     "province": item["Province/State"],
                     # Coordinates.
-                    "coordinates": {"lat": item["Lat"], "long": item["Long"],},
+                    "coordinates": {"lat": Latitude(item["Lat"]), "long": Longitude(item["Long"]),},
                     # History.
                     "history": history,
                     # Latest statistic.
@@ -178,7 +178,7 @@ async def get_locations():
                 location["country"],
                 location["province"],
                 # Coordinates.
-                Coordinates(latitude=coordinates["lat"], longitude=coordinates["long"]),
+                Coordinates(latitude=Latitude(coordinates["lat"]), longitude=Longitude(coordinates["long"]),
                 # Last update.
                 datetime.utcnow().isoformat() + "Z",
                 # Timelines (parse dates as ISO).