Changeset 37105 for gs3-installations/intermuse/trunk/sites/intermuse/collect/programmes/js/document_viewer.js

Timestamp:

2023-01-05T23:53:30+13:00 (16 months ago)

Author:

davidb

Message:

A series of changes getting the code and XSLT up to the point where the Mirador annotation viewer can be operated without annotations, with annotaitons from a static manifest, with annotations from the store (editable)

File:

• gs3-installations/intermuse/trunk/sites/intermuse/collect/programmes/js/document_viewer.js (modified) (5 diffs)

gs3-installations/intermuse/trunk/sites/intermuse/collect/programmes/js/document_viewer.js

@@ -218 +218 @@
 
 
-/*
-
-https://stackoverflow.com/questions/57071788/google-vision-api-text-detection-display-words-by-block
-
-
-https://gist.github.com/UBISOFT-1/f00e4d22790f4af378d70b237fa56ca9
-
-    response = client.text_detection(image=image)
-    # The actual response for the first page of the input file.
-    breaks = vision.enums.TextAnnotation.DetectedBreak.BreakType
-    paragraphs = []
-    lines = []
-    # extract text by block of detection
-    for page in response.full_text_annotation.pages:
-        for block in page.blocks:
-            for paragraph in block.paragraphs:
-                para = ""
-                line = ""
-                suppose = str(paragraph.bounding_box)
-                suppose = suppose.replace('vertices ','')
-                print(suppose)
-                for word in paragraph.words:
-                    for symbol in word.symbols:
-                        line += symbol.text
-                        if symbol.property.detected_break.type == breaks.SPACE:
-                            line += ' '
-                        if symbol.property.detected_break.type == breaks.EOL_SURE_SPACE:
-                            line += ' '
-                            lines.append(line)
-                            para += line
-                            line = ''
-                        if symbol.property.detected_break.type == breaks.LINE_BREAK:
-                            lines.append(line)
-                            para += line
-                            line = ''
-            paragraphs.append(para)
-
-
-    return "\n".join(paragraphs)
-
-
-
-
-https://blog.searce.com/tips-tricks-for-using-google-vision-api-for-text-detection-2d6d1e0c6361
-
-def draw_boxes(image, bounds, color,width=5):
-    draw = ImageDraw.Draw(image)
-    for bound in bounds:
-        draw.line([
-            bound.vertices[0].x, bound.vertices[0].y,
-            bound.vertices[1].x, bound.vertices[1].y,
-            bound.vertices[2].x, bound.vertices[2].y,
-            bound.vertices[3].x, bound.vertices[3].y,
-            bound.vertices[0].x, bound.vertices[0].y],fill=color, width=width)
-    return image
-def get_document_bounds(response, feature):
-    for i,page in enumerate(document.pages):
-        for block in page.blocks:
-            if feature==FeatureType.BLOCK:
-                bounds.append(block.bounding_box)
-            for paragraph in block.paragraphs:
-                if feature==FeatureType.PARA:
-                    bounds.append(paragraph.bounding_box)
-                for word in paragraph.words:
-                    for symbol in word.symbols:
-                        if (feature == FeatureType.SYMBOL):
-                            bounds.append(symbol.bounding_box)
-                    if (feature == FeatureType.WORD):
-                        bounds.append(word.bounding_box)
-    return bounds
-bounds=get_document_bounds(response, FeatureType.WORD)
-draw_boxes(image,bounds, 'yellow')
-
-*/
-
 
 
@@ -301 +226 @@
 
     var canvas_index = goto_page -1;
