fix approx geocoords for 0.0 values

Author: Anthony Li

backend/market/models.py

@@ -132,19 +132,15 @@ class Sublet(Listing):
     baths = models.PositiveIntegerField()
     start_date = models.DateField()
     end_date = models.DateField()
-
     latitude = models.FloatField(null=True, blank=True)
     longitude = models.FloatField(null=True, blank=True)
 
-
     def clean(self):
         super().clean()
         if self.start_date and self.end_date and self.start_date >= self.end_date:
             raise ValidationError({"end_date": "End date must be after start date"})
 
     def _calculate_approximate_location(self, latitude, longitude):
-
-
         if latitude is None or longitude is None:
             return None, None
 
@@ -165,20 +161,12 @@ def _calculate_approximate_location(self, latitude, longitude):
         return approx_lat, approx_lon
 
     @property
-    def approximate_latitude(self):
-        if self.latitude and self.longitude:
-            approximate_latitude, _ = self._calculate_approximate_location(
-                self.latitude, self.longitude)
-            return approximate_latitude
-        return None
-
-    @property
-    def approximate_longitude(self):
-        if self.latitude and self.longitude:
-            _, approximate_lon = self._calculate_approximate_location(
+    def approximate_location(self):
+        if self.latitude is not None and self.longitude is not None:
+            approximate_location = self._calculate_approximate_location(
                 self.latitude, self.longitude)
-            return approximate_lon
-        return None
+            return approximate_location
+        return None, None
 
     def save(self, *args, **kwargs):
         self.full_clean()

backend/market/serializers.py

@@ -108,13 +108,13 @@ class Meta:
             "latitude", "longitude"]
 
     def get_latitude(self, obj):
-        if obj.approximate_latitude:
-            return float(obj.approximate_latitude)
+        if obj.approximate_location is not None:
+            return float(obj.approximate_location[0])
         return None
 
     def get_longitude(self, obj):
-        if obj.approximate_longitude:
-            return float(obj.approximate_longitude)
+        if obj.approximate_location is not None:
+            return float(obj.approximate_location[1])
         return None
 
 # Unified serializer for all listing types (Items and Sublets); used for CRUD operations
@@ -340,14 +340,16 @@ def _update_item(self, instance, additional_data):
 
     def _update_sublet(self, instance, additional_data):
         sublet = instance.sublet
-        sublet_fields = ["street_address", "beds", "baths", "start_date", "end_date"]
-        for field in sublet_fields:
+        str_fields = ["street_address", "beds", "baths", "start_date", "end_date"]
+        float_fields = ["latitude", "longitude"]
+        for field in str_fields:
             if field in additional_data:
                 setattr(sublet, field, additional_data[field])
-        if "latitude" in additional_data:
-            sublet.latitude = float(additional_data["latitude"])
-        if "longitude" in additional_data:
-            sublet.longitude = float(additional_data["longitude"])
+        
+        for field in float_fields:
+            if field in additional_data:
+                value = additional_data[field]
+                setattr(sublet, field, float(value) if value is not None else None)
         sublet.full_clean()
         sublet.save()