Add ability to bound coordinates for world positions (refs #30)

daybed/schemas.py

@@ -7,9 +7,11 @@
     Int,
     Float,
     OneOf,
+    Range,
     Length,
     Regex,
     null,
+    Invalid,
 )
 
 
@@ -140,22 +142,33 @@ def validation(cls, **kwargs):
 
 class PointNode(SchemaNode):
     """Represents a position (x, y, z, ...)"""
+    coordinate = True
+
     def __init__(self, *args, **kwargs):
         defaults = dict(validator=Length(min=2))
         defaults.update(**kwargs)
         super(PointNode, self).__init__(Sequence(), SchemaNode(Float()), **defaults)
 
+    def deserialize(self, cstruct=null):
+        deserialized = super(PointNode, self).deserialize(cstruct)
+        if self.coordinate and not -180.0 <= deserialized[0] <= 180.0:
+            raise Invalid(self, "Invalid longitude", cstruct)
+        if self.coordinate and not -90.0 <= deserialized[1] <= 90.0:
+            raise Invalid(self, "Invalid latitude", cstruct)
+        return deserialized
+
 
 class GeometryField(TypeField):
     """Base field for geometry values: basically a list of PointNode."""
     node = Sequence
+    subnode = PointNode
     dimension = None
 
     @classmethod
     def validation(cls, **kwargs):
         kwargs['validator'] = Length(min=cls.dimension + 1)
         validation = super(GeometryField, cls).validation(**kwargs)
-        validation.children = [PointNode()]
+        validation.add(cls.subnode())
         return validation
 
 
@@ -201,3 +214,4 @@ def __init__(self, definition):
         for field in definition['fields']:
             fieldtype = field.pop('type')
             self.add(registry.validation(fieldtype, **field))
+

daybed/tests/test_types.py

@@ -49,6 +49,15 @@ def test_point_node(self):
         self.assertRaises(colander.Invalid, schema.deserialize, '"0.4, 45.0"')
         self.assertRaises(colander.Invalid, schema.deserialize, ["a", "b"])
 
+    def test_coordinate_node(self):
+        schema = schemas.PointNode(coordinate=False)
+        self.assertEquals([181.0, 91.0], schema.deserialize([181.0, 91.0]))
+        schema = schemas.PointNode()
+        self.assertRaises(colander.Invalid, schema.deserialize, [181.0, 91.0])
+        self.assertRaises(colander.Invalid, schema.deserialize, [-181.0, -91.0])
+        self.assertRaises(colander.Invalid, schema.deserialize, [120.0, -91.0])
+        self.assertEquals([0.4, 45.0, 181], schema.deserialize([0.4, 45.0, 181]))
+
     def test_point(self):
         schema = schemas.PointField.definition()
         definition = schema.deserialize(