I'd recommend using a getOrElse here:

```scala
getPropertyName(filter.getExpression1).map { prop =>
   val dwithinDegrees = ....
   val queryGeom = getBufferedGeom....
   Extraction(queryGeom, ..., Some(dwithinDegrees))
}.getOrElse(defaultExtraction)
```