updated intersects filter builder to look for a geojson geom vs feature

Author: joshfix

staccato-application/src/main/java/com/planet/staccato/exceptions/ErrorResponseComposer.java

@@ -40,6 +40,7 @@ public Optional<StacException> compose(T ex) {
         // find a handler for the exception
         // if no handler is found,
         // loop into for its cause (ex.getCause())
+        T originalEx = ex;
         while (ex != null) {
             handler = handlers.get(ex.getClass().getSimpleName());
 
@@ -54,6 +55,12 @@ public Optional<StacException> compose(T ex) {
             return Optional.of(handler.getErrorResponse(ex));
         }
 
+        if (ex == null) {
+            ex = originalEx;
+        }
+
         return Optional.of(new StacException(String.valueOf(HttpStatus.BAD_REQUEST.value()), ex.getMessage()));
+
+
     }
 }

staccato-elasticsearch/src/main/java/com/planet/staccato/es/QueryBuilderHelper.java

@@ -159,10 +159,15 @@ public static Optional<QueryBuilder> intersectsBuilder(Object intersects) {
             return Optional.empty();
         }
         Map<String, Object> intersectsMap = (Map<String, Object>) intersects;
-        Map<String, Object> geometryMap = (Map<String, Object>) intersectsMap.get("geometry");
-        String type = (String) geometryMap.get("type");
+        String type = (String) intersectsMap.get("type");
+        if (type == null || type.isBlank()) {
+            throw new FilterException("Unable to determine geometry type from intersects parameter");
+        }
 
-        List coords = (List) geometryMap.get("coordinates");
+        List coords = (List) intersectsMap.get("coordinates");
+        if (coords == null) {
+            throw new FilterException("Unable to determine coordinates from intersects parameter");
+        }
         if (coords.isEmpty()) {
             return Optional.empty();
         }