From 4c3e7bff91ab9e1df9893eb6ce33cb6b0bd0b6b1 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Sat, 30 Sep 2023 15:41:42 +0100 Subject: [PATCH] Exif node improve popup info --- utility/exif/94-exif.js | 20 ++++++++++++++++---- utility/exif/package.json | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/utility/exif/94-exif.js b/utility/exif/94-exif.js index 628e7825..378cb2b9 100644 --- a/utility/exif/94-exif.js +++ b/utility/exif/94-exif.js @@ -69,14 +69,26 @@ module.exports = function(RED) { fov: (2 * Math.atan(36 / (2 * msg.exif.exif.FocalLengthIn35mmFormat)) * 180 / Math.PI), color: '#aaaa00' } - msg.location.icon = "fa-camera fa-1x"; + msg.location.icon = "fa-camera fa-lg"; + msg.location.iconColor = "orange"; var na; + var pop = ""; if (val.hasOwnProperty("name")) { na = val.name; } - else if (msg.hasOwnProperty("filename")) { na = msg.filename.split('/').pop(); } + else if (msg.hasOwnProperty("filename")) { + na = msg.filename.split('/').pop(); + pop = "Timestamp: "+msg.exif.image.ModifyDate+"
"; + } else { na = msg.exif.image.Make+"_"+msg.exif.image.ModifyDate; } msg.location.name = na; msg.location.layer = "Images"; - msg.location.popup = '' + if (msg.exif.image.ImageDescription) { + pop = "Caption: "+msg.exif.image.ImageDescription+"
"+pop; + } + pop += '' + if (msg.location.lat && msg.location.lon) { + pop += "
Lat, Lon: "+msg.location.lat+", "+msg.location.lon; + } + msg.location.popup = pop; } } @@ -98,7 +110,7 @@ module.exports = function(RED) { node.log(error.toString()); } else { - msg.location = {name:msg.payload.name, lat:msg.payload.lat, lon:msg.payload.lon, layer:"Images", icon:"fa-camera", draggable:true}; + msg.location = {name:msg.payload.name, lat:msg.payload.lat, lon:msg.payload.lon, layer:"Images", icon:"fa-camera fa-lg", draggable:true}; msg.location.popup = '
'; } } diff --git a/utility/exif/package.json b/utility/exif/package.json index b13c606f..a7f1d46b 100644 --- a/utility/exif/package.json +++ b/utility/exif/package.json @@ -1,6 +1,6 @@ { "name": "node-red-node-exif", - "version": "0.3.1", + "version": "0.4.0", "description": "A Node-RED node that extracts Exif information from JPEG image buffers.", "dependencies": { "exif": "^0.6.0"