Make use of colander.Range for lon/lat (ref #30)

spiral-project · Dec 6, 2012 · 211ff13 · almet · Dec 7, 2012 · 211ff13
1 parent c2c56be
commit 211ff13
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/daybed/schemas.py b/daybed/schemas.py
@@ -152,10 +152,11 @@ def __init__(self, *args, **kwargs):
 
     def deserialize(self, cstruct=null):
         deserialized = super(PointNode, self).deserialize(cstruct)
-        if self.gps and not -180.0 <= deserialized[0] <= 180.0:
-            raise Invalid(self, "Invalid longitude", cstruct)
-        if self.gps and not -90.0 <= deserialized[1] <= 90.0:
-            raise Invalid(self, "Invalid latitude", cstruct)
+        longitude = Range(min=-180.0, max=180.0)
+        latitude  = Range(min=-90.0, max=90.0)
+        if self.gps:
+            longitude(self, deserialized[0])
+            latitude(self, deserialized[1])
         return deserialized