ebta-workflow-prod 4.0.8 → 4.0.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ebta-workflow-prod",
   "private": false,
-  "version": "4.0.8",
+  "version": "4.0.10",
   "description": "",
   "license": "UNLICENSED",
   "author": "",

package/src/activities/PDFMapGenerator.ts

@@ -93,6 +93,11 @@ interface PDFMapGeneratorInputs {
      * @description specific type name of print template, e.g.'VMP'
      */
     template: string;
+    /**
+     * @displayName Object to provide extra field detail, by key-value(string)
+     * @description Object to provide extra field detail, by key-value(string)
+     */
+    extraField: object;
 }
 /** An interface that defines the outputs of the activity. */
 interface PDFMapGeneratorOutputs {
@@ -237,10 +242,10 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
             const image3url = 'https://cdn.jsdelivr.net/npm/ebta-resources/resources/prints/dbyd.png'
             const imageBarurl = 'https://cdn.jsdelivr.net/npm/ebta-resources/resources/prints/Scalebar.png'
             const imageNorthUrl = 'https://cdn-icons-png.flaticon.com/512/3236/3236586.png'
+            const image10kmurl = 'https://ebta.maps.arcgis.com/sharing/rest/content/items/c15211b9826549f69a13c3f3d32a841b/resources/resources/prints/speedlimit10PNG.png'
             let image10Buffer, image1Buffer, image2Buffer, image3Buffer
 
             if (inputs.template == 'VMP') {
-                const image10kmurl = 'https://ebta.maps.arcgis.com/sharing/rest/content/items/c15211b9826549f69a13c3f3d32a841b/resources/vmp_symbols/speedlimit10.svg'
                 image10Buffer = await this.fetchData(image10kmurl);
                 console.log('Image10 fetched successfully');
             }
@@ -267,21 +272,23 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
                 let newPage = doc.getPage(0)
                 let imgBase64 = imgBase64Array[i]
                 let imageBuffer = this.base64ToArrayBuffer(imgBase64);
-                console.log(`Image ${i} data processed successfully`);
                 let image;
                 if (imgBase64.startsWith('data:image/png;base64,')) {
                     image = await doc.embedPng(imageBuffer);
                 } else if (imgBase64.startsWith('data:image/jpeg;base64,') || imgBase64.startsWith('data:image/jpg;base64,')) {
                     image = await doc.embedJpg(imageBuffer);
                 }
+                console.log(`Main Image ${i} data processed successfully`);
                 let image1, image2, image3, image10
                 if (inputs.template == 'VMP') {
                     image10 = await doc.embedPng(image10Buffer);
+                    console.log('image10 embed successfully')
                 }
                 else {
                     image1 = await doc.embedPng(image1Buffer);
                     image2 = await doc.embedPng(image2Buffer);
                     image3 = await doc.embedPng(image3Buffer);
+                    console.log('image1,2,3 embed successfully')
                 }
                 const imageBar = await doc.embedPng(imageBarBuffer);
                 const imageNorth = await doc.embedPng(imageNorthBuffer);
@@ -292,6 +299,7 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
                     } else if (inputs.LegendImgBase64.startsWith('data:image/jpeg;base64,') || inputs.LegendImgBase64.startsWith('data:image/jpg;base64,')) {
                         legendImage = await doc.embedJpg(legendBuffer);
                     }
+                    console.log('legend image embed successfully')
                 }
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 newPage.drawImage(image, {
@@ -300,6 +308,7 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
                     width: width * 0.8113,
                     height: height * 0.8029,
                 });
+                console.log('map image drawn successfully')
                 if (inputs.LegendImgBase64) {
                     //Define position & size of legend screeshot, depent on width/height ratio
                     if (legendImage.width / legendImage.height > 0.259) {
@@ -455,15 +464,17 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
                             });
                         }
                     }
+                    console.log('legend image drawn successfully')
                 }
                 const lableSize = 100
                 if (inputs.template == 'VMP') {
                     newPage.drawImage(image10, {
-                        x: 28+200,
+                        x: 28 + 200,
                         y: 145,
                         width: lableSize,
                         height: lableSize * (image10.height / image10.width),
                     });
+                    console.log('image10 drawn successfully')
                 }
                 else {
                     newPage.drawImage(image1, {
@@ -484,6 +495,7 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
                         width: lableSize * .8,
                         height: lableSize * .8 * (image3.height / image3.width),
                     });
+                    console.log('image1,2,3 drawn successfully')
                 }
                 console.log(`success in page. ${i} `)
                 // north arrow
@@ -559,6 +571,18 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
                 const revField = form.getTextField('Rev.' + i)
                 revField.setText(inputs.Rev)
                 revField.updateAppearances(font)
+                if (inputs.template=='VMP'){
+                //supervisor
+                const supervisorField = form.getTextField('Supervisor')
+                supervisorField.setText(inputs.extraField['supervisor'])
+                supervisorField.setAlignment(TextAlignment.Center)
+                supervisorField.updateAppearances(font)
+                //UHF
+                const uhfField = form.getTextField('UHF')
+                uhfField.setText(inputs.extraField['UHF'])
+                uhfField.setAlignment(TextAlignment.Center)
+                uhfField.updateAppearances(font)
+}
                 //date 
                 const today = new Date();
                 const formattedDate = today.toLocaleDateString('en-AU');
@@ -588,6 +612,24 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
                 }
                 console.log('Text Fields removal successful')
                 //draw a QR Code image only when Qr URL is given && QR image not given
+                const boldFont = await doc.embedFont(StandardFonts.HelveticaBold);
+
+                if (inputs.template == 'VMP') {
+                    newPage.drawText('Maximum Speed 10KM/h within Work Area', {
+                        x: 28+150,
+                        y: 145,
+                        size: 10.5,
+                        color: rgb(255, 255, 255), // White color
+                        font: boldFont,
+                    });
+                    newPage.drawText('Maximum Speed 10KM/h within Work Area', {
+                        x: 28+151,
+                        y: 145,
+                        size: 10,
+                        color: rgb(255, 0, 0), // red color
+                        font: boldFont,
+                    });
+                }
 
                 if (inputs.buttonLink && inputs.buttonLink.length > 0) {
                     const buttonX = width * 0.74
@@ -603,7 +645,7 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
                         width: buttonW,
                         height: buttonH,
                     });
-                    const boldFont = await doc.embedFont(StandardFonts.HelveticaBold);
+
                     newPage.drawText('Go to EBTA GIS', {
                         x: buttonX + 5,
                         y: buttonY + 22,
@@ -611,15 +653,7 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
                         color: rgb(1, 1, 1), // White color
                         font: boldFont,
                     });
-                    if (inputs.template == 'VMP') {
-                    newPage.drawText('All must operate under', {
-                        x: 28,
-                        y: 145,
-                        size: 10,
-                        color: rgb(255, 255, 255), // White color
-                        font: boldFont,
-                    });
-                    }
+
 
                     const existingAnnots = newPage.node.lookup(PDFName.of('Annots'));
                     let annotationsArray = existingAnnots instanceof PDFArray ? existingAnnots : doc.context.obj([]);
@@ -755,6 +789,7 @@ export default class PDFMapGeneratorActivity implements IActivityHandler {
 
             const pdfBytes = await finalPDF.save();
             const base64String = this.arrayBufferToBase64(pdfBytes);
+            //was and still working fine, ignore the bug report
             const downloadUrl = this.createDownloadUrl(base64String);
             console.log('pdf file created and ready to download');
             return {