Minor fix to Lucene's creation of geo fields from arrays

outr · Dec 6, 2024 · 720a045 · 720a045
1 parent 7695076
commit 720a045
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lucene/src/main/scala/lightdb/lucene/LuceneStore.scala b/lucene/src/main/scala/lightdb/lucene/LuceneStore.scala
@@ -88,7 +88,11 @@ class LuceneStore[Doc <: Document[Doc], Model <: DocumentModel[Doc]](name: Strin
 
   private def createGeoFields(field: Field[Doc, _],
                               json: Json,
-                              add: LuceneField => Unit): Unit = {
+                              add: LuceneField => Unit): Unit = if (json.isArr) {
+    json.asVector.foreach { json =>
+      createGeoFields(field, json, add)
+    }
+  } else {
     field.className match {
       case Some("lightdb.spatial.Geo.Point") =>
         val p = json.as[Geo.Point]
@@ -156,7 +160,11 @@ class LuceneStore[Doc <: Document[Doc], Model <: DocumentModel[Doc]](name: Strin
       case _ =>
         def addJson(json: Json, d: DefType): Unit = {
           if (field.isSpatial) {
-            if (json != Null) createGeoFields(field, json, add)
+            if (json != Null) try {
+              createGeoFields(field, json, add)
+            } catch {
+              case t: Throwable => throw new RuntimeException(s"Failure to populate geo field '$name.${field.name}' for $doc (json: $json)", t)
+            }
           } else {
             d match {
               case DefType.Str => json match {