Fix priority bounds check for Multi* geometry types and bypass cache in updateTaskPriorities

app/org/maproulette/framework/model/Challenge.scala

@@ -289,7 +289,7 @@
     * @param boundingPolygons List of bounding polygon GeoJSON features
     * @return true if any part of the geometry is within any bounding polygon
     */
   private def checkGeometryWithinBounds(
       geometry: JsValue,
       boundingPolygons: List[JsValue]
   ): Boolean = {
@@ -297,24 +297,44 @@
       (geometry \ "type").asOpt[String] match {
         case Some("Point") =>
           val coordinates = (geometry \ "coordinates").as[List[Double]]
-          if (coordinates.length == 2) {
+          if (coordinates.length >= 2) {
             val x = coordinates(0) // longitude
             val y = coordinates(1) // latitude
             boundingPolygons.exists(polygon => isPointInPolygon(x, y, polygon))
           } else {
             false
           }
+        case Some("MultiPoint") =>
+          val points = (geometry \ "coordinates").as[List[List[Double]]]
+          points.exists(coord => {
+            if (coord.length >= 2) {
+              boundingPolygons.exists(polygon => isPointInPolygon(coord(0), coord(1), polygon))
+            } else {
+              false
+            }
+          })
         case Some("LineString") =>
           val coordinates = (geometry \ "coordinates").as[List[List[Double]]]
           coordinates.exists(coord => {
-            if (coord.length == 2) {
+            if (coord.length >= 2) {
               val x = coord(0) // longitude
               val y = coord(1) // latitude
               boundingPolygons.exists(polygon => isPointInPolygon(x, y, polygon))
             } else {
               false
             }
           })
+        case Some("MultiLineString") =>
+          val lines = (geometry \ "coordinates").as[List[List[List[Double]]]]
+          lines.exists(line =>
+            line.exists(coord => {
+              if (coord.length >= 2) {
+                boundingPolygons.exists(polygon => isPointInPolygon(coord(0), coord(1), polygon))
+              } else {
+                false
+              }
+            })
+          )
         case Some("Polygon") =>
           // Check if any vertex of the polygon's exterior ring is within bounds
           val rings = (geometry \ "coordinates").as[List[List[List[Double]]]]
@@ -327,6 +347,19 @@
               }
             })
           )
+        case Some("MultiPolygon") =>
+          val polygons = (geometry \ "coordinates").as[List[List[List[List[Double]]]]]
+          polygons.exists(polygon =>
+            polygon.headOption.exists(ring =>
+              ring.exists(coord => {
+                if (coord.length >= 2) {
+                  boundingPolygons.exists(bp => isPointInPolygon(coord(0), coord(1), bp))
+                } else {
+                  false
+                }
+              })
+            )
+          )
         case Some("GeometryCollection") =>
           val geometries = (geometry \ "geometries").as[List[JsValue]]
           geometries.exists(subGeometry => checkGeometryWithinBounds(subGeometry, boundingPolygons))

app/org/maproulette/models/dal/ChallengeDAL.scala

@@ -928,7 +928,8 @@ class ChallengeDAL @Inject() (
   )(implicit id: Long, c: Option[Connection] = None): Unit = {
     this.permission.hasWriteAccess(ChallengeType(), user)
     this.withMRConnection { implicit c =>
-      val challenge = this.retrieveById(id) match {
+      // Bypass cache to ensure we get the latest bounds from the DB
+      val challenge = this._retrieveById(caching = false) match {
         case Some(c) => c
         case None =>
           throw new NotFoundException(