Merge remote-tracking branch 'upstream/master'

[nominatim.git] / test / bdd / steps / check_functions.py

diff --git a/test/bdd/steps/check_functions.py b/test/bdd/steps/check_functions.py
index 6d25dd18d73f0f75c824cabeb3b1b1a5ff34dda0..a0713faefbcb328fef3f1f3082b6b96af20d2699 100644 (file)
--- a/test/bdd/steps/check_functions.py
+++ b/test/bdd/steps/check_functions.py
@@ -3,10 +3,35 @@ Collection of assertion functions used for the steps.
 """
 
 class Almost:
 """
 
 class Almost:

-
+    """ Compares a float value with a certain jitter.
+    """

     def __init__(self, value, offset=0.00001):
         self.value = value
         self.offset = offset
 
     def __eq__(self, other):
         return abs(other - self.value) < self.offset
     def __init__(self, value, offset=0.00001):
         self.value = value
         self.offset = offset
 
     def __eq__(self, other):
         return abs(other - self.value) < self.offset

+
+class Bbox:
+    """ Comparator for bounding boxes.
+    """
+    def __init__(self, bbox_string):
+        self.coord = [float(x) for x in bbox_string.split(',')]
+
+    def __contains__(self, item):
+        if isinstance(item, str):
+            item = item.split(',')
+        item = list(map(float, item))
+
+        if len(item) == 2:
+            return self.coord[0] <= item[0] <= self.coord[2] \
+                   and self.coord[1] <= item[1] <= self.coord[3]
+
+        if len(item) == 4:
+            return item[0] >= self.coord[0] and item[1] <= self.coord[1] \
+                   and item[2] >= self.coord[2] and item[3] <= self.coord[3]
+
+        raise ValueError("Not a coordinate or bbox.")
+
+    def __str__(self):
+        return str(self.coord)