Revert "Support other units than nm for datasets (#7783)" (#7896)

This reverts commit b6930e5.

Author: fm3

CHANGELOG.unreleased.md

@@ -16,7 +16,6 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Added the option to set a default mapping for a dataset in the dataset view configuration. The default mapping is loaded when the dataset is opened and the user / url does not configure something else. [#7858](https://github.com/scalableminds/webknossos/pull/7858)
 - Uploading an annotation into a dataset that it was not created for now also works if the dataset is in a different organization. [#7816](https://github.com/scalableminds/webknossos/pull/7816)
 - When downloading + reuploading an annotation that is based on a segmentation layer with active mapping, that mapping is now still be selected after the reupload. [#7822](https://github.com/scalableminds/webknossos/pull/7822)
-- Added the ability to change the unit of the dataset voxel size to any supported unit of the [ome/ngff standard](https://github.com/ome/ngff/blob/39605eec64ceff481bb3a98f0adeaa330ab1ef26/latest/index.bs#L192). This allows users to upload and work with low-resolution datasets with a different base unit than nanometer. [#7783](https://github.com/scalableminds/webknossos/pull/7783)
 - In the Voxelytics workflow list, the name of the WEBKNOSSOS user who started the job is displayed. [#7794](https://github.com/scalableminds/webknossos/pull/7795)
 - Start an alignment job (aligns the section in a dataset) via the "AI Analysis" button. [#7820](https://github.com/scalableminds/webknossos/pull/7820)
 - Added additional validation for the animation job modal. Bounding boxes must be larger then zero. [#7883](https://github.com/scalableminds/webknossos/pull/7883)
@@ -39,8 +38,6 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Fixed that dataset composition did not work when selecting only one dataset for composition. [#7889](https://github.com/scalableminds/webknossos/pull/7889)
 
 ### Removed
-- REST API versions 1 and 2 are no longer supported. Current is 7.
-data
 - If the datasource-properties.json file for a dataset is missing or contains errors, WEBKNOSSOS no longer attempts to guess its contents from the raw data. Exploring remote datasets will still create the file. [#7697](https://github.com/scalableminds/webknossos/pull/7697)
 
 ### Breaking Changes

MIGRATIONS.unreleased.md

@@ -17,4 +17,3 @@ User-facing changes are documented in the [changelog](CHANGELOG.released.md).
 - [114-ai-models.sql](conf/evolutions/114-ai-models.sql)
 - [115-annotation-locked-by-user.sql](conf/evolutions/115-annotation-locked-by-user.sql)
 - [116-drop-overtimemailinglist.sql](conf/evolutions/116-drop-overtimemailinglist.sql)
-- [117-voxel-size-unit.sql](conf/evolutions/117-voxel-size-unit.sql)

app/controllers/AnnotationController.scala

@@ -398,8 +398,8 @@ class AnnotationController @Inject()(
     allItems.grouped(batchSize).toList
   }
 
-  private def percent(done: Int, pending: Int) = {
-    val value = done.toDouble / pending.toDouble * 100
+  private def percent(done: Int, todo: Int) = {
+    val value = done.toDouble / todo.toDouble * 100
     f"$value%1.1f %%"
   }
 

app/controllers/AnnotationIOController.scala

@@ -424,7 +424,7 @@ class AnnotationIOController @Inject()(
           "temp",
           fetchedAnnotationLayers,
           Some(annotation),
-          dataset.voxelSize,
+          dataset.scale,
           None,
           organizationName,
           conf.Http.uri,
@@ -452,7 +452,7 @@ class AnnotationIOController @Inject()(
                                                 volumeVersion,
                                                 skipVolumeData,
                                                 volumeDataZipFormat,
-                                                dataset.voxelSize)
+                                                dataset.scale)
         } ?~> "annotation.download.fetchVolumeLayer.failed"
         fetchedSkeletonLayers: List[FetchedAnnotationLayer] <- Fox.serialCombined(annotation.skeletonAnnotationLayers) {
           skeletonAnnotationLayer =>
@@ -464,7 +464,7 @@ class AnnotationIOController @Inject()(
           name,
           fetchedSkeletonLayers ::: fetchedVolumeLayers,
           Some(annotation),
-          dataset.voxelSize,
+          dataset.scale,
           None,
           organizationName,
           conf.Http.uri,

app/controllers/JobController.scala

@@ -1,7 +1,7 @@
 package controllers
 
 import play.silhouette.api.Silhouette
-import com.scalableminds.util.geometry.{BoundingBox, Vec3Double, Vec3Int}
+import com.scalableminds.util.geometry.Vec3Int
 import com.scalableminds.util.accesscontext.GlobalAccessContext
 import com.scalableminds.util.tools.Fox
 import models.dataset.{DataStoreDAO, DatasetDAO, DatasetService}
@@ -19,7 +19,7 @@ import java.util.Date
 import javax.inject.Inject
 import scala.concurrent.ExecutionContext
 import com.scalableminds.util.enumeration.ExtendedEnumeration
-import com.scalableminds.webknossos.datastore.models.{LengthUnit, VoxelSize}
+import com.scalableminds.util.geometry.BoundingBox
 import models.team.PricingPlan
 
 object MovieResolutionSetting extends ExtendedEnumeration {
@@ -109,18 +109,12 @@ class JobController @Inject()(
   }
 
   // Note that the dataset has to be registered by reserveUpload via the datastore first.
-  def runConvertToWkwJob(organizationName: String,
-                         datasetName: String,
-                         scale: String,
-                         unit: Option[String]): Action[AnyContent] =
+  def runConvertToWkwJob(organizationName: String, datasetName: String, scale: String): Action[AnyContent] =
     sil.SecuredAction.async { implicit request =>
       log(Some(slackNotificationService.noticeFailedJobRequest)) {
         for {
           organization <- organizationDAO.findOneByName(organizationName) ?~> Messages("organization.notFound",
                                                                                        organizationName)
-          voxelSizeFactor <- Vec3Double.fromUriLiteral(scale).toFox
-          voxelSizeUnit <- Fox.runOptional(unit)(u => LengthUnit.fromString(u).toFox)
-          voxelSize = VoxelSize.fromFactorAndUnitWithDefault(voxelSizeFactor, voxelSizeUnit)
           _ <- bool2Fox(request.identity._organization == organization._id) ~> FORBIDDEN
           dataset <- datasetDAO.findOneByNameAndOrganization(datasetName, organization._id) ?~> Messages(
             "dataset.notFound",
@@ -130,7 +124,7 @@ class JobController @Inject()(
             "organization_name" -> organizationName,
             "organization_display_name" -> organization.displayName,
             "dataset_name" -> datasetName,
-            "scale" -> voxelSize.toNanometer.toUriLiteral
+            "scale" -> scale
           )
           job <- jobService.submitJob(command, commandArgs, request.identity, dataset._dataStore) ?~> "job.couldNotRunCubing"
           js <- jobService.publicWrites(job)