+
+    var httpDocument = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + gs.cgiParams.d;
+    var httpDocumentIIIFManifest = httpDocument + "?sa=iiif-manifest&ed=1&excerptid-text=iiif-manifest";
+
+    //const endpointUrl = 'https://intermuse.sowemustthink.space/simpleAnnotationStore/annotation';
+    //const endpointUrl = '/simpleAnnotationStore/annotation';
     
     var mirador3_config = {
     "manifests": {
-        "https://intermuse.sowemustthink.space/greenstone3/sample-manifest.json": {
+        httpDocumentIIIFManifest: {
         "provider": "InterMusE"
         }
     },
-    "window" : { "panels": { "annotations": true, "attribution": true },
-             "defaultSideBarPanel": "annotations",
-             "sideBarOpenByDefault": true            
-           },
+    "window" : { "panels": { "attribution": true, "search": true } },
 
     //"annotations": {
@@ -317 +245 @@
     //  "filteredMotivations": ['oa:commenting', 'oa:tagging', 'sc:painting', 'commenting', 'tagging'],
     //},
+    /*
     "requests": {
         "postprocessors": [
@@ -330 +259 @@
         }
         ]
-    },
+    },*/
     
     "windows": [
         {
-        "loadedManifest": "https://intermuse.sowemustthink.space/greenstone3/sample-manifest.json",
+        "loadedManifest": httpDocumentIIIFManifest,
         "canvasIndex": canvas_index,
         "thumbnailNavigationPosition": 'far-bottom'
@@ -341 +270 @@
     };
 
+    var includeFileAssocOpenAnnotations = gs.variables.optionIncludeFileAssocOpenAnnotations;
+    var includeEditableOpenAnnotations  = gs.variables.optionIncludeEditableOpenAnnotations;
+
+    console.log("**** includeFileAssocOpenAnnotations = " + includeFileAssocOpenAnnotations);
+    console.log("**** includeEditableOpenAnnotations = " + includeEditableOpenAnnotations);
+    
+    if ((includeFileAssocOpenAnnotations == 'true') || (includeEditableOpenAnnotations == 'true')) {
+    // Activate the annotations plugin
+
+    mirador3_config.window.panels.annotations = true;
+    
+    mirador3_config.window.defaultSideBarPanel = "annotations";
+    mirador3_config.window.sideBarOpenByDefault = true;   
+
+    if (includeEditableOpenAnnotations == 'true') {
+
+        //console.log("**** gs.variables.endpointURL = '" + gs.variables.endpointURL + "'");
+        //const endpointURL = gs.variables.endpointURL;
+
+        var endpointURL  = gs.variables.optionIncludeEditableOpenAnnotationsEndpointURL;
+        console.log("**** endpointURL = '" + endpointURL + "'");
+        
+        mirador3_config.annotation = {};
+    
+        if ((endpointURL == "") || (endpointURL == "localStorage")) {
+        mirador3_config.annotation.adapter = (canvasId) => new mirador3WithAnnotations.LocalStorageAdapter(`localStorage://?canvasId=${canvasId}`)
+        }
+        else {
+        mirador3_config.annotation.adapter = (canvasId) => new mirador3WithAnnotations.SimpleAnnotationServerV2Adapter(canvasId, endpointURL);
+        }
+
+        // **** add in a further options for this ????
+    
+        mirador3_config.annotation.exportLocalStorageAnnotations = true;  // display annotation JSON export button
+    
+    }
+    }
     
     var mirador3_viewer = mirador3WithAnnotations.initMirador3Viewer('mirador3-viewer',mirador3_config);
-
-    /*
-    var mirador3_viewer = Mirador.viewer({
-    "id": "mirador3-viewer",
-    "manifests": {
-        "https://intermuse.sowemustthink.space/greenstone3/sample-manifest.json": {
-        "provider": "IntermusE"
-        }
-    },
-    "window" : { "panels" : { "annotations": true, "attribution": false } },
-    //"annotations": {
-    //  "htmlSanitizationRuleSet": 'iiif', // See src/lib/htmlRules.js for acceptable values
-    //  "filteredMotivations": ['oa:commenting', 'oa:tagging', 'sc:painting', 'commenting', 'tagging'],
-    //},
-    "requests": {
-        "postprocessors": [
-        (url, action) => {
-            if (action.type === "mirador/RECEIVE_MANIFEST") {
-            //console.log(action)
-            //console.log(iiif_manifest);
-            return {
-                ...action ,
-                "manifestJson": iiif_manifest
-            };
-            }
-        }
-        ]
-    },
-    
-    "windows": [
-        {
-        "loadedManifest": "https://intermuse.sowemustthink.space/greenstone3/sample-manifest.json",
-        "canvasIndex": 0,
-        "thumbnailNavigationPosition": 'far-bottom'
-        }
-    ]
-    });
-    */
     
     return mirador3_viewer;