Merge branch 'main' into add-wmts

src/api/BoreholeFileCloudService.cs

@@ -180,7 +180,7 @@ public async Task<int> CountDataExtractionObjects(string objectName)
     /// </summary>
     /// <param name="objectName">The uuid of the parent pdf.</param>
     /// <param name="index">The page number in the pdf.</param>
-    /// <returns>The name, width and height of the file.</returns>
+    /// <returns>The name, width (px) and height (px) of the file.</returns>
     public async Task<(string FileName, int Width, int Height)> GetDataExtractionImageInfo(string objectName, int index)
     {
         try

src/api/Controllers/BoreholeFileController.cs

@@ -115,15 +115,23 @@ public async Task<IActionResult> GetDataExtractionFileInfo([Required, Range(1, i
 
             var fileUuid = boreholeFile.File.NameUuid.Replace(".pdf", "", StringComparison.OrdinalIgnoreCase);
             var fileCount = await boreholeFileCloudService.CountDataExtractionObjects(fileUuid).ConfigureAwait(false);
-            var result = await boreholeFileCloudService.GetDataExtractionImageInfo(fileUuid, index).ConfigureAwait(false);
 
-            return Ok(new
+            try
             {
-                fileName = result.FileName,
-                width = result.Width,
-                height = result.Height,
-                count = fileCount,
-            });
+                var dataExtractionImageInfo = await boreholeFileCloudService.GetDataExtractionImageInfo(fileUuid, index).ConfigureAwait(false);
+                return Ok(new DataExtractionInfo(dataExtractionImageInfo.FileName, dataExtractionImageInfo.Width, dataExtractionImageInfo.Height, fileCount));
+            }
+            catch (Exception ex)
+            {
+                // No image found for the requested index, return an empty response with the file info.
+                if (ex.Message.Contains("The specified key does not exist.", StringComparison.OrdinalIgnoreCase))
+                {
+                    return Ok(new DataExtractionInfo(fileUuid, 0, 0, 0));
+                }
+
+                // Re-throw the exception so it gets handled by the outer exception handler.
+                throw;
+            }
         }
         catch (Exception ex)
         {

src/api/Models/DataExtractionInfo.cs

@@ -0,0 +1,10 @@
+namespace BDMS.Models;
+
+/// <summary>
+/// Represents the information about a data extraction file.
+/// </summary>
+/// <param name="FileName"> The name of the image.</param>
+/// <param name="Width"> The width of the image in pixels.</param>
+/// <param name="Height"> The height of the image in pixels.</param>
+/// <param name="Count"> The number of data extraction images for this file.</param>
+public record DataExtractionInfo(string FileName, int Width, int Height, int Count);

src/client/cypress/e2e/detailPage/labeling.cy.js

@@ -1,3 +1,4 @@
+import { evaluateCoordinate, evaluateSelect, hasAiStyle, hasError, isDisabled } from "../helpers/formHelpers.js";
 import {
   interceptShowLabelingCall,
   newEditableBorehole,
@@ -14,6 +15,45 @@ const isFileActive = (fileName, isActive) => {
     .should(isActive ? "exist" : "not.exist");
 };
 
+const drawBox = (x1, y1, x2, y2) => {
+  cy.get('[data-cy="labeling-draw-tooltip"]').should("to.be.visible");
+  cy.get('[data-cy="labeling-draw-tooltip"]').contains("Draw box around north & east coordinates");
+  cy.window().then(win => {
+    const interactions = win.labelingImage.getInteractions().getArray();
+    expect(
+      interactions.some(interaction => {
+        return interaction.constructor.name === "Draw";
+      }),
+    ).to.be.true;
+  });
+  cy.get('[data-cy="labeling-panel"]').trigger("pointerdown", { x: x1, y: y1 }).trigger("pointerup", { x: x1, y: y1 });
+  cy.get('[data-cy="labeling-panel"]').trigger("pointerdown", { x: x2, y: y2 }).trigger("pointerup", { x: x2, y: y2 });
+
+  cy.wait("@extract-data");
+  cy.get('[data-cy="labeling-draw-tooltip"]').should("not.to.be.visible");
+  cy.window().then(win => {
+    const interactions = win.labelingImage.getInteractions().getArray();
+    expect(
+      interactions.some(interaction => {
+        return interaction.constructor.name === "Draw";
+      }),
+    ).to.be.false;
+  });
+};
+
+const waitForLabelingImageLoaded = () => {
+  cy.wait("@extraction-file-info");
+  cy.wait("@load-extraction-file");
+  cy.window().then(win => {
+    const layers = win.labelingImage.getLayers().getArray();
+    expect(
+      layers.some(layer => {
+        return layer.constructor.name === "ImageLayer";
+      }),
+    ).to.be.true;
+  });
+};
+
 describe("Test labeling tool", () => {
   beforeEach(() => {
     interceptShowLabelingCall();
@@ -91,5 +131,147 @@ describe("Test labeling tool", () => {
     cy.get('[data-cy="labeling-file-button-select"]').contains("WOLFHEART.pdf");
     cy.get('[data-cy="button-select-popover"] .MuiListItem-root').eq(1).click();
     cy.get('[data-cy="labeling-file-button-select"]').contains("borehole_attachment_3.pdf");
+
+    // TODO: https://github.com/swisstopo/swissgeol-boreholes-suite/issues/1546
+    //  Add this once the api returns the correct file
+    // // Cannot draw if the panel was opened with the panel toggle button
+    // waitForLabelingImageLoaded();
+    // cy.window().then(win => {
+    //   const interactions = win.labelingImage.getInteractions().getArray();
+    //   expect(interactions.some(interaction => interaction.constructor.name === "Draw")).to.be.false;
+    // });
+  });
+
+  // TODO: https://github.com/swisstopo/swissgeol-boreholes-suite/issues/1546
+  //  We have to wait for the docker integration before this test can be enabled
+  it.skip("can extract data from image", () => {
+    newEditableBorehole().as("borehole_id");
+    cy.get('[data-cy="labeling-toggle-button"]').click();
+    cy.get('[data-cy="labeling-file-dropzone"]').should("exist");
+    cy.get('[data-cy="labeling-file-selector"]').contains("No documents have been uploaded yet.");
+
+    cy.get('[data-cy="labeling-file-dropzone"]').selectFile("cypress/fixtures/labeling_attachment.pdf", {
+      force: true,
+      mimeType: "application/pdf",
+      fileName: "labeling_attachment.pdf",
+    });
+
+    cy.wait("@get-borehole-files");
+    waitForLabelingImageLoaded();
+    cy.get('[data-cy="labeling-file-button-select"]').contains("labeling_attachment.pdf");
+    cy.get('[data-cy="labeling-page-count"]').contains("1 / 3");
+    cy.get('[data-cy="labeling-page-previous"]').should("be.disabled");
+    cy.get('[data-cy="labeling-page-next"]').should("not.be.disabled");
+
+    cy.get('[data-cy="coordinate-segment"] [data-cy="labeling-button"]').click();
+    evaluateSelect("spatial_reference_system", "20104001");
+    hasAiStyle("spatial_reference_system");
+    hasError("spatial_reference_system", false);
+    evaluateCoordinate("location_x", "");
+    hasAiStyle("location_x");
+    hasError("location_x", false);
+    evaluateCoordinate("location_y", "");
+    hasAiStyle("location_y");
+    hasError("location_y", false);
+    evaluateCoordinate("location_x_lv03", "");
+    hasAiStyle("location_x_lv03");
+    hasError("location_x_lv03", false);
+    isDisabled("location_x_lv03");
+    evaluateCoordinate("location_y_lv03", "");
+    hasAiStyle("location_y_lv03");
+    hasError("location_y_lv03", false);
+    isDisabled("location_y_lv03");
+
+    // Can draw box around coordinates and extract correct coordinates
+    drawBox(400, 60, 600, 170);
+    // TODO: https://github.com/swisstopo/swissgeol-boreholes-suite/issues/1546
+    //  Update all coordinates once api returns coordinates as floats
+    evaluateSelect("spatial_reference_system", "20104001");
+    evaluateCoordinate("location_x", "2'646'359");
+    hasError("location_x", false);
+    isDisabled("location_x", false);
+    evaluateCoordinate("location_y", "1'249'017");
+    hasError("location_y", false);
+    isDisabled("location_y", false);
+    evaluateCoordinate("location_x_lv03", "646'358");
+    hasError("location_x_lv03", false);
+    isDisabled("location_x_lv03", true);
+    evaluateCoordinate("location_y_lv03", "249'017");
+    hasError("location_y_lv03", false);
+    isDisabled("location_y_lv03", true);
+
+    // Can draw after navigating to the next page and extract correct bbox from rotated, zoomed image
+    cy.get('[data-cy="coordinate-segment"] [data-cy="labeling-button"]').click();
+    cy.get('[data-cy="labeling-page-next"]').click();
+    waitForLabelingImageLoaded();
+    cy.get('[data-cy="labeling-page-count"]').contains("2 / 3");
+    cy.get('[data-cy="labeling-page-previous"]').should("not.be.disabled");
+    cy.get('[data-cy="labeling-page-next"]').should("not.be.disabled");
+
+    cy.window().then(win => {
+      const view = win.labelingImage.getView();
+      expect(view.getRotation()).to.equal(0);
+    });
+    cy.get('[data-cy="rotate-button"]').click();
+    cy.window().then(win => {
+      const view = win.labelingImage.getView();
+      expect(view.getRotation()).to.equal(Math.PI / 2);
+    });
+    cy.wait(1000);
+
+    cy.get('[data-cy="labeling-panel"] [data-cy="zoom-in-button"]').click();
+    cy.wait(1000);
+    cy.get('[data-cy="labeling-panel"]')
+      .trigger("pointerdown", { x: 600, y: 60 })
+      .trigger("pointerup", { x: 600, y: 200 });
+    cy.wait(1000);
+
+    drawBox(600, 60, 800, 170);
+    evaluateSelect("spatial_reference_system", "20104002");
+    evaluateCoordinate("location_x", "2'646'466");
+    hasError("location_x", false);
+    isDisabled("location_x", true);
+    evaluateCoordinate("location_y", "1'249'931");
+    hasError("location_y", false);
+    isDisabled("location_y", true);
+    evaluateCoordinate("location_x_lv03", "646'465");
+    hasError("location_x_lv03", false);
+    isDisabled("location_x_lv03", false);
+    evaluateCoordinate("location_y_lv03", "249'931");
+    hasError("location_y_lv03", false);
+    isDisabled("location_y_lv03", false);
+
+    // Shows alert if no coordinates are extracted
+    cy.get('[data-cy="labeling-page-next"]').click();
+    waitForLabelingImageLoaded();
+    cy.get('[data-cy="labeling-page-count"]').contains("3 / 3");
+    cy.get('[data-cy="labeling-page-previous"]').should("not.be.disabled");
+    cy.get('[data-cy="labeling-page-next"]').should("be.disabled");
+    cy.wait(1000);
+
+    cy.get('[data-cy="coordinate-segment"] [data-cy="labeling-button"]').click();
+    drawBox(50, 60, 400, 110);
+    evaluateSelect("spatial_reference_system", "20104002");
+    evaluateCoordinate("location_x", "2'646'466");
+    evaluateCoordinate("location_y", "1'249'931");
+    evaluateCoordinate("location_x_lv03", "646'465");
+    evaluateCoordinate("location_y_lv03", "249'931");
+
+    cy.get('[data-cy="labeling-alert"]').contains("Coordinates not found.");
+
+    // Drawing is active immediately when opening the panel with the labeling-button
+    cy.get('[data-cy="labeling-toggle-button"]').click();
+    cy.get('[data-cy="labeling-panel"]').should("not.exist");
+
+    cy.get('[data-cy="coordinate-segment"] [data-cy="labeling-button"]').click();
+    cy.get('[data-cy="labeling-file-dropzone"]').should("exist");
+    cy.contains("labeling_attachment.pdf").click();
+    waitForLabelingImageLoaded();
+    drawBox(400, 60, 600, 170);
+    evaluateSelect("spatial_reference_system", "20104001");
+    evaluateCoordinate("location_x", "2'646'359");
+    evaluateCoordinate("location_y", "1'249'017");
+    evaluateCoordinate("location_x_lv03", "646'358");
+    evaluateCoordinate("location_y_lv03", "249'017");
   });
 });