Adjusting time_interval_interpretation for time intervals with equal …

…start and stop time.
EOxServer · Jun 1, 2015 · 24b75e8 · 24b75e8
1 parent 6ad73a4
commit 24b75e8
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/eoxserver/resources/coverages/filters.py b/eoxserver/resources/coverages/filters.py
@@ -781,11 +781,16 @@ def applyToQuerySet(self, expr, qs):
                         eo_metadata__timestamp_end__gt=begin
                     )
                 else:
-                    return qs.exclude(
-                        eo_metadata__timestamp_begin__gte=end
-                    ).exclude(
-                        eo_metadata__timestamp_end__lte=begin
-                    )
+                    if begin == end:
+                        return qs.filter(
+                            eo_metadata__timestamp_begin__lte=end,
+                            eo_metadata__timestamp_end__gte=begin
+                        )
+                    else:
+                        return qs.filter(
+                            eo_metadata__timestamp_begin__lt=end,
+                            eo_metadata__timestamp_end__gt=begin
+                        )
         else:
             if begin == "unbounded":
                 if end == "unbounded":
@@ -800,10 +805,9 @@ def applyToQuerySet(self, expr, qs):
                         eo_metadata__timestamp_end__gte=begin
                     )
                 else:
-                    return qs.exclude(
-                        eo_metadata__timestamp_begin__gt=end
-                    ).exclude(
-                        eo_metadata__timestamp_end__lt=begin
+                    return qs.filter(
+                        eo_metadata__timestamp_begin__lte=end,
+                        eo_metadata__timestamp_end__gte=begin
                     )
 
     def resourceMatches(self, expr, res):
@@ -896,10 +900,16 @@ def applyToQuerySet(self, expr, qs):
                         eo_metadata__timestamp_begin__gt=begin
                     )
                 else:
-                    return qs.filter(
-                        eo_metadata__timestamp_begin__gt=begin,
-                        eo_metadata__timestamp_end__lt=end
-                    )
+                    if begin == end:
+                        return qs.filter(
+                            eo_metadata__timestamp_begin__gte=begin,
+                            eo_metadata__timestamp_end__lte=end
+                        )
+                    else:
+                        return qs.filter(
+                            eo_metadata__timestamp_begin__gt=begin,
+                            eo_metadata__timestamp_end__lt=end
+                        )
         else:
             if begin == "unbounded":
                 if end == "unbounded":