In Data Loading, Clip to Layer BoundingBox (Redo #8551) (#8573)

* Revert "Revert "In Data Loading, Clip to Layer BoundingBox (#8551)" (#8572)"

This reverts commit d30f8d8.

* null check for request.dataSource

* data requests: use Option[DataSourceId] rather than nullable DataSource

* format

* implement pr feedback

---------

Co-authored-by: Florian M <[email protected]>

Author: MichaelBuessemeyer

CHANGELOG.unreleased.md

@@ -18,10 +18,11 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Remove `data.maybe` dependency and replaced with regular Typescript types. [#8563](https://github.com/scalableminds/webknossos/pull/8563)
 - Updated `View Modes` documentation page with links for mouse and keyboard shortcuts. [#8582](https://github.com/scalableminds/webknossos/pull/8582)
 - Renamed the button to view the compound annotation of all tasks of a tasktype to be more descriptive. [#8565](https://github.com/scalableminds/webknossos/pull/8565)
-- Replaced fixed threshold of 40 meshes by a dynamic limit based on the number of triangles in the mesh for the "Create Animation" job. [#8588](https://github.com/scalableminds/webknossos/pull/8588) 
+- Replaced fixed threshold of 40 meshes by a dynamic limit based on the number of triangles in the mesh for the "Create Animation" job. [#8588](https://github.com/scalableminds/webknossos/pull/8588)
 - Replaced Redux selector `useSelector((state: OxalisState) => ...)` with a typed `useWkSelector(state => ...)` shorthand. [#8591](https://github.com/scalableminds/webknossos/pull/8591)
 - Renamed `OxalisState`, `OxalisApplication`, and `OxalisApi` to their respective `Webknossos{State, API, Application}` equivalent [#8591](https://github.com/scalableminds/webknossos/pull/8591)
 - Renamed `frontend/javascripts/oxalis` to `frontend/javascripts/viewer`. [#8601](https://github.com/scalableminds/webknossos/pull/8601)
+- When loading data from a data layer that has data stored beyond the bounding box specified in the datasource-properties.json, data outside of the bounding box is now zeroed. (the layer is “clipped”). [#8551](https://github.com/scalableminds/webknossos/pull/8551)
 
 ### Fixed
 - Fixed that layer bounding boxes were sometimes colored green even though this should only happen for tasks. [#8535](https://github.com/scalableminds/webknossos/pull/8535)

util/src/main/scala/com/scalableminds/util/geometry/BoundingBox.scala

@@ -6,7 +6,7 @@ import play.api.libs.json.{JsObject, Json}
 
 case class BoundingBox(topLeft: Vec3Int, width: Int, height: Int, depth: Int) {
 
-  val bottomRight: Vec3Int = topLeft.move(width, height, depth)
+  lazy val bottomRight: Vec3Int = topLeft.move(width, height, depth)
 
   def intersects(other: BoundingBox): Boolean =
     math.max(topLeft.x, other.topLeft.x) < math.min(bottomRight.x, other.bottomRight.x) &&
@@ -45,6 +45,9 @@ case class BoundingBox(topLeft: Vec3Int, width: Int, height: Int, depth: Int) {
     BoundingBox(Vec3Int(x, y, z), w, h, d)
   }
 
+  def isFullyContainedIn(other: BoundingBox): Boolean =
+    this.intersection(other).contains(this)
+
   def isEmpty: Boolean =
     width <= 0 || height <= 0 || depth <= 0
 
@@ -61,6 +64,9 @@ case class BoundingBox(topLeft: Vec3Int, width: Int, height: Int, depth: Int) {
     // Since floorDiv is used for topLeft, ceilDiv is used for the size to avoid voxels being lost at the border
     BoundingBox(topLeft / that, ceilDiv(width, that.x), ceilDiv(height, that.y), ceilDiv(depth, that.z))
 
+  def move(delta: Vec3Int): BoundingBox =
+    this.copy(topLeft = this.topLeft + delta)
+
   def toSql: List[Int] =
     List(topLeft.x, topLeft.y, topLeft.z, width, height, depth)
 

util/src/main/scala/com/scalableminds/util/geometry/Vec3Int.scala

@@ -23,6 +23,9 @@ case class Vec3Int(x: Int, y: Int, z: Int) {
   def /(that: Vec3Int): Vec3Int =
     Vec3Int(x / that.x, y / that.y, z / that.z)
 
+  def unary_- : Vec3Int =
+    Vec3Int(-x, -y, -z)
+
   def scale(s: Float): Vec3Int =
     Vec3Int((x * s).toInt, (y * s).toInt, (z * s).toInt)
 
@@ -53,8 +56,6 @@ case class Vec3Int(x: Int, y: Int, z: Int) {
   def move(other: Vec3Int): Vec3Int =
     move(other.x, other.y, other.z)
 
-  def negate: Vec3Int = Vec3Int(-x, -y, -z)
-
   def to(bottomRight: Vec3Int): Seq[Vec3Int] =
     range(bottomRight, _ to _)
 

webknossos-datastore/app/com/scalableminds/webknossos/datastore/controllers/BinaryDataController.scala

@@ -63,7 +63,7 @@ class BinaryDataController @Inject()(
           (dataSource, dataLayer) <- dataSourceRepository.getDataSourceAndDataLayer(organizationId,
                                                                                     datasetDirectoryName,
                                                                                     dataLayerName) ~> NOT_FOUND
-          (data, indices) <- requestData(dataSource, dataLayer, request.body)
+          (data, indices) <- requestData(dataSource.id, dataLayer, request.body)
           duration = Instant.since(t)
           _ = if (duration > (10 seconds))
             logger.info(
@@ -111,7 +111,7 @@ class BinaryDataController @Inject()(
           depth,
           DataServiceRequestSettings(halfByte = halfByte, appliedAgglomerate = mappingName)
         )
-        (data, indices) <- requestData(dataSource, dataLayer, dataRequest)
+        (data, indices) <- requestData(dataSource.id, dataLayer, dataRequest)
       } yield Ok(data).withHeaders(createMissingBucketsHeaders(indices): _*)
     }
   }
@@ -127,7 +127,7 @@ class BinaryDataController @Inject()(
         (dataSource, dataLayer) <- dataSourceRepository.getDataSourceAndDataLayer(organizationId,
                                                                                   datasetDirectoryName,
                                                                                   dataLayerName) ~> NOT_FOUND
-        (data, indices) <- requestData(dataSource, dataLayer, request.body)
+        (data, indices) <- requestData(dataSource.id, dataLayer, request.body)
       } yield Ok(data).withHeaders(createMissingBucketsHeaders(indices): _*)
     }
   }
@@ -155,7 +155,7 @@ class BinaryDataController @Inject()(
           cubeSize,
           cubeSize
         )
-        (data, indices) <- requestData(dataSource, dataLayer, dataRequest)
+        (data, indices) <- requestData(dataSource.id, dataLayer, dataRequest)
       } yield Ok(data).withHeaders(createMissingBucketsHeaders(indices): _*)
     }
   }
@@ -189,7 +189,7 @@ class BinaryDataController @Inject()(
           depth = 1,
           DataServiceRequestSettings(appliedAgglomerate = mappingName)
         )
-        (data, _) <- requestData(dataSource, dataLayer, dataRequest)
+        (data, _) <- requestData(dataSource.id, dataLayer, dataRequest)
         intensityRange: Option[(Double, Double)] = intensityMin.flatMap(min => intensityMax.map(max => (min, max)))
         layerColor = color.flatMap(Color.fromHTML)
         params = ImageCreatorParameters(
@@ -228,7 +228,7 @@ class BinaryDataController @Inject()(
                                                                                   datasetDirectoryName,
                                                                                   dataLayerName) ~> NOT_FOUND
         segmentationLayer <- tryo(dataLayer.asInstanceOf[SegmentationLayer]).toFox ?~> Messages("dataLayer.notFound")
-        mappingRequest = DataServiceMappingRequest(dataSource, segmentationLayer, mappingName)
+        mappingRequest = DataServiceMappingRequest(Some(dataSource.id), segmentationLayer, mappingName)
         result <- mappingService.handleMappingRequest(mappingRequest)
       } yield Ok(result)
     }
@@ -249,7 +249,7 @@ class BinaryDataController @Inject()(
                                                                                     dataLayerName) ~> NOT_FOUND
           segmentationLayer <- tryo(dataLayer.asInstanceOf[SegmentationLayer]).toFox ?~> "dataLayer.mustBeSegmentation"
           adHocMeshRequest = AdHocMeshRequest(
-            Some(dataSource),
+            Some(dataSource.id),
             segmentationLayer,
             request.body.cuboid(dataLayer),
             request.body.segmentId,
@@ -287,7 +287,7 @@ class BinaryDataController @Inject()(
           (dataSource, dataLayer) <- dataSourceRepository.getDataSourceAndDataLayer(organizationId,
                                                                                     datasetDirectoryName,
                                                                                     dataLayerName) ~> NOT_FOUND
-          positionAndMagOpt <- findDataService.findPositionWithData(dataSource, dataLayer)
+          positionAndMagOpt <- findDataService.findPositionWithData(dataSource.id, dataLayer)
         } yield Ok(Json.obj("position" -> positionAndMagOpt.map(_._1), "mag" -> positionAndMagOpt.map(_._2)))
       }
     }
@@ -301,19 +301,19 @@ class BinaryDataController @Inject()(
                                                                                     datasetDirectoryName,
                                                                                     dataLayerName) ?~> Messages(
             "dataSource.notFound") ~> NOT_FOUND ?~> Messages("histogram.layerMissing", dataLayerName)
-          listOfHistograms <- findDataService.createHistogram(dataSource, dataLayer) ?~> Messages("histogram.failed",
-                                                                                                  dataLayerName)
+          listOfHistograms <- findDataService.createHistogram(dataSource.id, dataLayer) ?~> Messages("histogram.failed",
+                                                                                                     dataLayerName)
         } yield Ok(Json.toJson(listOfHistograms))
       }
     }
 
   private def requestData(
-      dataSource: DataSource,
+      dataSourceId: DataSourceId,
       dataLayer: DataLayer,
       dataRequests: DataRequestCollection
   )(implicit tc: TokenContext): Fox[(Array[Byte], List[Int])] = {
     val requests =
-      dataRequests.map(r => DataServiceDataRequest(dataSource, dataLayer, r.cuboid(dataLayer), r.settings))
+      dataRequests.map(r => DataServiceDataRequest(Some(dataSourceId), dataLayer, r.cuboid(dataLayer), r.settings))
     binaryDataService.handleDataRequests(requests)
   }
 

webknossos-datastore/app/com/scalableminds/webknossos/datastore/controllers/ZarrStreamingController.scala

@@ -276,7 +276,7 @@ class ZarrStreamingController @Inject()(
       _ <- Fox.fromBool(dataLayer.containsMag(magParsed)) ?~> Messages("dataLayer.wrongMag", dataLayerName, mag) ~> NOT_FOUND
       cubeSize = DataLayer.bucketLength
       request = DataServiceDataRequest(
-        dataSource,
+        Some(dataSource.id),
         dataLayer,
         Cuboid(
           topLeft = VoxelPosition(x * cubeSize * magParsed.x,

webknossos-datastore/app/com/scalableminds/webknossos/datastore/dataformats/DatasetArrayBucketProvider.scala

@@ -73,7 +73,7 @@ class DatasetArrayBucketProvider(dataLayer: DataLayer,
           case Some(remoteSourceDescriptorService: RemoteSourceDescriptorService) =>
             for {
               magPath: VaultPath <- remoteSourceDescriptorService.vaultPathFor(readInstruction.baseDir,
-                                                                               readInstruction.dataSource.id,
+                                                                               readInstruction.dataSourceId,
                                                                                readInstruction.dataLayer.name,
                                                                                magLocator)
               chunkContentsCache <- sharedChunkContentsCacheOpt.toFox

webknossos-datastore/app/com/scalableminds/webknossos/datastore/dataformats/MappingProvider.scala

@@ -12,8 +12,8 @@ class MappingProvider(layer: SegmentationLayer) {
 
   def load(readInstruction: MappingReadInstruction): Box[Array[Byte]] = {
     val mappingFile = readInstruction.baseDir
-      .resolve(readInstruction.dataSource.id.organizationId)
-      .resolve(readInstruction.dataSource.id.directoryName)
+      .resolve(readInstruction.dataSourceId.organizationId)
+      .resolve(readInstruction.dataSourceId.directoryName)
       .resolve(layer.name)
       .resolve(MappingProvider.mappingsDir)
       .resolve(s"${readInstruction.mapping}.${MappingProvider.mappingFileExtension}")

webknossos-datastore/app/com/scalableminds/webknossos/datastore/models/datasource/DataSource.scala

@@ -8,7 +8,7 @@ import play.api.libs.json._
 package object datasource {
 
   case class DataSourceId(directoryName: String, organizationId: String) {
-    override def toString: String = s"DataSourceId($organizationId/$directoryName)"
+    override def toString: String = s"$organizationId/$directoryName"
   }
 
   object DataSourceId {

webknossos-datastore/app/com/scalableminds/webknossos/datastore/models/requests/Cuboid.scala

@@ -1,6 +1,6 @@
 package com.scalableminds.webknossos.datastore.models.requests
 
-import com.scalableminds.util.geometry.Vec3Int
+import com.scalableminds.util.geometry.{BoundingBox, Vec3Int}
 import com.scalableminds.webknossos.datastore.models.{BucketPosition, VoxelPosition}
 
 /**
@@ -51,4 +51,10 @@ case class Cuboid(topLeft: VoxelPosition, width: Int, height: Int, depth: Int) {
     height * mag.y,
     depth * mag.z
   )
+
+  def toBoundingBoxInMag: BoundingBox =
+    BoundingBox(Vec3Int(topLeft.voxelXInMag, topLeft.voxelYInMag, topLeft.voxelZInMag), width, height, depth)
+
+  def toMag1BoundingBox: BoundingBox =
+    toMag1.toBoundingBoxInMag
 }

webknossos-datastore/app/com/scalableminds/webknossos/datastore/models/requests/DataServiceRequests.scala

@@ -1,7 +1,8 @@
 package com.scalableminds.webknossos.datastore.models.requests
 
+import com.scalableminds.util.geometry.Vec3Int
 import com.scalableminds.webknossos.datastore.models.{AdditionalCoordinate, BucketPosition}
-import com.scalableminds.webknossos.datastore.models.datasource.{DataLayer, DataSource, SegmentationLayer}
+import com.scalableminds.webknossos.datastore.models.datasource.{DataLayer, DataSourceId, SegmentationLayer}
 
 import java.nio.file.Path
 
@@ -15,32 +16,41 @@ object DataServiceRequestSettings {
 }
 
 case class DataServiceDataRequest(
-    dataSource: DataSource, // null in VolumeTracings
+    dataSourceId: Option[DataSourceId], // None in case of volume tracings
     dataLayer: DataLayer,
     cuboid: Cuboid,
     settings: DataServiceRequestSettings
 ) {
   def isSingleBucket: Boolean = cuboid.isSingleBucket(DataLayer.bucketLength)
+  def mag: Vec3Int = cuboid.mag
+
+  // dataSource is None and unused for volume tracings. Insert dummy DataSourceId
+  // (also unused in that case, except for logging and bucket provider cache key)
+  def dataSourceIdOrVolumeDummy: DataSourceId = dataSourceId.getOrElse(DataSourceId("VolumeTracing", dataLayer.name))
 }
 
 case class DataReadInstruction(
     baseDir: Path,
-    dataSource: DataSource,
+    dataSourceId: DataSourceId, // Dummy value in case of volume tracings
     dataLayer: DataLayer,
     bucket: BucketPosition,
     version: Option[Long] = None
 ) {
-  def layerSummary: String = f"${dataSource.id.organizationId}/${dataSource.id.directoryName}/${dataLayer.name}"
+  def layerSummary: String = f"$dataSourceId/${dataLayer.name}"
 }
 
 case class DataServiceMappingRequest(
-    dataSource: DataSource,
+    dataSourceId: Option[DataSourceId], // None in case of volume tracings
     dataLayer: SegmentationLayer,
     mapping: String
-)
+) {
+  // dataSource is None and unused for volume tracings. Insert dummy DataSourceId
+  // (also unused in that case, except for logging and bucket provider cache key)
+  def dataSourceIdOrVolumeDummy: DataSourceId = dataSourceId.getOrElse(DataSourceId("VolumeTracing", dataLayer.name))
+}
 
 case class MappingReadInstruction(
     baseDir: Path,
-    dataSource: DataSource,
+    dataSourceId: DataSourceId, // Dummy value in case of volume tracings
     mapping: String
 )