Fixed bug in Query.stream.distance

outr · Dec 31, 2024 · a3f32b1 · a3f32b1
1 parent 5dde92d
commit a3f32b1
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/core/src/main/scala/lightdb/Query.scala b/core/src/main/scala/lightdb/Query.scala
@@ -258,8 +258,17 @@ case class Query[Doc <: Document[Doc], Model <: DocumentModel[Doc]](model: Model
                            from: Geo.Point,
                            sort: Boolean = true,
                            radius: Option[Distance] = None)
-                          (implicit transaction: Transaction[Doc]): rapid.Stream[DistanceAndDoc[Doc]] =
-      apply(Conversion.Distance(f(model), from, sort, radius))
+                          (implicit transaction: Transaction[Doc]): rapid.Stream[DistanceAndDoc[Doc]] = {
+      val field = f(model)
+      var q = Query.this
+      if (sort) {
+        q = q.clearSort.sort(Sort.ByDistance(field, from))
+      }
+      radius.foreach { r =>
+        q = q.filter(_ => field.distance(from, r))
+      }
+      rapid.Stream.force(q.distanceSearch(field, from, sort, radius).map(_.stream))
+    }
   }
 
   def toList(implicit transaction: Transaction[Doc]): Task[List[Doc]] = search.docs.flatMap(_.list)